diff --git a/CHANGES b/CHANGES
index db141384db39a8c92694e5b5d6964f57eee6e975..3a847b49868887aadf4cdd2e0cb89be206d5fd67 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,16 +3,33 @@ contributors are listed. Note that Calamares does not have a historical
changelog -- this log starts with version 3.2.0. The release notes on the
website will have to do for older versions.
-# 3.2.8 (unreleased) #
+# 3.2.9 (unreleased) #
+
+This release contains contributions from (alphabetically by first name):
+
+## Core ##
+
+## Modules ##
+
+
+# 3.2.8 (2019-05-10) #
This is a **source-incompatible** release of Calamares. Include files
have been shuffled around, so third-party C++ modules will need
adjustment to the changed names.
This release contains contributions from (alphabetically by first name):
+ - Arnaud Ferraris
+ - Kevin Kofler
## Core ##
+ - All user-visible texts referring to "MB" and "GB" now use the standard
+ "MiB" and "GiB" wording, which matches what we were actually calculating
+ with (i.e. 2^20 and 2^30 respectively). #1129
+ - The side-pane, which shows the list of steps that will be executed,
+ now tries to fit the text (name of each module) into the available space
+ by shrinking the font as needed. #1137
- *libcalamares* (accidentally) linked with Qt's GUI libraries when
PythonQt was found. This led to the odd situation where the non-GUI
Calamares library depends on a bunch of GUI libraries.
@@ -24,9 +41,21 @@ This release contains contributions from (alphabetically by first name):
## Modules ##
+ - *finished* has a new mechanism for configuring the behavior of the
+ *restart now* button. The old-style boolean configuration is still
+ supported but generates a warning. #1138
+ - *locale* module GeoIP configuration has a new preferred format.
+ See `locale.conf` for details. The old configuration is still
+ supported but will be phased out before 3.3.0 -- in particular,
+ support for "legacy" format will be removed, since that was a
+ crutch for the disappearance of one GeoIP provider in 2018.
- *oemid* is a new module for configuring OEM phase-0 (image pre-mastering,
or pre-deployment) things. It has limited functionality at the moment,
- writing only a single batch-identifier file.
+ writing only a single batch-identifier file. #943
+ - *welcome* can now do GeoIP lookups as well (but be careful with the
+ configuration, since you need a GeoIP that provides country information,
+ not just timezones). This will let Calamares select a starting language
+ that matches where it is -- which might not be useful at all. #934
- All Python modules now bail out gracefully on (at least some) bad
configurations, rather than raising an exception. The pre-release
scripts now test for exceptions to avoid shipping modules with
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f842ad0ea3502411d565c0b823b95b99c1d0a4ea..d4b6ad8d23de2295536b91277c2fc256be2e5915 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,11 @@
cmake_minimum_required( VERSION 3.2 FATAL_ERROR )
project( CALAMARES
+<<<<<<< HEAD
VERSION 3.2.7.1
+=======
+ VERSION 3.2.9
+>>>>>>> development
LANGUAGES C CXX )
set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development
@@ -116,7 +120,7 @@ set( _tx_bad be eo fa fr_CH gu kk kn lo mk ne_NP ur uz )
### Required versions
#
# See DEPENDENCIES section below.
-set( QT_VERSION 5.10.0 )
+set( QT_VERSION 5.9.0 )
set( YAMLCPP_VERSION 0.5.1 )
set( ECM_VERSION 5.18 )
set( PYTHONLIBS_VERSION 3.3 )
diff --git a/CMakeModules/BoostPython3.cmake b/CMakeModules/BoostPython3.cmake
index c128b58f107447ca3edac281415df8be37751fda..70fb0aa49e87658e9a29c8c8e11d0f62eddbe5be 100644
--- a/CMakeModules/BoostPython3.cmake
+++ b/CMakeModules/BoostPython3.cmake
@@ -15,6 +15,11 @@
# libboost_python-3.4.so
# depending on what python's targets you selected during install
#
+# On Fedora >= 30 instead, the boost-python3-devel provides boost library with a
+# name like:
+# libboost_python37.so
+# depending on what python's targets you selected during install
+#
# find_boost_python3() tries to find the package with different component
# names. By default it tries "python3", "python-py$suffix" and
# "python-$dotsuffix", where suffix is based on the `python_version` argument.
@@ -46,6 +51,10 @@ macro( find_boost_python3 boost_version python_version found_var )
string( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\..*" "\\1\\2" _fbp_python_short_version ${python_version} )
_find_boost_python3_int( ${boost_version} python-py${_fbp_python_short_version} _fbp_found )
+ if (NOT _fbp_found)
+ _find_boost_python3_int( ${boost_version} python${_fbp_python_short_version} _fbp_found )
+ endif()
+
if (NOT _fbp_found)
# The following loop changes the searched name for Gentoo based distributions
# turns "3.4.123abc" into "3.4"
diff --git a/data/config-appimage/modules/finished.conf b/data/config-appimage/modules/finished.conf
index 29e5e49b4587ebd0a0bf3a901b2ad17c51dfe0d1..48bbdc031a37272cb6aacd03f49f50a40d9c4639 100644
--- a/data/config-appimage/modules/finished.conf
+++ b/data/config-appimage/modules/finished.conf
@@ -1,14 +1,24 @@
# Configuration for the "finished" page, which is usually shown only at
# the end of the installation (successful or not).
---
-# The finished page can hold a "restart system now" checkbox.
-# If this is false, no checkbox is shown and the system is not restarted
-# when Calamares exits.
-restartNowEnabled: true
-
-# Initial state of the checkbox "restart now". Only relevant when the
-# checkbox is shown by restartNowEnabled.
-restartNowChecked: false
+# Behavior of the "restart system now" button.
+#
+# There are four usable values:
+# - never
+# Does not show the button and does not restart.
+# This matches the old behavior with restartNowEnabled=false.
+# - user-unchecked
+# Shows the button, defaults to unchecked, restarts if it is checked.
+# This matches the old behavior with restartNowEnabled=true and restartNowChecked=false.
+# - user-checked
+# Shows the button, defaults to checked, restarts if it is checked.
+# This matches the old behavior with restartNowEnabled=true and restartNowChecked=true.
+# - always
+# Shows the button, checked, but the user cannot change it.
+# This is new behavior.
+#
+# The three combinations of legacy values are still supported.
+restartNowMode: user-unchecked
# If the checkbox is shown, and the checkbox is checked, then when
# Calamares exits from the finished-page it will run this command.
diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts
index 5074e926aa3fa2184f71089f34109c63d9c2a0ba..c5eb26c32d59b79a05f9651e695bfaffd5c407c7 100644
--- a/lang/calamares_ar.ts
+++ b/lang/calamares_ar.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>قطاع الإقلاع الرئيسي ل %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>قسم الإقلاع</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>قسم النظام</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>لا تثبّت محمّل إقلاع</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>الأدوات</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>معلومات التّنقيح</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>ثبت </translation>
</message>
@@ -180,7 +180,7 @@
<translation>ملفّ السّكربت الرّئيس %1 لمهمّة بايثون %2 لا يمكن قراءته.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>خطأ Boost.Python في العمل "%1".</translation>
</message>
@@ -596,18 +596,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -919,13 +919,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1243,6 +1243,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ The installer will quit and all changes will be lost.</source>
<translation>نموذج</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>أقبل الشّروط والأحكام أعلاه.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>اتّفاقيّة التّرخيص</h1>عمليّة الإعداد هذه ستثبّت برمجيّات مملوكة تخضع لشروط ترخيص.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>فضلًا راجع اتّفاقيّات رخص المستخدم النّهائيّ (EULA) أعلاه.<br/>إن لم تقبل الشّروط، فلن تتابع عمليّة الإعداد.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>اتّفاقيّة التّرخيص</h1>يمكن لعمليّة الإعداد تثبيت برمجيّات مملوكة تخضع لشروط ترخيص وذلك لتوفير مزايا إضافيّة وتحسين تجربة المستخدم.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>فضلًا راجع اتّفاقيّات رخص المستخدم النّهائيّ (EULA) أعلاه.<br/>إن لم تقبل الشّروط، فلن تُثبّت البرمجيّات المملوكة وستُستخدم تلك مفتوحة المصدر بدلها.</translation>
</message>
@@ -1497,6 +1523,37 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>المساحة الحرّة</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>قسم جديد</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>الاسم</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>نظام الملفّات</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>نقطة الضّمّ</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>الحجم</translation>
</message>
@@ -1963,12 +2020,12 @@ The installer will quit and all changes will be lost.</source>
<translation>أمتأكّد من إنشاء جدول تقسيم جديد على %1؟</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1976,107 +2033,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>جاري جمع معلومات عن النظام...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>الأقسام</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>ثبّت %1 <strong>جنبًا إلى جنب</strong> مع نظام تشغيل آخر.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>امسح</strong> القرص وثبّت %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>استبدل</strong> قسمًا ب %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation>تقسيم <strong>يدويّ</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>امسح</strong> القرص <strong>%2</strong> (%3) وثبّت %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>استبدل</strong> قسمًا على القرص <strong>%2</strong> (%3) ب %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>الحاليّ:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>بعد:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>لم يُضبط أيّ قسم نظام EFI</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>راية قسم نظام EFI غير مضبوطة</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2287,69 +2344,69 @@ Output:
<translation>نموذج</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>اختر مكان تثبيت %1.<br/><font color="red">تحذير: </font>سيحذف هذا كلّ الملفّات في القسم المحدّد.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>لا يبدو العنصر المحدّد قسمًا صالحًا.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>لا يمكن تثبيت %1 في مساحة فارغة. فضلًا اختر قسمًا موجودًا.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>لا يمكن تثبيت %1 على قسم ممتدّ. فضلًا اختر قسمًا أساسيًّا أو ثانويًّا.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>لا يمكن تثبيت %1 على هذا القسم.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>قسم البيانات (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>قسم نظام مجهول (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>قسم نظام %1 (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>القسم %1 صغير جدًّا ل %2. فضلًا اختر قسمًا بحجم %3 غ.بايت على الأقلّ.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>تعذّر إيجاد قسم النّظام EFI في أيّ مكان. فضلًا ارجع واستخدم التّقسيم اليدويّ لإعداد %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>سيُثبّت %1 على %2.<br/><font color="red">تحذير: </font>ستفقد كلّ البيانات على القسم %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>سيُستخدم قسم نظام EFI على %1 لبدء %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>قسم نظام EFI:</translation>
</message>
@@ -2451,7 +2508,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2753,7 +2810,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2770,12 +2827,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>هذه نظرة عامّة عمّا سيحصل ما إن تبدأ عمليّة التّثبيت.</translation>
</message>
@@ -2886,7 +2943,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2894,43 +2951,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>اسم المستخدم طويل جدًّا.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>يحوي اسم المستخدم محارف غير صالح. المسموح هو الأحرف الصّغيرة والأرقام فقط.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>اسم المضيف قصير جدًّا.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>اسم المضيف طويل جدًّا.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>يحوي اسم المضيف محارف غير صالحة. المسموح فقط الأحرف والأرقام والشُّرط.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>لا يوجد تطابق في كلمات السر!</translation>
</message>
@@ -2938,7 +2995,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>المستخدمين</translation>
</message>
diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts
index d408b8ed35980273a01d50547431c71563e88342..c397ba53e497b29e47ea295e20e57a176cf02a7d 100644
--- a/lang/calamares_ast.ts
+++ b/lang/calamares_ast.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record de %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Partición d'arrinque</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Partición del sistema</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Nenyures</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Ferramientes</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Información de la depuración</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instalación</translation>
</message>
@@ -180,7 +180,7 @@
<translation>El ficheru del script principal %1 pal trabayu en Python %2 nun ye lleibe.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Fallu de Boost.Python nel trabayu «%1».</translation>
</message>
@@ -597,18 +597,18 @@ L'instalador va colar y van perdese tolos cambeos.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Nun pudo executase'l comandu.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>El comandu execútase nel entornu del agospiu y precisa saber el camín raigañu pero nun se definió en rootMountPoint.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>El comandu precisa saber el nome del usuariu, pero nun se definió dengún.</translation>
</message>
@@ -920,13 +920,13 @@ L'instalador va colar y van perdese tolos cambeos.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1244,6 +1244,32 @@ L'instalador va colar y van perdese tolos cambeos.</translation>
<translation>La pantalla ye mui pequeña como p'amosar l'instalador.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation>Nun pudieron crease los direutorios <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation>Nun pudo abrise'l ficheru <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation>Nun pudo escribise nel ficheru <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ L'instalador va colar y van perdese tolos cambeos.</translation>
<translation>Formulariu</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Aceuto los términos y condiciones d'enriba.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Alcuerdu de llicencia</h1>Esti procedimientu d'instalación va instalar software privativu que ta suxetu a términos de llicencia.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Revisa los alcuerdos de llicencia d'usuariu final (EULAs) d'enriba, por favor.<br/>Si nun aceutes dalgún, el procedimientu d'instalación nun pue siguir.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Alcuerdu de llicencia</h1>Esti procedimientu d'instalación pue instalar software privativu que ta suxetu a términos de llicencia pa fornir carauterístiques adicionales y ameyorar la esperiencia del usuariu.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Revisa los alcuerdos de llicencia d'usuariu final (EULAs) d'enriba, por favor.<br/>Si nun aceutes dalgún, el software privativu nun va instalase y van usase les alternatives de códigu abiertu.</translation>
</message>
@@ -1498,6 +1524,37 @@ L'instalador va colar y van perdese tolos cambeos.</translation>
<translation>Esbilla de paquetes</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ L'instalador va colar y van perdese tolos cambeos.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Espaciu llibre</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Partición nueva</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Nome</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Sistema de ficheros</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Puntu de montaxe</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Tamañu</translation>
</message>
@@ -1964,12 +2021,12 @@ L'instalador va colar y van perdese tolos cambeos.</translation>
<translation>¿De xuru que quies crear una tabla de particiones nueva en %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Nun pue crease la partición nueva</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>La tabla de particiones en %1 yá tien %2 particiones primaries y nun puen amestase más. Desanicia una partición primaria y amiesta otra estendida.</translation>
</message>
@@ -1977,107 +2034,107 @@ L'instalador va colar y van perdese tolos cambeos.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Recoyendo la información del sistema...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Particiones</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Va instalase %1 <strong>xunto a</strong> otru sistema operativu.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Va desaniciase</strong>'l discu y va instalase %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Va trocase</strong> una partición con %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation>Particionáu <strong>manual</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Va instalase %1 <strong>xunto a</strong> otru sistema operativu nel discu <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Va desaniciase</strong>'l discu <strong>%2</strong> (%3) y va instalase %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Va trocase</strong> una partición nel discu <strong>%2</strong> (%3) con %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>Particionáu <strong>manual</strong> nel discu <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Discu <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Anguaño:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Dempués:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Nun se configuró denguna partición del sistema EFI</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Precísase una partición del sistema EFI p'aniciar %1. <br/><br/>Pa configurar una, volvi atrás y esbilla o crea un sistema de ficheros en FAT32 cola bandera <strong>esp</strong> activada y el puntu de montaxe <strong>%2</strong>.<br/><br/>Pues siguir ensin configurar una partición del sistema EFI pero el sistema fallaría al aniciase.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Nun s'afitó la bandera del sistema EFI</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Precísase una partición del sistema EFI p'aniciar %1.<br/><br/>Configuróse una partición col puntu de montaxe <strong>%2</strong> pero nun s'afitó la bandera <strong>esp</strong>. Pa facelo, volvi p'atrás y edita la partición.<br/><br/>Pues siguir ensin afitar esa bandera pero'l sistema fallaría al aniciar.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>La partición d'arrinque nun ta cifrada</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Configuróse una partición d'arrinque xunto con una partición raigañu cifrada pero la partición d'arrinque nun ta cifrada.<br/><br/>Hai problemes de seguranza con esta triba de configuración porque los ficheros importantes del sistema caltiénense nuna partición ensin cifrar.<br/>Podríes siguir si quixeres pero'l desbloquéu del sistema de ficheros va asoceder más sero nel aniciu del sistema.<br/>Pa cifrar la partición raigañu, volvi p'atrás y recreala esbillando <strong>Cifrar</strong> na ventana de creación de particiones.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>tien polo menos un preséu con espaciu disponible en discu</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>Nun hai particiones onde instalar.</translation>
</message>
@@ -2125,17 +2182,17 @@ L'instalador va colar y van perdese tolos cambeos.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Guardando ficheros pa dempués...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Nun se configuraron ficheros pa guardar dempués.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Nun pudieron caltenese tolos ficheros configuraos.</translation>
</message>
@@ -2291,69 +2348,69 @@ Salida:
<translation>Formulariu</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Esbilla ónde instalar %1.<br/><font color="red">Alvertencia:</font> esto va desaniciar tolos ficheros de la partición esbillada.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>L'elementu esbilláu nun paez ser una partición válida.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 nun pue instalase nel espaciu baleru. Esbilla una partición esistente, por favor.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 nun pue instalase nuna partición estendida. Esbilla una partición primaria o llóxica esistente, por favor.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 nun pue instalase nesta partición.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Partición de datos (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Desconozse la partición del sistema (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>Partición %1 del sistema (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>La partición %1 ye perpequeña pa %2. Esbilla una con una capacidá de polo menos %3GB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Nun pudo alcontrase per nenyures una partición del sistema EFI. Volvi p'atrás y usa'l particionáu manual pa configurar %1, por favor.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 va instalase en %2.<br/><font color="red">Alvertencia: </font>van perdese tolos datos de la partición %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>La partición del sistema EFI en %1 va usase p'aniciar %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Partición del sistema EFI:</translation>
</message>
@@ -2455,7 +2512,7 @@ Salida:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Redimensionar el grupu de volúmenes</translation>
</message>
@@ -2757,7 +2814,7 @@ Salida:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Trabayu de procesos de la shell</translation>
</message>
@@ -2774,12 +2831,12 @@ Salida:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Esto ye una previsualización de lo que va asoceder nel momentu qu'anicies el procesu d'instalación.</translation>
</message>
@@ -2890,7 +2947,7 @@ Salida:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Siguimientu</translation>
</message>
@@ -2898,43 +2955,43 @@ Salida:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation><small>Si va usar l'ordenador más d'una persona, pues crear más cuentes tres la configuración.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation><small>Si va usar l'ordenador más d'una persona, pues crear más cuentes tres la instalación.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>El nome d'usuariu ye perllargu.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>El nome d'usuariu contién caráuteres non válidos. Namái se permiten les lletres minúscules y los númberos.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>El nome d'agospiu ye percurtiu.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>El nome d'agospiu ye perllargu.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>El nome d'agospiu contién caráuteres non válidos. Namái se permiten lletres, númberos y guiones.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>¡Les contraseñes nun concasen!</translation>
</message>
@@ -2942,7 +2999,7 @@ Salida:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Usuarios</translation>
</message>
diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts
index 33975695faafb2c4217243ce7aef23edf5932892..a2484ab729bf0ed4063d678659f03aa4b866cae2 100644
--- a/lang/calamares_be.ts
+++ b/lang/calamares_be.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -97,7 +97,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation type="unfinished"/>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation type="unfinished"/>
</message>
@@ -180,7 +180,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation type="unfinished"/>
</message>
@@ -595,18 +595,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -918,13 +918,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1242,6 +1242,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1320,27 +1346,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1496,6 +1522,37 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1862,34 +1919,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1962,12 +2019,12 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1975,107 +2032,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2123,17 +2180,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2286,69 +2343,69 @@ Output:
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2450,7 +2507,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2752,7 +2809,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2769,12 +2826,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2885,7 +2942,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2893,43 +2950,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
</message>
@@ -2937,7 +2994,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts
index eca68d9ead0b46838910117b6931c1d5b7b034fb..c1a737b6994e59d3ac4cd5d76766e697723dec93 100644
--- a/lang/calamares_bg.ts
+++ b/lang/calamares_bg.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Сектор за начално зареждане на %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Дял за начално зареждане</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Системен дял</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Не инсталирай програма за начално зареждане</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Инструменти</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Информация за отстраняване на грешки</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Инсталирай</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Файлът на главен скрипт %1 за python задача %2 не се чете.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python грешка в задача "%1".</translation>
</message>
@@ -596,18 +596,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Командата не може да се изпълни.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>Командата се изпълнява в средата на хоста и трябва да установи местоположението на основния дял, но rootMountPoint не е определен.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Командата трябва да установи потребителското име на профила, но такова не е определено.</translation>
</message>
@@ -919,13 +919,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1243,6 +1243,32 @@ The installer will quit and all changes will be lost.</source>
<translation>Екранът е твърде малък за инсталатора.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ The installer will quit and all changes will be lost.</source>
<translation>Форма</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Приемам лицензионните условия.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Лицензионно Споразумение</h1>Тази процедура ще инсталира несвободен софтуер, който е обект на лицензионни условия.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Моля погледнете Лицензионните Условия за Крайния Потребител (ЛУКП).<br/>Ако не сте съгласни с условията, процедурата не може да продължи.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Лицензионно Споразумение</h1>Тази процедура може да инсталира несвободен софтуер, който е обект на лицензионни условия, за да предостави допълнителни функции и да подобри работата на потребителя.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Моля погледнете Лицензионните Условия за Крайния Потребител (ЛУКП).<br/>Ако не сте съгласни с условията, несвободния софтуер няма да бъде инсталиран и ще бъдат използвани безплатни алтернативи.</translation>
</message>
@@ -1497,6 +1523,37 @@ The installer will quit and all changes will be lost.</source>
<translation>Избор на пакети</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Свободно пространство</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Нов дял</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Име</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Файлова система</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Точка на монтиране</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Размер</translation>
</message>
@@ -1963,12 +2020,12 @@ The installer will quit and all changes will be lost.</source>
<translation>Сигурни ли сте че искате да създадете нова таблица на дяловете върху %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Не може да се създаде нов дял</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>Таблицата на дяловете на %1 вече има %2 главни дялове, повече не може да се добавят. Моля, премахнете един главен дял и добавете разширен дял, на негово място.</translation>
</message>
@@ -1976,107 +2033,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Събиране на системна информация...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Дялове</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Инсталирай %1 <strong>заедно</strong> с друга операционна система.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Изтрий</strong> диска и инсталирай %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Замени</strong> дял с %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Ръчно</strong> поделяне.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Инсталирай %1 <strong>заедно</strong> с друга операционна система на диск <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Изтрий</strong> диск <strong>%2</strong> (%3) и инсталирай %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Замени</strong> дял на диск <strong>%2</strong> (%3) с %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Ръчно</strong> поделяне на диск <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Диск <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Сегашен:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>След:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Няма конфигуриран EFI системен дял</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>EFI системен дял е нужен за стартиране на %1.<br/><br/>За настройка на EFI системен дял се върнете назад и изберете или създайте FAT32 файлова система с включен <strong>esp</strong> флаг и точка на монтиране <strong>%2</strong>.<br/><br/>Може да продължите без EFI системен дял, но системата може да не успее да стартира.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Не е зададен флаг на EFI системен дял</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>EFI системен дял е нужен за стартиране на %1.<br/><br/>Дялът беше конфигуриран с точка на монтиране <strong>%2</strong>, но неговия <strong>esp</strong> флаг не е включен.<br/>За да включите флага се върнете назад и редактирайте дяла.<br/><br/>Може да продължите без флага, но системата може да не успее да стартира.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Липсва криптиране на дял за начално зареждане</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2289,69 +2346,69 @@ Output:
<translation>Форма</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Изберете къде да инсталирате %1.<br/><font color="red">Предупреждение: </font>това ще изтрие всички файлове върху избраният дял.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Избраният предмет не изглежда да е валиден дял.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 не може да бъде инсталиран на празно пространство. Моля изберете съществуващ дял.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 не може да бъде инсталиран върху разширен дял. Моля изберете съществуващ основен или логически дял.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 не може да бъде инсталиран върху този дял.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Дял на данните (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Непознат системен дял (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 системен дял (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Дялът %1 е твърде малък за %2. Моля изберете дял с капацитет поне %3 ГБ.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>EFI системен дял не е намерен. Моля, опитайте пак като използвате ръчно поделяне за %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 ще бъде инсталиран върху %2.<br/><font color="red">Предупреждение: </font>всички данни на дял %2 ще бъдат изгубени.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>EFI системен дял в %1 ще бъде използван за стартиране на %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI системен дял:</translation>
</message>
@@ -2453,7 +2510,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2756,7 +2813,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2773,12 +2830,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Това е преглед на промените, които ще се извършат, след като започнете процедурата по инсталиране.</translation>
</message>
@@ -2889,7 +2946,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Обратна връзка</translation>
</message>
@@ -2897,43 +2954,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Вашето потребителско име е твърде дълго.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Потребителското ви име съдържа непозволени символи! Само малки букви и числа са позволени.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Вашето име на хоста е твърде кратко.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Вашето име на хоста е твърде дълго.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Вашето име на хоста съдържа непозволени символи! Само букви, цифри и тирета са позволени.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Паролите Ви не съвпадат!</translation>
</message>
@@ -2941,7 +2998,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Потребители</translation>
</message>
diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts
index 26c3cd2a3fc62b82d83e01b2af1fa87237d13395..7fb5917655fd420e0e5431098fb6bfd9cd484323 100644
--- a/lang/calamares_ca.ts
+++ b/lang/calamares_ca.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Registre d'inici mestre (MBR) de %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Partició d'arrencada</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Partició del sistema</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>No instal·lis cap gestor d'arrencada</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Eines</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Informació de depuració</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instal·la</translation>
</message>
@@ -180,7 +180,7 @@
<translation>El fitxer de script principal %1 per a la tasca de python %2 no és llegible.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Error de Boost.Python a la tasca "%1".</translation>
</message>
@@ -597,18 +597,18 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>No s'ha pogut executar l'ordre.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>L'odre s'executa a l'entorn de l'amfitrió i necessita saber el camí de l'arrel, però no hi ha definit el punt de muntatge de l'arrel.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>L'ordre necessita saber el nom de l'usuari, però no s'ha definit cap nom d'usuari.</translation>
</message>
@@ -920,13 +920,13 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1244,6 +1244,32 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<translation>La pantalla és massa petita per mostrar l'instal·lador.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation>Identificador de lots OEM</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation>No s'han pogut crear els directoris <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation>No s'ha pogut obrir el fitxer <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation>No s'ha pogut escriure al fitxer <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<translation>Formulari</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Accepto els termes i les condicions anteriors.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Acord de llicència</h1> Aquest procediment de configuració instal·larà programari de propietat subjecte a termes de llicència.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Si us plau, reviseu l'acord de llicència End User License Agreements (EULAs) anterior.<br/>Si no esteu d'acord en els termes, el procediment de configuració no pot continuar.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Acord de llicència</h1> Aquest procediment de configuració instal·larà programari de propietat subjecte a termes de llicència per tal de proporcionar característiques addicionals i millorar l'experiència de l'usuari.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Si us plau, reviseu l'acord de llicència End User License Agreements (EULAs) anterior.<br/>Si no esteu d'acord en els termes, no s'instal·larà el programari de propietat i es faran servir les alternatives de codi lliure.</translation>
</message>
@@ -1498,6 +1524,37 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<translation>Selecció de paquets</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation>&Lot::</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation><html><head/><body><p>Introduïu aquí l'identificador de lots. Això es desarà al sistema de destinació.</p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation><html><head/><body><h1>Configuració d'OEM</h1><p>El Calamares usarà els paràmetres d'OEM durant la configuració del sistema de destinació.</p></body></html></translation>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation>Configuració d'OEM</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation>Estableix l'identificador de lots d'OEM a<code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Espai lliure</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Partició nova</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Nom</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Sistema de fitxers</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Punt de muntatge</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Mida</translation>
</message>
@@ -1964,12 +2021,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<translation>Esteu segurs que voleu crear una nova taula de particions a %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>No es pot crear la partició nova</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>La taula de particions de %1 ja té %2 particions primàries i no se n'hi poden afegir més. Si us plau, suprimiu una partició primària i afegiu-hi una partició ampliada.</translation>
</message>
@@ -1977,107 +2034,107 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Es recopila informació del sistema...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Particions</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Instal·la %1 <strong>al costat</strong> d'un altre sistema operatiu.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Esborra</strong> el disc i instal·la-hi %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Reemplaça</strong> una partició amb %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation>Particions <strong>manuals</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Instal·la %1 <strong>al costat</strong> d'un altre sistema operatiu al disc <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Esborra</strong> el disc <strong>%2</strong> (%3) i instal·la-hi %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Reemplaça</strong> una partició del disc <strong>%2</strong> (%3) amb %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>Particions <strong>manuals</strong> del disc <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disc <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Actual:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Després:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>No hi ha cap partició EFI de sistema configurada</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Cal una partició EFI de sistema per iniciar %1. <br/><br/>Per configurar una partició EFI de sistema, torneu enrere i seleccioneu o creeu un sistema de fitxers FAT32 amb la bandera <strong>esp</strong> habilitada i el punt de muntatge <strong>%2</strong>. <br/><br/>Podeu continuar sense la creació d'una partició EFI de sistema, però el sistema podria no iniciar-se.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>No s'ha establert la bandera de la partició EFI del sistema</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Cal una partició EFI de sistema per iniciar %1. <br/><br/> Ja s'ha configurat una partició amb el punt de muntatge <strong>%2</strong> però no se n'ha establert la bandera <strong>esp</strong>. Per establir-la-hi, torneu enrere i editeu la partició. <br/><br/>Podeu continuar sense establir la bandera, però el sistema podria no iniciar-se.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Partició d'arrencada sense encriptar</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>S'ha establert una partició d'arrencada separada conjuntament amb una partició d'arrel encriptada, però la partició d'arrencada no està encriptada.<br/><br/>Hi ha assumptes de seguretat amb aquest tipus de configuració, perquè hi ha fitxers del sistema importants en una partició no encriptada.<br/>Podeu continuar, si així ho desitgeu, però el desbloqueig del sistema de fitxers succeirà després, durant l'inici del sistema.<br/>Per encriptar la partició d'arrencada, torneu enrere i torneu-la a crear seleccionant <strong>Encripta</strong> a la finestra de creació de la partició.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>tingui com a mínim un dispositiu de disc disponible.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>No hi ha cap partició per fer-hi la instal·lació.</translation>
</message>
@@ -2125,17 +2182,17 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Es desen fitxers per a més tard...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>No s'ha configurat cap fitxer per desar per a més tard.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>No s'han pogut conservar tots els fitxers configurats.</translation>
</message>
@@ -2291,69 +2348,69 @@ Sortida:
<translation>Formulari</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Seleccioneu on instal·lar %1.<br/><font color="red">Atenció: </font>això suprimirà tots els fitxers de la partició seleccionada.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>L'element seleccionat no sembla que sigui una partició vàlida.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 no es pot instal·lar en un espai buit. Si us plau, seleccioneu una partició existent.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 no es pot instal·lar en un partició ampliada. Si us plau, seleccioneu una partició existent primària o lògica.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 no es pot instal·lar en aquesta partició.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Partició de dades (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Partició de sistema desconeguda (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 partició de sistema (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>La partició %1 és massa petita per a %2. Si us plau, seleccioneu una partició amb capacitat d'almenys %3 GB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>No es pot trobar cap partició EFI enlloc del sistema. Si us plau, torneu enrere i useu les particions manuals per establir %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 s'instal·larà a %2.<br/><font color="red">Atenció: </font>totes les dades de la partició %2 es perdran.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>La partició EFI de sistema a %1 s'usarà per iniciar %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Partició EFI del sistema:</translation>
</message>
@@ -2455,7 +2512,7 @@ Sortida:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Canvia la mida del grup de volums</translation>
</message>
@@ -2757,7 +2814,7 @@ Sortida:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Tasca de processos de l'intèrpret d'ordres</translation>
</message>
@@ -2774,12 +2831,12 @@ Sortida:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation>Això és un resum del que passarà quan s'iniciï el procés de configuració.</translation>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Això és un resum del que passarà quan s'iniciï el procés d'instal·lació.</translation>
</message>
@@ -2890,7 +2947,7 @@ Sortida:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Informació de retorn</translation>
</message>
@@ -2898,43 +2955,43 @@ Sortida:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation><small>Si més d'una persona usarà aquest ordinador, podeu crear diversos comptes després de la configuració.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation><small>Si més d'una persona usarà aquest ordinador, podeu crear diversos comptes després de la instal·lació.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>El nom d'usuari és massa llarg.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>El nom d'usuari conté caràcters no vàlids. Només s'hi admeten lletres i números.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>El nom d'amfitrió és massa curt.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>El nom d'amfitrió és massa llarg.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>El nom d'amfitrió conté caràcters no vàlids. Només s'hi admeten lletres, números i guions.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Les contrasenyes no coincideixen!</translation>
</message>
@@ -2942,7 +2999,7 @@ Sortida:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Usuaris</translation>
</message>
diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts
index 831cf25167dd60f8033f03375208e9f03b9b514f..1b73a8f1532c42fcdf55907e9a5e6235a48ca631 100644
--- a/lang/calamares_cs_CZ.ts
+++ b/lang/calamares_cs_CZ.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Hlavní zaváděcí záznam (MBR) na %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Zaváděcí oddíl</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Systémový oddíl</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Neinstalovat zavaděč systému</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Nástroje</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Ladící informace</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instalovat</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Hlavní soubor s python skriptem %1 pro úlohu %2 se nedaří otevřít pro čtení..</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python chyba ve skriptu „%1“.</translation>
</message>
@@ -597,18 +597,18 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Nedaří se spustit příkaz.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>Příkaz bude spuštěn v prostředí hostitele a potřebuje znát popis umístění kořene souborového systému. rootMountPoint ale není zadaný.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Příkaz potřebuje znát uživatelské jméno, to ale zadáno nebylo.</translation>
</message>
@@ -920,13 +920,13 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 – %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 – (%2)</translation>
@@ -1244,6 +1244,32 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<translation>Rozlišení obrazovky je příliš malé pro zobrazení instalátoru.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation>Identifikátor OEM série</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation>Nedaří se vytvořit složky <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation>Nedaří se otevřít soubor <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation>Nedaří se zapsat do souboru <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<translation>Formulář</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Souhlasím s výše uvedenými podmínkami.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Licenční ujednání</h1>Tato instalace nainstaluje také proprietární software, který podléhá licenčním podmínkám.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Projděte si výše uvedené „licenční smlouvy s koncovým uživatelem“ (EULA).<br/> Pokud s podmínkami v nich nesouhlasíte, ukončete instalační proces.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Licenční ujednání</h1>Tento instalační postup může nainstalovat také proprietární software, který podléhá licenčním podmínkám, ale který poskytuje některé další funkce a zlepšuje uživatelskou přivětivost.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Projděte si výše uvedené „licenční smlouvy s koncovým uživatelem“ (EULA).<br/> Pokud s podmínkami v nich nesouhlasíte, místo proprietárního software budou použity open source alternativy.</translation>
</message>
@@ -1498,6 +1524,37 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<translation>Výběr balíčků</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation>&Série:</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation><html><head/><body><p>Sem zadejte identifikátor série. Toto bude uloženo v cílovém systému.</p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation><html><head/><body><h1>Nastavení pro OEM</h1><p>Calamares tato nastavení použije při nastavování cílového systému.</p></body></html></translation>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation>Nastavení pro OEM</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation>Nastavit identifikátor OEM série na <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Volné místo</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Nový oddíl</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Název</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Souborový systém</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Přípojný bod</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Velikost</translation>
</message>
@@ -1964,12 +2021,12 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<translation>Opravdu chcete na %1 vytvořit novou tabulku oddílů?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Nedaří se vytvořit nový oddíl</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>Tabulka oddílů na %1 už obsahuje %2 hlavních oddílů a proto už není možné přidat další. Odeberte jeden z hlavních oddílů a namísto něj vytvořte rozšířený oddíl.</translation>
</message>
@@ -1977,107 +2034,107 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Shromažďování informací o systému…</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Oddíly</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Nainstalovat %1 <strong>vedle</strong> dalšího operačního systému.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Smazat</strong> obsah jednotky a nainstalovat %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Nahradit</strong> oddíl %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Ruční</strong> dělení úložiště.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Nainstalovat %1 <strong>vedle</strong> dalšího operačního systému na disk <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Vymazat</strong> obsah jednotky <strong>%2</strong> (%3) a nainstalovat %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Nahradit</strong> oddíl na jednotce <strong>%2</strong> (%3) %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Ruční</strong> dělení jednotky <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Jednotka <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Stávající:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Potom:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Není nastavený žádný EFI systémový oddíl</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Pro spuštění %1 je potřeba EFI systémový oddíl.<br/><br/>Pro nastavení EFI systémového oddílu se vraťte zpět a vyberte nebo vytvořte oddíl typu FAT32 s příznakem <strong>esp</strong> a přípojným bodem <strong>%2</strong>.<br/><br/>Je možné pokračovat bez nastavení EFI systémového oddílu, ale systém nemusí jít spustit.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Příznak EFI systémového oddílu není nastavený</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Pro spuštění %1 je potřeba EFI systémový oddíl.<br/><br/>Byl nastaven oddíl s přípojným bodem <strong>%2</strong> ale nemá nastaven příznak <strong>esp</strong>.<br/>Pro nastavení příznaku se vraťte zpět a upravte oddíl.<br/><br/>Je možné pokračovat bez nastavení příznaku, ale systém nemusí jít spustit.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Zaváděcí oddíl není šifrován</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Kromě šifrovaného kořenového oddílu byl vytvořen i nešifrovaný oddíl zavaděče.<br/><br/>To by mohl být bezpečnostní problém, protože na nešifrovaném oddílu jsou důležité soubory systému.<br/>Pokud chcete, můžete pokračovat, ale odemykání souborového systému bude probíhat později při startu systému.<br/>Pro zašifrování oddílu zavaděče se vraťte a vytvořte ho vybráním možnosti <strong>Šifrovat</strong> v okně při vytváření oddílu.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>má k dispozici alespoň jedno zařízení pro ukládání dat.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>Nejsou zde žádné oddíly na které by se dalo nainstalovat.</translation>
</message>
@@ -2125,17 +2182,17 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Ukládání souborů pro pozdější využití…</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>U žádných souborů nebylo nastaveno, že mají být uloženy pro pozdější využití.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Ne všechny nastavené soubory bylo možné zachovat.</translation>
</message>
@@ -2291,69 +2348,69 @@ Výstup:
<translation>Formulář</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Vyberte, kam nainstalovat %1.<br/><font color="red">Upozornění: </font>tímto smažete všechny soubory ve vybraném oddílu.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Vybraná položka se nezdá být platným oddílem.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 nemůže být instalován na místo bez oddílu. Vyberte existující oddíl.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 nemůže být instalován na rozšířený oddíl. Vyberte existující primární nebo logický oddíl.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 nemůže být instalován na tento oddíl.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Datový oddíl (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Neznámý systémový oddíl (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 systémový oddíl (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Oddíl %1 je příliš malý pro %2. Vyberte oddíl s kapacitou alespoň %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>EFI systémový oddíl nenalezen. Vraťte se, zvolte ruční rozdělení jednotky, a nastavte %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 bude instalován na %2.<br/><font color="red">Upozornění: </font>všechna data v oddílu %2 budou ztracena.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>Pro zavedení %2 se využije EFI systémový oddíl %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI systémový oddíl:</translation>
</message>
@@ -2455,7 +2512,7 @@ Výstup:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Změnit velikost skupiny svazků</translation>
</message>
@@ -2757,7 +2814,7 @@ Výstup:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Úloha shellových procesů</translation>
</message>
@@ -2774,12 +2831,12 @@ Výstup:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation>Toto je přehled událostí které nastanou po spuštění instalačního procesu.</translation>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Toto je přehled událostí které nastanou po spuštění instalačního procesu.</translation>
</message>
@@ -2890,7 +2947,7 @@ Výstup:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Zpětná vazba</translation>
</message>
@@ -2898,43 +2955,43 @@ Výstup:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation><small>Pokud bude tento počítač používat více lidí, můžete přidat uživatelské účty po dokončení instalace.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation><small>Pokud bude tento počítač používat více lidí, můžete přidat uživatelské účty po dokončení instalace.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Vaše uživatelské jméno je příliš dlouhé.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Vaše uživatelské jméno obsahuje neplatné znaky. Je možné použít pouze malá písmena a číslice.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Název stroje je příliš krátký.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Název stroje je příliš dlouhý.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Název stroje obsahuje neplatné znaky. Je možné použít pouze písmena, číslice a spojovníky.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Zadání hesla se neshodují!</translation>
</message>
@@ -2942,7 +2999,7 @@ Výstup:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Uživatelé</translation>
</message>
diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts
index 1adb1c78484d68b68ac5ed15fcd1c75ad12583f6..97a67e09ba13f3caac31010b5e47f8f74b21f37a 100644
--- a/lang/calamares_da.ts
+++ b/lang/calamares_da.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record af %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Bootpartition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Systempartition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Installér ikke en bootloader</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Værktøjer</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Fejlretningsinformation</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Installation</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Primær skriptfil %1 til python-jobbet %2 er ikke læsbar.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python-fejl i job "%1".</translation>
</message>
@@ -226,7 +226,7 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="80"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="313"/>
<source>Cancel setup without changing the system.</source>
- <translation type="unfinished"/>
+ <translation>Annullér opsætningen uden at ændre systemet.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="81"/>
@@ -237,7 +237,7 @@
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="167"/>
<source>Setup Failed</source>
- <translation type="unfinished"/>
+ <translation>Opsætningen mislykkedes</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="192"/>
@@ -257,7 +257,7 @@
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="252"/>
<source>Continue with installation?</source>
- <translation type="unfinished"/>
+ <translation>Fortsæt installationen?</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="254"/>
@@ -267,12 +267,12 @@
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="261"/>
<source>&Set up now</source>
- <translation type="unfinished"/>
+ <translation>&Sæt op nu</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="307"/>
<source>&Set up</source>
- <translation type="unfinished"/>
+ <translation>&Sæt op</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="308"/>
@@ -282,12 +282,12 @@
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="310"/>
<source>Setup is complete. Close the setup program.</source>
- <translation type="unfinished"/>
+ <translation>Opsætningen er fuldført. Luk opsætningsprogrammet.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="372"/>
<source>Cancel setup?</source>
- <translation type="unfinished"/>
+ <translation>Annullér opsætningen?</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="373"/>
@@ -391,7 +391,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="61"/>
<source>%1 Setup Program</source>
- <translation type="unfinished"/>
+ <translation>%1-opsætningsprogram</translation>
</message>
<message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="62"/>
@@ -596,18 +596,18 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Kunne ikke køre kommando.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>Kommandoen kører i værtsmiljøet og har brug for at kende rodstien, men der er ikke defineret nogen rootMountPoint.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Kommandoen har brug for at kende brugerens navn, men der er ikke defineret noget brugernavn.</translation>
</message>
@@ -919,13 +919,13 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1091,7 +1091,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/finished/FinishedPage.ui" line="95"/>
<source><Restart checkbox tooltip></source>
- <translation type="unfinished"/>
+ <translation><Restart checkbox tooltip></translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
@@ -1121,7 +1121,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="130"/>
<source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source>
- <translation type="unfinished"/>
+ <translation><h1>Opsætningen mislykkede</h1><br/>%1 er ikke blevet sat op på din computer.<br/>Fejlmeddelelsen var: %2.</translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="136"/>
@@ -1139,7 +1139,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/>
<source>Setup Complete</source>
- <translation type="unfinished"/>
+ <translation>Opsætningen er fuldført</translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/>
@@ -1149,7 +1149,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/>
<source>The setup of %1 is complete.</source>
- <translation type="unfinished"/>
+ <translation>Opsætningen af %1 er fuldført.</translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/>
@@ -1235,7 +1235,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/>
<source>The screen is too small to display the setup program.</source>
- <translation type="unfinished"/>
+ <translation>Skærmen er for lille til at vise opsætningsprogrammet.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/>
@@ -1243,6 +1243,32 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<translation>Skærmen er for lille til at vise installationsprogrammet.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation>Kunne ikke oprette mapperne <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation>Kunne ikke åbne filen <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation>Kunne ikke skrive til filen <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<translation>Formular</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Jeg accepterer de ovenstående vilkår og betingelser.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Licensaftale</h1>Opsætningsproceduren installerer proprietær software der er underlagt licenseringsvilkår.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Gennemgå venligst slutbrugerlicensaftalerne (EULA'er) ovenfor.<br/>Hvis du ikke er enig med disse vilkår, kan opsætningsproceduren ikke fortsætte.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Licensaftale</h1>Opsætningsproceduren kan installere proprietær software der er underlagt licenseringsvilkår, for at kunne tilbyde yderligere funktionaliteter og forbedre brugeroplevelsen.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Gennemgå venligst slutbrugerlicensaftalerne (EULA'er) ovenfor.<br/>Hvis du ikke er enig med disse vilkår vil der ikke blive installeret proprietær software, og open source-alternativer vil blive brugt i stedet.</translation>
</message>
@@ -1391,32 +1417,32 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="191"/>
<source>Shows the complete license text</source>
- <translation type="unfinished"/>
+ <translation>Viser den fulde licenstekst</translation>
</message>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="192"/>
<source>Hide license text</source>
- <translation type="unfinished"/>
+ <translation>Skjul licenstekst</translation>
</message>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="196"/>
<source>Show license agreement</source>
- <translation type="unfinished"/>
+ <translation>Vis licensaftale</translation>
</message>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="197"/>
<source>Hide license agreement</source>
- <translation type="unfinished"/>
+ <translation>Skjul licensaftale</translation>
</message>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="201"/>
<source>Opens the license agreement in a browser window.</source>
- <translation type="unfinished"/>
+ <translation>Åbner licensaftalen i et browservindue.</translation>
</message>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="202"/>
<source><a href="%1">View license agreement</a></source>
- <translation type="unfinished"/>
+ <translation><a href="%1">Vis licensaftale</a></translation>
</message>
</context>
<context>
@@ -1497,6 +1523,37 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<translation>Valg af pakke</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation>OEM-konfiguration</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Ledig plads</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Ny partition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Navn</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Filsystem</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Monteringspunkt</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Størrelse</translation>
</message>
@@ -1963,12 +2020,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<translation>Er du sikker på, at du vil oprette en ny partitionstabel på %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Kan ikke oprette ny partition</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>Partitionstabellen på %1 har allerede %2 primære partitioner, og der kan ikke tilføjes flere. Fjern venligst en primær partition og tilføj i stedet en udvidet partition.</translation>
</message>
@@ -1976,107 +2033,107 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Indsamler systeminformation...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Partitioner</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Installér %1 <strong>ved siden af</strong> et andet styresystem.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Slet</strong> disk og installér %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Erstat</strong> en partition med %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Manuel</strong> partitionering.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Installér %1 <strong>ved siden af</strong> et andet styresystem på disk <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Slet</strong> disk <strong>%2</strong> (%3) og installér %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Erstat</strong> en partition på disk <strong>%2</strong> (%3) med %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Manuel</strong> partitionering på disk <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disk <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Nuværende:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Efter:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Der er ikke konfigureret nogen EFI-systempartition</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>En EFI-systempartition er nødvendig for at starte %1.<br/><br/>For at konfigurere en EFI-systempartition skal du gå tilbage og vælge eller oprette et FAT32-filsystem med <strong>esp</strong>-flaget aktiveret og monteringspunkt <strong>%2</strong>.<br/><br/>Du kan fortsætte uden at opsætte en EFI-systempartition, men dit system vil muligvis ikke kunne starte.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>EFI-systempartitionsflag ikke sat</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>En EFI-systempartition er nødvendig for at starte %1.<br/><br/>En partition var konfigureret med monteringspunkt <strong>%2</strong>, men dens <strong>esp</strong>-flag var ikke sat.<br/>For at sætte flaget skal du gå tilbage og redigere partitionen.<br/><br/>Du kan fortsætte uden at konfigurere flaget, men dit system vil muligvis ikke kunne starte.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Bootpartition ikke krypteret</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>En separat bootpartition blev opsat sammen med en krypteret rodpartition, men bootpartitionen er ikke krypteret.<br/><br/>Der er sikkerhedsmæssige bekymringer med denne slags opsætning, da vigtige systemfiler er gemt på en ikke-krypteret partition.<br/>Du kan fortsætte hvis du vil, men oplåsning af filsystemet sker senere under systemets opstart.<br/>For at kryptere bootpartitionen skal du gå tilbage og oprette den igen, vælge <strong>Kryptér</strong> i partitionsoprettelsesvinduet.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>har mindst én tilgængelig diskenhed.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>Der er ikke installeret nogen partitioner på den.</translation>
</message>
@@ -2105,7 +2162,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/>
<source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source>
- <translation type="unfinished"/>
+ <translation>Vælg venligst et udseende og fremtoning til KDE Plasma-skrivebordet. Du kan også springe trinnet over og konfigurere udseendet og fremtoningen når systemet er sat op. Ved klik på et udseende og fremtoning giver det dig en live forhåndsvisning af det.</translation>
</message>
<message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/>
@@ -2124,17 +2181,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Gemmer filer til senere ...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Der er ikke konfigureret nogen filer til at blive gemt til senere.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Kunne ikke bevare alle de konfigurerede filer.</translation>
</message>
@@ -2290,69 +2347,69 @@ Output:
<translation>Formular</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Vælg hvor %1 skal installeres.<br/><font color="red">Advarsel: </font>Det vil slette alle filer på den valgte partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Det valgte emne ser ikke ud til at være en gyldig partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 kan ikke installeres på tom plads. Vælg venligst en eksisterende partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 kan ikke installeres på en udvidet partition. Vælg venligst en eksisterende primær eller logisk partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 kan ikke installeres på denne partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Datapartition (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Ukendt systempartition (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1-systempartition (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Partitionen %1 er for lille til %2. Vælg venligst en partition med mindst %3 GiB plads.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>En EFI-systempartition kunne ikke findes på systemet. Gå venligst tilbage og brug manuel partitionering til at opsætte %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 vil blive installeret på %2.<br/><font color="red">Advarsel: </font>Al data på partition %2 vil gå tabt.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>EFI-systempartitionen ved %1 vil blive brugt til at starte %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI-systempartition:</translation>
</message>
@@ -2454,7 +2511,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Ændr størrelse på diskområdegruppe</translation>
</message>
@@ -2756,7 +2813,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Skal-procesjob</translation>
</message>
@@ -2773,12 +2830,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Dette er et overblik over hvad der vil ske når du starter installationsprocessen.</translation>
</message>
@@ -2889,7 +2946,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Feedback</translation>
</message>
@@ -2897,43 +2954,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
- <translation type="unfinished"/>
+ <translation><small>Hvis mere end én person bruger computeren, kan du oprette flere konti efter installationen.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Dit brugernavn er for langt.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Dit brugernavn indeholder ugyldige tegn. Kun små bogstaver og tal er tilladt.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Dit værtsnavn er for kort.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Dit værtsnavn er for langt.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Dit værtsnavn indeholder ugyldige tegn. Kun bogstaver, tal og tankestreger er tilladt.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Dine adgangskoder er ikke ens!</translation>
</message>
@@ -2941,7 +2998,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Brugere</translation>
</message>
@@ -3020,7 +3077,7 @@ Output:
<location filename="../src/modules/welcome/WelcomePage.ui" line="17"/>
<location filename="../src/modules/welcome/WelcomePage.ui" line="72"/>
<source>Select language</source>
- <translation type="unfinished"/>
+ <translation>Vælg sprog</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
@@ -3045,17 +3102,17 @@ Output:
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/>
<source><h1>Welcome to the Calamares setup program for %1.</h1></source>
- <translation type="unfinished"/>
+ <translation><h1>Velkommen til Calamares-opsætningsprogrammet til %1.</h1></translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="72"/>
<source><h1>Welcome to %1 setup.</h1></source>
- <translation type="unfinished"/>
+ <translation><h1>Velkommen til %1-opsætningen.</h1></translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/>
<source>About %1 setup</source>
- <translation type="unfinished"/>
+ <translation>Om %1-opsætningen</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="91"/>
diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts
index 5e12ac1649a1e8bd852093073d636eb0a8ac166c..50b125ac82f2df5ba196ebf0fb18cc1ea99cf173 100644
--- a/lang/calamares_de.ts
+++ b/lang/calamares_de.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record von %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Boot Partition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Systempartition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Installiere keinen Bootloader</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Werkzeuge</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Debug-Information</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Installieren</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Hauptskript-Datei %1 für Python-Job %2 ist nicht lesbar.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python-Fehler in Job "%1".</translation>
</message>
@@ -597,18 +597,18 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Befehl konnte nicht ausgeführt werden.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>Dieser Befehl wird im installierten System ausgeführt und muss daher den Root-Pfad kennen, jedoch wurde kein rootMountPoint definiert.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Dieser Befehl benötigt den Benutzernamen, jedoch ist kein Benutzername definiert.</translation>
</message>
@@ -920,13 +920,13 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 (%2)</translation>
@@ -1244,6 +1244,32 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<translation>Der Bildschirm ist zu klein, um das Installationsprogramm anzuzeigen.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<translation>Formular</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Ich akzeptiere die obigen Allgemeinen Geschäftsbedingungen.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Lizenzvereinbarung</h1>Dieses Installationsprogramm wird proprietäre Software installieren, welche Lizenzbedingungen unterliegt.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Bitte überprüfen Sie die obigen Lizenzvereinbarungen für Endbenutzer (EULAs).<br/>Wenn Sie mit diesen Bedingungen nicht einverstanden sind, kann das Installationsprogramm nicht fortgesetzt werden.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1> Lizenzvereinbarung </ h1> Dieses Installationsprogramm kann proprietäre Software installieren, welche Lizenzbedingungen unterliegt, um zusätzliche Funktionen bereitzustellen und die Benutzerfreundlichkeit zu verbessern.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Bitte überprüfen Sie die obigen Lizenzvereinbarungen für Endbenutzer (EULAs).<br/>Wenn Sie mit diesen Bedingungen nicht einverstanden sind, wird keine proprietäre Software installiert werden. Stattdessen werden quelloffene Alternativen verwendet.</translation>
</message>
@@ -1498,6 +1524,37 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<translation>Paketauswahl</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Freier Platz</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Neue Partition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Dateisystem</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Einhängepunkt</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Grösse</translation>
</message>
@@ -1964,12 +2021,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<translation>Sind Sie sicher, dass Sie eine neue Partitionstabelle auf %1 erstellen möchten?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Neue Partition kann nicht erstellt werden</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>Die Partitionstabelle auf %1 hat bereits %2 primäre Partitionen und weitere können nicht hinzugefügt werden. Bitte entfernen Sie eine primäre Partition und fügen Sie stattdessen eine erweiterte Partition hinzu.</translation>
</message>
@@ -1977,107 +2034,107 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Sammle Systeminformationen...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Partitionen</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Installiere %1 <strong>neben</strong> einem anderen Betriebssystem.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Lösche</strong> Festplatte und installiere %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Ersetze</strong> eine Partition durch %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Manuelle</strong> Partitionierung.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>%1 <strong>parallel</strong> zu einem anderen Betriebssystem auf der Festplatte <strong>%2</strong> (%3) installieren.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation>Festplatte <strong>%2</strong> <strong>löschen</strong> (%3) und %1 installieren.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation>Eine Partition auf Festplatte <strong>%2</strong> (%3) durch %1 <strong>ersetzen</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Manuelle</strong> Partitionierung auf Festplatte <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Festplatte <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Aktuell:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Nachher:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Keine EFI-Systempartition konfiguriert</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Eine EFI Systempartition wird benötigt, um %1 zu starten.<br/><br/>Um eine EFI Systempartition einzurichten, gehen Sie zurück und wählen oder erstellen Sie ein FAT32-Dateisystem mit einer aktivierten <strong>esp</strong> Markierung sowie <strong>%2</strong> als Einhängepunkt .<br/><br/>Sie können ohne die Einrichtung einer EFI-Systempartition fortfahren, aber ihr System wird unter Umständen nicht starten können.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Die Markierung als EFI-Systempartition wurde nicht gesetzt</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Eine EFI Systempartition wird benötigt, um %1 zu starten.<br/><br/>Eine Partition mit dem Einhängepunkt <strong>%2</strong> wurd eingerichtet, jedoch wurde dort keine <strong>esp</strong> Markierung gesetzt.<br/>Um diese Markierung zu setzen, gehen Sie zurück und bearbeiten Sie die Partition.<br/><br/>Sie können ohne diese Markierung fortfahren, aber ihr System wird unter Umständen nicht starten können.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Bootpartition nicht verschlüsselt</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Eine separate Bootpartition wurde zusammen mit einer verschlüsselten Rootpartition erstellt, die Bootpartition ist aber unverschlüsselt.<br/><br/> Dies ist sicherheitstechnisch nicht optimal, da wichtige Systemdateien auf der unverschlüsselten Bootpartition gespeichert werden.<br/>Wenn Sie wollen, können Sie fortfahren, aber das Entschlüsseln des Dateisystems wird erst später während des Systemstarts erfolgen.<br/>Um die Bootpartition zu verschlüsseln, gehen Sie zurück und erstellen Sie diese neu, indem Sie bei der Partitionierung <strong>Verschlüsseln</strong> wählen. </translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>hat mindestens ein Festplattengerät zur Verfügung.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>Es gibt keine Partitonen, auf denen man installieren könnte.</translation>
</message>
@@ -2125,17 +2182,17 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Speichere Dateien für später ...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Keine Dateien für das Speichern zur späteren Verwendung konfiguriert.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Nicht alle konfigurierten Dateien konnten erhalten werden.</translation>
</message>
@@ -2291,69 +2348,69 @@ Ausgabe:
<translation>Form</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Wählen Sie den Installationsort für %1.<br/><font color="red">Warnung: </font>Dies wird alle Daten auf der ausgewählten Partition löschen.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Die aktuelle Auswahl scheint keine gültige Partition zu sein.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 kann nicht in einem unpartitionierten Bereich installiert werden. Bitte wählen Sie eine existierende Partition aus.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 kann nicht auf einer erweiterten Partition installiert werden. Bitte wählen Sie eine primäre oder logische Partition aus.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 kann auf dieser Partition nicht installiert werden.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Datenpartition (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Unbekannte Systempartition (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 Systempartition (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Die Partition %1 ist zu klein für %2. Bitte wählen Sie eine Partition mit einer Kapazität von mindestens %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Es wurde keine EFI-Systempartition auf diesem System gefunden. Bitte gehen Sie zurück, und nutzen Sie die manuelle Partitionierung, um %1 aufzusetzen.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 wird installiert auf %2.<br/><font color="red">Warnung: </font> Alle Daten auf der Partition %2 werden gelöscht.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>Die EFI-Systempartition auf %1 wird benutzt, um %2 zu starten.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI-Systempartition:</translation>
</message>
@@ -2455,7 +2512,7 @@ Ausgabe:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Größe der Volume Group verändern</translation>
</message>
@@ -2757,7 +2814,7 @@ Ausgabe:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Job für Shell-Prozesse</translation>
</message>
@@ -2774,12 +2831,12 @@ Ausgabe:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation>Dies ist eine Übersicht der Aktionen, die nach dem Starten des Installationsprozesses durchgeführt werden.</translation>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Dies ist eine Übersicht der Aktionen, die nach dem Starten des Installationsprozesses durchgeführt werden.</translation>
</message>
@@ -2890,7 +2947,7 @@ Ausgabe:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Rückmeldung</translation>
</message>
@@ -2898,43 +2955,43 @@ Ausgabe:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation><small>Falls dieser Computer von mehr als einer Person benutzt werden soll, können weitere Benutzerkonten nach der Installation eingerichtet werden.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation><small>Falls dieser Computer von mehr als einer Person benutzt werden soll, können weitere Benutzerkonten nach der Installation eingerichtet werden.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Ihr Nutzername ist zu lang.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Ihr Nutzername enthält ungültige Zeichen. Nur Kleinbuchstaben und Ziffern sind erlaubt.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Ihr Hostname ist zu kurz.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Ihr Hostname ist zu lang.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Ihr Hostname enthält ungültige Zeichen. Nur Buchstaben, Ziffern und Striche sind erlaubt.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Ihre Passwörter stimmen nicht überein!</translation>
</message>
@@ -2942,7 +2999,7 @@ Ausgabe:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Benutzer</translation>
</message>
diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts
index db58c118b8b540ca9641c045cdb4e519fe877d86..9faf68461209a05a099cbe51f72ce21a6b544512 100644
--- a/lang/calamares_el.ts
+++ b/lang/calamares_el.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record του %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Κατάτμηση εκκίνησης</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Κατάτμηση συστήματος</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Να μην εγκατασταθεί το πρόγραμμα εκκίνησης</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Εργαλεία</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Πληροφορίες αποσφαλμάτωσης</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Εγκατάσταση</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Η κύρια δέσμη ενεργειών %1 για την εργασία python %2 δεν είναι δυνατόν να διαβαστεί.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Σφάλμα Boost.Python στην εργασία "%1".</translation>
</message>
@@ -596,18 +596,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -919,13 +919,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1243,6 +1243,32 @@ The installer will quit and all changes will be lost.</source>
<translation>Η οθόνη είναι πολύ μικρή για να απεικονίσει το πρόγραμμα εγκατάστασης</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ The installer will quit and all changes will be lost.</source>
<translation>Τύπος</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Δέχομαι τους παραπάνω όρους και προϋποθέσεις.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Άδεια χρήσης</h1>Η διαδικασία ρύθμισης θα εγκαταστήσει ιδιόκτητο λογισμικό που υπόκειται στους όρους αδειών.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Άδεια χρήσης</h1>Η διαδικασία ρύθμισης θα εγκαταστήσει ιδιόκτητο λογισμικό που υπόκειται στους όρους αδειών προκειμένου να παρέχει πρόσθετες δυνατότητες και να ενισχύσει την εμπειρία του χρήστη.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1497,6 +1523,37 @@ The installer will quit and all changes will be lost.</source>
<translation>Επιλογή πακέτου</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Ελεύθερος χώρος</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Νέα κατάτμηση</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Όνομα</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Σύστημα αρχείων</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Σημείο προσάρτησης</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Μέγεθος</translation>
</message>
@@ -1963,12 +2020,12 @@ The installer will quit and all changes will be lost.</source>
<translation>Θέλετε σίγουρα να δημιουργήσετε έναν νέο πίνακα κατατμήσεων στο %1;</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1976,107 +2033,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Συλλογή πληροφοριών συστήματος...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Κατατμήσεις</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Εγκατάσταση του %1 <strong>παράλληλα με</strong> ένα άλλο λειτουργικό σύστημα στον δίσκο.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Διαγραφή</strong> του δίσκου και εγκατάσταση του %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Αντικατάσταση</strong> μιας κατάτμησης με το %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Χειροκίνητη</strong> τμηματοποίηση.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Εγκατάσταση του %1 <strong>παράλληλα με</strong> ένα άλλο λειτουργικό σύστημα στον δίσκο<strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Διαγραφή</strong> του δίσκου <strong>%2</strong> (%3) και εγκατάσταση του %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Αντικατάσταση</strong> μιας κατάτμησης στον δίσκο <strong>%2</strong> (%3) με το %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Χειροκίνητη</strong> τμηματοποίηση του δίσκου <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Δίσκος <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Τρέχον:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Μετά:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2287,69 +2344,69 @@ Output:
<translation>Τύπος</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Το επιλεγμένο στοιχείο φαίνεται να μην είναι ένα έγκυρο διαμέρισμα.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 δεν μπορεί να εγκατασταθεί σε άδειο χώρο. Παρακαλώ επίλεξε ένα υφιστάμενο διαμέρισμα.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 δεν μπορεί να εγκατασταθεί σε ένα εκτεταμένο διαμέρισμα. Παρακαλώ επίλεξε ένα υφιστάμενο πρωτεύον ή λογικό διαμέρισμα.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 δεν μπορεί να εγκατασταθεί σ' αυτό το διαμέρισμα.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Κατάτμηση δεδομένων (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Άγνωστη κατάτμηση συστήματος (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 κατάτμηση συστήματος (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Πουθενά στο σύστημα δεν μπορεί να ανιχθευθεί μία κατάτμηση EFI. Παρακαλώ επιστρέψτε πίσω και χρησιμοποιήστε τη χειροκίνητη τμηματοποίηση για την εγκατάσταση του %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>Η κατάτμηση συστήματος EFI στο %1 θα χρησιμοποιηθεί για την εκκίνηση του %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Κατάτμηση συστήματος EFI:</translation>
</message>
@@ -2451,7 +2508,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2753,7 +2810,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2770,12 +2827,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Αυτή είναι μια επισκόπηση του τι θα συμβεί μόλις ξεκινήσετε τη διαδικασία εγκατάστασης.</translation>
</message>
@@ -2886,7 +2943,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2894,43 +2951,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Το όνομα χρήστη είναι πολύ μακρύ.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Το όνομα χρήστη περιέχει μη έγκυρους χαρακτήρες. Επιτρέπονται μόνο πεζά γράμματα και αριθμητικά ψηφία.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Το όνομα υπολογιστή είναι πολύ σύντομο.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Το όνομα υπολογιστή είναι πολύ μακρύ.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Το όνομα υπολογιστή περιέχει μη έγκυρους χαρακτήρες. Επιτρέπονται μόνο γράμματα, αριθμητικά ψηφία και παύλες.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Οι κωδικοί πρόσβασης δεν ταιριάζουν!</translation>
</message>
@@ -2938,7 +2995,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Χρήστες</translation>
</message>
diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts
index 2f7ccb2d6f66032754692762cb2c6f619d0ac291..7304fcf34ee2ad318c9ec5d7eac3f266f64e0007 100644
--- a/lang/calamares_en.ts
+++ b/lang/calamares_en.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record of %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Boot Partition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>System Partition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Do not install a boot loader</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Tools</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Debug information</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Install</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Main script file %1 for python job %2 is not readable.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python error in job "%1".</translation>
</message>
@@ -597,18 +597,18 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Could not run command.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>The command needs to know the user's name, but no username is defined.</translation>
</message>
@@ -920,13 +920,13 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1244,6 +1244,32 @@ The installer will quit and all changes will be lost.</translation>
<translation>The screen is too small to display the installer.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation>OEM Batch Identifier</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation>Could not create directories <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation>Could not open file <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation>Could not write to file <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ The installer will quit and all changes will be lost.</translation>
<translation>Form</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>I accept the terms and conditions above.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><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.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>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.</translation>
</message>
@@ -1498,6 +1524,37 @@ The installer will quit and all changes will be lost.</translation>
<translation>Package selection</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation>Ba&tch:</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></translation>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation>OEM Configuration</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation>Set the OEM Batch Identifier to <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Free Space</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>New partition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>File System</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Mount Point</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Size</translation>
</message>
@@ -1964,12 +2021,12 @@ The installer will quit and all changes will be lost.</translation>
<translation>Are you sure you want to create a new partition table on %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Can not create new partition</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>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.</translation>
</message>
@@ -1977,107 +2034,107 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Gathering system information...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Partitions</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Install %1 <strong>alongside</strong> another operating system.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Erase</strong> disk and install %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Replace</strong> a partition with %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Manual</strong> partitioning.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disk <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Current:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>After:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>No EFI system partition configured</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>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.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>EFI system partition flag not set</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>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.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Boot partition not encrypted</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>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.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>has at least one disk device available.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>There are no partitons to install on.</translation>
</message>
@@ -2125,17 +2182,17 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Saving files for later ...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>No files configured to save for later.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Not all of the configured files could be preserved.</translation>
</message>
@@ -2291,69 +2348,69 @@ Output:
<translation>Form</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>The selected item does not appear to be a valid partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 cannot be installed on empty space. Please select an existing partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 cannot be installed on this partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Data partition (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Unknown system partition (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 system partition (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>The EFI system partition at %1 will be used for starting %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI system partition:</translation>
</message>
@@ -2455,7 +2512,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Resize Volume Group</translation>
</message>
@@ -2757,7 +2814,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Shell Processes Job</translation>
</message>
@@ -2774,12 +2831,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation>This is an overview of what will happen once you start the setup procedure.</translation>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>This is an overview of what will happen once you start the install procedure.</translation>
</message>
@@ -2890,7 +2947,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Feedback</translation>
</message>
@@ -2898,43 +2955,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Your username is too long.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Your hostname is too short.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Your hostname is too long.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Your passwords do not match!</translation>
</message>
@@ -2942,7 +2999,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Users</translation>
</message>
diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts
index 518a8c52f2bc67d66bcea43579c4168841b36281..72cb5a6df7547a9f6d6e7279d50f54caee7dab7a 100644
--- a/lang/calamares_en_GB.ts
+++ b/lang/calamares_en_GB.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record of %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Boot Partition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>System Partition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Do not install a boot loader</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Tools</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Debug information</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Install</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Main script file %1 for python job %2 is not readable.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python error in job "%1".</translation>
</message>
@@ -596,18 +596,18 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Could not run command.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>The command needs to know the user's name, but no username is defined.</translation>
</message>
@@ -919,13 +919,13 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1243,6 +1243,32 @@ The installer will quit and all changes will be lost.</translation>
<translation>The screen is too small to display the installer.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ The installer will quit and all changes will be lost.</translation>
<translation>Form</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>I accept the terms and conditions above.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><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.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>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.</translation>
</message>
@@ -1497,6 +1523,37 @@ The installer will quit and all changes will be lost.</translation>
<translation>Package selection</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Free Space</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>New partition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>File System</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Mount Point</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Size</translation>
</message>
@@ -1963,12 +2020,12 @@ The installer will quit and all changes will be lost.</translation>
<translation>Are you sure you want to create a new partition table on %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Can not create new partition</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>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.</translation>
</message>
@@ -1976,107 +2033,107 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Gathering system information...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Partitions</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Install %1 <strong>alongside</strong> another operating system.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Erase</strong> disk and install %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Replace</strong> a partition with %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Manual</strong> partitioning.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disk <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Current:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>After:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>No EFI system partition configured</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>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.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>EFI system partition flag not set</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>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.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Boot partition not encrypted</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>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.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Saving files for later...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>No files configured to save for later.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Not all of the configured files could be preserved.</translation>
</message>
@@ -2290,69 +2347,69 @@ Output:
<translation>Form</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>The selected item does not appear to be a valid partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 cannot be installed on empty space. Please select an existing partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 cannot be installed on this partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Data partition (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Unknown system partition (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 system partition (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>The EFI system partition at %1 will be used for starting %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI system partition:</translation>
</message>
@@ -2454,7 +2511,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2756,7 +2813,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Shell Processes Job</translation>
</message>
@@ -2773,12 +2830,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>This is an overview of what will happen once you start the install procedure.</translation>
</message>
@@ -2889,7 +2946,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Feedback</translation>
</message>
@@ -2897,43 +2954,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Your username is too long.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Your hostname is too short.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Your hostname is too long.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Your passwords do not match!</translation>
</message>
@@ -2941,7 +2998,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Users</translation>
</message>
diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts
index fab7d340111429f04f6658d91dae8646fe4e782e..d223d3a0e6287df257de1b53ab2b9e8a7bda36f3 100644
--- a/lang/calamares_eo.ts
+++ b/lang/calamares_eo.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1(%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Iloj</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation type="unfinished"/>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instali</translation>
</message>
@@ -180,7 +180,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation type="unfinished"/>
</message>
@@ -596,18 +596,18 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -919,13 +919,13 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1243,6 +1243,32 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1497,6 +1523,37 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1963,12 +2020,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1976,107 +2033,107 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2287,69 +2344,69 @@ Output:
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2451,7 +2508,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2753,7 +2810,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2770,12 +2827,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2886,7 +2943,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2894,43 +2951,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
</message>
@@ -2938,7 +2995,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts
index 0a7ab230670f7569bb8c0b1d13584d6d4b93e5bd..9265f7256884a8329e0e0e3cfc89fdfe7bf4024f 100644
--- a/lang/calamares_es.ts
+++ b/lang/calamares_es.ts
@@ -21,27 +21,27 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record de %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Partición de Arranque</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Partición del Sistema</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>No instalar el gestor de arranque</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -98,7 +98,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
<translation>Herramientas</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Información de depuración.</translation>
</message>
@@ -106,7 +106,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instalar</translation>
</message>
@@ -116,7 +116,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
<message>
<location filename="../src/libcalamares/JobExample.cpp" line="39"/>
<source>Job failed (%1)</source>
- <translation type="unfinished"/>
+ <translation>Trabajo fallido (%1)</translation>
</message>
<message>
<location filename="../src/libcalamares/JobExample.cpp" line="39"/>
@@ -181,7 +181,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
<translation>El script principal %1 del proceso python %2 no es accesible.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Error Boost.Python en el proceso "%1".</translation>
</message>
@@ -597,18 +597,18 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>No se pudo ejecutar el comando.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>El comando corre en el ambiente anfitrión y necesita saber el directorio raiz, pero no está definido el punto de montaje de la raiz</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>El comando necesita saber el nombre de usuario, pero no hay nombre de usuario definido.</translation>
</message>
@@ -920,13 +920,13 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1-(%2)</translation>
@@ -1244,6 +1244,32 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<translation>La pantalla es demasiado pequeña para mostrar el instalador.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<translation>Formulario</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Acepto los términos y condiciones anteriores.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Acuerdo de licencia</ h1> Este procedimiento de instalación instalará el software propietario que está sujeto a los términos de licencia.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Por favor, revise los acuerdos de licencia de usuario final (EULAs) anterior. <br/>Si usted no está de acuerdo con los términos, el procedimiento de instalación no puede continuar.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Acuerdo de licencia</ h1> Este procedimiento de configuración se puede instalar el software propietario que está sujeta a condiciones de licencia con el fin de proporcionar características adicionales y mejorar la experiencia del usuario.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Por favor, revise los acuerdos de licencia de usuario final (EULAs) anterior.<br/>Si usted no está de acuerdo con los términos, el software propietario no se instalará, y las alternativas de código abierto se utilizarán en su lugar.</translation>
</message>
@@ -1498,6 +1524,37 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<translation>Selección de paquetes</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Espacio libre</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Partición nueva</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Nombre</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Sistema de archivos</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Punto de montaje</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Tamaño</translation>
</message>
@@ -1964,12 +2021,12 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<translation>¿Está seguro de querer crear una nueva tabla de particiones en %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>No se puede crear una partición nueva</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>La tabla de particiones en %1 tiene %2 particiones primarias y no se pueden agregar más. Por favor remueva una partición primaria y agregue una partición extendida en su reemplazo.</translation>
</message>
@@ -1977,107 +2034,107 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Obteniendo información del sistema...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Particiones</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Instalar %1 <strong>junto a</strong> otro sistema operativo.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Borrar</strong> disco e instalar %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Reemplazar</strong> una partición con %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation>Particionamiento <strong>manual</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Instalar %1 <strong>junto a</strong> otro sistema operativo en disco <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Borrar</strong> disco <strong>%2</strong> (%3) e instalar %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Reemplazar</strong> una partición en disco <strong>%2</strong> (%3) con %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>Particionamiento <strong>manual</strong> en disco <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disco <strong>%1<strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Corriente</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Despúes:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>No hay una partición del sistema EFI configurada</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Una partición EFI del sistema es necesaria para empezar %1.<br/><br/>Para configurar una partición EFI, vuelva atrás y seleccione crear un sistema de archivos FAT32 con el argumento <strong>esp</strong> activado y montada en <strong>%2</strong>.<br/><br/>Puede continuar sin configurar una partición EFI pero su sistema puede fallar al arrancar.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Bandera EFI no establecida en la partición del sistema</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Una partición EFI del sistema es necesaria para empezar %1.<br/><br/>Una partición EFI fue configurada para ser montada en <strong>%2</strong> pero su argumento <strong>esp</strong> no fue seleccionado.<br/>Para activar el argumento, vuelva atrás y edite la partición.<br/><br/>Puede continuar sin configurar el argumento pero su sistema puede fallar al arrancar.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Partición de arranque no cifrada</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Se estableció una partición de arranque aparte junto con una partición raíz cifrada, pero la partición de arranque no está cifrada.<br/><br/>Hay consideraciones de seguridad con esta clase de instalación, porque los ficheros de sistema importantes se mantienen en una partición no cifrada.<br/>Puede continuar si lo desea, pero el desbloqueo del sistema de ficheros ocurrirá más tarde durante el arranque del sistema.<br/>Para cifrar la partición de arranque, retroceda y vuelva a crearla, seleccionando <strong>Cifrar</strong> en la ventana de creación de la partición.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2125,17 +2182,17 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Guardando archivos para después ...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>No hay archivos configurados para guardarlos para después.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>No todos los archivos de configuración se pudieron preservar.</translation>
</message>
@@ -2291,69 +2348,69 @@ Salida:
<translation>Formulario</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Seleccione dónde instalar %1<br/><font color="red">Atención: </font>esto borrará todos sus archivos en la partición seleccionada.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>El elemento seleccionado no parece ser una partición válida.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 no se puede instalar en el espacio vacío. Por favor, seleccione una partición existente.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 no se puede instalar en una partición extendida. Por favor, seleccione una partición primaria o lógica existente.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 no se puede instalar en esta partición.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Partición de datos (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Partición desconocida del sistema (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 partición del sistema (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>La partición %1 es demasiado pequeña para %2. Por favor, seleccione una participación con capacidad para al menos %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>No se puede encontrar una partición de sistema EFI en ninguna parte de este sistema. Por favor, retroceda y use el particionamiento manual para establecer %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 se instalará en %2.<br/><font color="red">Advertencia: </font>Todos los datos en la partición %2 se perderán.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>La partición del sistema EFI en %1 se utilizará para iniciar %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Partición del sistema EFI:</translation>
</message>
@@ -2455,7 +2512,7 @@ Salida:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Cambiar el tamaño del grupo de volúmenes</translation>
</message>
@@ -2757,7 +2814,7 @@ Salida:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Tarea de procesos del interprete de comandos</translation>
</message>
@@ -2774,12 +2831,12 @@ Salida:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Esto es una previsualización de que ocurrirá una vez que empiece la instalación.</translation>
</message>
@@ -2890,7 +2947,7 @@ Salida:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Respuesta</translation>
</message>
@@ -2898,43 +2955,43 @@ Salida:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Su nombre de usuario es demasiado largo.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Su nombre de usuario contiene caracteres inválidos. Solo se admiten letras minúsculas y números.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>El nombre del Host es demasiado corto.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>El nombre del Host es demasiado largo. </translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>El nombre del Host contiene caracteres inválidos. Solo se admiten letras, números y guiones.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>¡Sus contraseñas no coinciden!</translation>
</message>
@@ -2942,7 +2999,7 @@ Salida:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Usuarios</translation>
</message>
@@ -3056,7 +3113,7 @@ Salida:
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/>
<source>About %1 setup</source>
- <translation type="unfinished"/>
+ <translation>Acerca de la configuración %1</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="91"/>
diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts
index ee7705bda4f5da960ce810d2e5c7c2b33b96040c..78babe418f4792ce9c26939533835b2137b2bd9a 100644
--- a/lang/calamares_es_MX.ts
+++ b/lang/calamares_es_MX.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record de %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Partición de arranque</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Partición del Sistema</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation> No instalar el gestor de arranque</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Herramientas</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Información de depuración</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instalar</translation>
</message>
@@ -180,7 +180,7 @@
<translation>El script principal %1 del proceso python %2 no es accesible.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Error Boost.Python en el proceso "%1".</translation>
</message>
@@ -597,18 +597,18 @@ El instalador terminará y se perderán todos los cambios.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>No puede ejecutarse el comando.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>Este comando se ejecuta en el entorno host y necesita saber la ruta root, pero no hay rootMountPoint definido.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Este comando necesita saber el nombre de usuario, pero no hay nombre de usuario definido.</translation>
</message>
@@ -920,13 +920,13 @@ El instalador terminará y se perderán todos los cambios.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1244,6 +1244,32 @@ El instalador terminará y se perderán todos los cambios.</translation>
<translation>La pantalla es muy pequeña para mostrar el instalador</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ El instalador terminará y se perderán todos los cambios.</translation>
<translation>Formulario</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Acepto los terminos y condiciones anteriores.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Acuerdo de Licencia</h1>Este procediemiento de configuración instalará software que está sujeto a terminos de la licencia.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Por favor, revise el acuerdo de licencia de usuario final (EULAs) anterior. <br/>Si usted no está de acuerdo con los términos, el procedimiento de configuración no podrá continuar.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Acuerdo de licencia</ h1> Este procedimiento de configuración se puede instalar software privativo que está sujeto a condiciones de licencia con el fin de proporcionar características adicionales y mejorar la experiencia del usuario.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Por favor revise los acuerdos de licencia de usuario final (EULAs) anterior.<br/>Si usted no está de acuerdo con los términos, el software privativo no se instalará, y las alternativas de código abierto se utilizarán en su lugar.</translation>
</message>
@@ -1498,6 +1524,37 @@ El instalador terminará y se perderán todos los cambios.</translation>
<translation>Selección de paquete</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ El instalador terminará y se perderán todos los cambios.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Espacio libre</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Partición nueva</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Nombre</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Sistema de archivos</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Punto de montaje</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Tamaño</translation>
</message>
@@ -1964,12 +2021,12 @@ El instalador terminará y se perderán todos los cambios.</translation>
<translation>¿Está seguro de querer crear una nueva tabla de particiones en %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>No se puede crear nueva partición</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>La tabla de partición en %1 ya tiene %2 particiones primarias, y no pueden agregarse mas. Favor remover una partición primaria y en cambio, agregue una partición extendida.</translation>
</message>
@@ -1977,107 +2034,107 @@ El instalador terminará y se perderán todos los cambios.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Obteniendo información del sistema...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Particiones</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation> Instalar %1 <strong>junto con</strong> otro sistema operativo.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation> <strong>Borrar</strong> el disco e instalar %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation> <strong>Reemplazar</strong> una parición con %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation> Particionamiento <strong>manual</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation> Instalar %1 <strong>junto con</strong> otro sistema operativo en el disco <strong>%2</strong>(%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Borrar</strong> el disco <strong>%2<strong> (%3) e instalar %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation> <strong>Reemplazar</strong> una parición en el disco <strong>%2</strong> (%3) con %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation> Particionar <strong>manualmente</strong> el disco <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disco <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Actual:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Después:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Sistema de partición EFI no configurada</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Un sistema de partición EFI es necesario para iniciar %1. <br/><br/>Para configurar un sistema de partición EFI, Regrese y seleccione o cree un sistema de archivos FAT32 con la bandera <strong>esp</strong> activada y el punto de montaje <strong>%2</strong>. <br/><br/>Puede continuar sin configurar una partición de sistema EFI, pero su sistema podría fallar al iniciar.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Indicador de partición del sistema EFI no configurado</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Una partición del sistema EFI es necesaria para iniciar% 1. <br/><br/>Una partición se configuró con el punto de montaje <strong>% 2</strong>, pero su bandera <strong>esp</strong> no está configurada. <br/>Para establecer el indicador, retroceda y edite la partición.<br/><br/> Puede continuar sin configurar el indicador, pero su sistema puede fallar al iniciar.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Partición de arranque no encriptada</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Se creó una partición de arranque separada junto con una partición raíz cifrada, pero la partición de arranque no está encriptada.<br/><br/> Existen problemas de seguridad con este tipo de configuración, ya que los archivos importantes del sistema se guardan en una partición no encriptada. <br/>Puede continuar si lo desea, pero el desbloqueo del sistema de archivos ocurrirá más tarde durante el inicio del sistema. <br/>Para encriptar la partición de arranque, retroceda y vuelva a crearla, seleccionando <strong>Encriptar</strong> en la ventana de creación de la partición.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2125,17 +2182,17 @@ El instalador terminará y se perderán todos los cambios.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Guardando archivos para más tarde ...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>No hay archivos configurados para guardar más tarde.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>No todos los archivos configurados podrían conservarse.</translation>
</message>
@@ -2291,70 +2348,70 @@ Salida
<translation>Formulario</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Selecciona donde instalar %1.<br/><font color="red">Aviso: </font>Se borrarán todos los archivos de la partición seleccionada.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>El elemento seleccionado no parece ser una partición válida.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 no se puede instalar en un espacio vacío. Selecciona una partición existente.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 no se puede instalar en una partición extendida. Selecciona una partición primaria o lógica.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>No se puede instalar %1 en esta partición.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Partición de datos (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Partición de sistema desconocida (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 partición de sistema (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation> <strong>%4</strong><br/><br/>La partición %1 es muy pequeña para %2. Selecciona otra partición que tenga al menos %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>No se puede encontrar una partición EFI en este sistema. Por favor vuelva atrás y use el particionamiento manual para configurar %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 sera instalado en %2.<br/><font color="red">Advertencia: </font>toda la información en la partición %2 se perdera.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>La partición EFI en %1 será usada para iniciar %2.
</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Partición de sistema EFI:</translation>
</message>
@@ -2456,7 +2513,7 @@ Salida
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2758,7 +2815,7 @@ Salida
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Trabajo de procesos Shell</translation>
</message>
@@ -2775,12 +2832,12 @@ Salida
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Esto es un resumen de lo que pasará una vez que inicie el procedimiento de instalación.</translation>
</message>
@@ -2891,7 +2948,7 @@ Salida
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Retroalimentación</translation>
</message>
@@ -2899,43 +2956,43 @@ Salida
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Tu nombre de usuario es demasiado largo.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Tu nombre de usuario contiene caracteres no válidos. Solo se pueden usar letras minúsculas y números.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>El nombre de tu equipo es demasiado corto.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>El nombre de tu equipo es demasiado largo.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Tu nombre de equipo contiene caracteres no válidos Sólo se pueden usar letras, números y guiones.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Las contraseñas no coinciden!</translation>
</message>
@@ -2943,7 +3000,7 @@ Salida
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Usuarios</translation>
</message>
diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts
index 48fe2e534d0587090d9e97b81b83fbf26bbb4083..2ce9e5759eb57f2a9665ccb83600f52e93b1554a 100644
--- a/lang/calamares_es_PR.ts
+++ b/lang/calamares_es_PR.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Registro de arranque maestro de %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Partición de arranque</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Partición del sistema</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -97,7 +97,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Información de depuración</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instalar</translation>
</message>
@@ -180,7 +180,7 @@
<translation>El script principal %1 del proceso python %2 no es accesible.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Error Boost.Python en el proceso "%1".</translation>
</message>
@@ -595,18 +595,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -918,13 +918,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1242,6 +1242,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1320,27 +1346,27 @@ The installer will quit and all changes will be lost.</source>
<translation>Formulario</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1496,6 +1522,37 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1862,34 +1919,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1962,12 +2019,12 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1975,107 +2032,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2123,17 +2180,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2286,69 +2343,69 @@ Output:
<translation>Formulario</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2450,7 +2507,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2752,7 +2809,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2769,12 +2826,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2885,7 +2942,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2893,43 +2950,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
</message>
@@ -2937,7 +2994,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts
index e74686a8bf3615ae7479f9415a033b414c29946b..9e15a4d918a23cabcf2961a548757662b42bbcf9 100644
--- a/lang/calamares_et.ts
+++ b/lang/calamares_et.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>%1 Master Boot Record</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Käivituspartitsioon</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Süsteemipartitsioon</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Ära paigalda käivituslaadurit</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Tööriistad</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Silumisteave</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Paigalda</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Põhiskripti fail %1 python tööle %2 pole loetav.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python viga töös "%1".</translation>
</message>
@@ -596,18 +596,18 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Käsku ei saanud käivitada.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>See käsklus käivitatakse hostikeskkonnas ning peab teadma juurteed, kuid rootMountPoint pole defineeritud.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Käsklus peab teadma kasutaja nime, aga kasutajanimi pole defineeritud.</translation>
</message>
@@ -919,13 +919,13 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1243,6 +1243,32 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation>
<translation>Ekraan on paigaldaja kuvamiseks liiga väike.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation>
<translation>Form</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Ma nõustun alljärgevate tingimustega.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Litsensileping</h1>See seadistusprotseduur paigaldab omandiõigusega tarkvara, mis vastab litsensitingimustele.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Palun loe läbi allolevad lõppkasutaja litsensilepingud (EULAd).<br/>Kui sa tingimustega ei nõustu, ei saa seadistusprotseduur jätkata.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Litsensileping</h1>See seadistusprotseduur võib paigaldada omandiõigusega tarkvara, mis vastab litsensitingimustele, et pakkuda lisafunktsioone ja täiendada kasutajakogemust.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Palun loe läbi allolevad lõppkasutaja litsensilepingud (EULAd).<br/>Kui sa tingimustega ei nõustu, ei paigaldata omandiõigusega tarkvara ning selle asemel kasutatakse avatud lähtekoodiga alternatiive.</translation>
</message>
@@ -1497,6 +1523,37 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation>
<translation>Paketivalik</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Tühi ruum</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Uus partitsioon</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Nimi</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Failisüsteem</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Monteerimispunkt</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Suurus</translation>
</message>
@@ -1963,12 +2020,12 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation>
<translation>Kas soovid kindlasti luua uut partitsioonitabelit kettale %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Uut partitsiooni ei saa luua</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>Partitsioonitabel kohas %1 juba omab %2 peamist partitsiooni ning rohkem juurde ei saa lisada. Palun eemalda selle asemel üks peamine partitsioon ja lisa juurde laiendatud partitsioon. </translation>
</message>
@@ -1976,107 +2033,107 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Hangin süsteemiteavet...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Partitsioonid</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Paigalda %1 praeguse operatsioonisüsteemi <strong>kõrvale</strong></translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Tühjenda</strong> ketas ja paigalda %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Asenda</strong> partitsioon operatsioonisüsteemiga %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Käsitsi</strong> partitsioneerimine.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Paigalda %1 teise operatsioonisüsteemi <strong>kõrvale</strong> kettal <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Tühjenda</strong> ketas <strong>%2</strong> (%3) ja paigalda %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Asenda</strong> partitsioon kettal <strong>%2</strong> (%3) operatsioonisüsteemiga %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Käsitsi</strong> partitsioneerimine kettal <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Ketas <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Hetkel:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Pärast:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>EFI süsteemipartitsiooni pole seadistatud</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>%1 käivitamiseks on vajalik EFI süsteemipartitsioon.<br/><br/>Et seadistada EFI süsteemipartitsiooni, mine tagasi ja vali või loo FAT32 failisüsteem sildiga <strong>esp</strong> ja monteerimispunktiga <strong>%2</strong>.<br/><br/>Sa võid jätkata ilma EFI süsteemipartitsiooni seadistamata aga su süsteem ei pruugi käivituda.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>EFI süsteemipartitsiooni silt pole määratud</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>%1 käivitamiseks on vajalik EFI süsteemipartitsioon.<br/><br/>Partitsioon seadistati monteerimispunktiga <strong>%2</strong> aga sellel ei määratud <strong>esp</strong> silti.<br/>Sildi määramiseks mine tagasi ja muuda partitsiooni.<br/><br/>Sa võid jätkata ilma silti seadistamata aga su süsteem ei pruugi käivituda.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Käivituspartitsioon pole krüptitud</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Eraldi käivituspartitsioon seadistati koos krüptitud juurpartitsiooniga, aga käivituspartitsioon ise ei ole krüptitud.<br/><br/>Selle seadistusega kaasnevad turvaprobleemid, sest tähtsad süsteemifailid hoitakse krüptimata partitsioonil.<br/>Sa võid soovi korral jätkata, aga failisüsteemi lukust lahti tegemine toimub hiljem süsteemi käivitusel.<br/>Et krüpteerida käivituspartisiooni, mine tagasi ja taasloo see, valides <strong>Krüpteeri</strong> partitsiooni loomise aknas.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Salvestan faile hiljemaks...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Ühtegi faili ei konfigureeritud hiljemaks salvestamiseks.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Ühtegi konfigureeritud faili ei suudetud säilitada.</translation>
</message>
@@ -2290,69 +2347,69 @@ Väljund:
<translation>Form</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Vali, kuhu soovid %1 paigaldada.<br/><font color="red">Hoiatus: </font>see kustutab valitud partitsioonilt kõik failid.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Valitud üksus ei paista olevat sobiv partitsioon.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 ei saa paigldada tühjale kohale. Palun vali olemasolev partitsioon.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 ei saa paigaldada laiendatud partitsioonile. Palun vali olemasolev põhiline või loogiline partitsioon.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 ei saa sellele partitsioonile paigaldada.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Andmepartitsioon (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Tundmatu süsteemipartitsioon (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 süsteemipartitsioon (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Partitsioon %1 on liiga väike %2 jaoks. Palun vali partitsioon suurusega vähemalt %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Sellest süsteemist ei leitud EFI süsteemipartitsiooni. Palun mine tagasi ja kasuta käsitsi partitsioneerimist, et seadistada %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 paigaldatakse partitsioonile %2.<br/><font color="red">Hoiatus: </font>kõik andmed partitsioonil %2 kaovad.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>EFI süsteemipartitsioon asukohas %1 kasutatakse %2 käivitamiseks.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI süsteemipartitsioon:</translation>
</message>
@@ -2454,7 +2511,7 @@ Väljund:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Muuda kettagrupi suurust</translation>
</message>
@@ -2756,7 +2813,7 @@ Väljund:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Kesta protsesside töö</translation>
</message>
@@ -2773,12 +2830,12 @@ Väljund:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>See on ülevaade sellest mis juhtub, kui alustad paigaldusprotseduuri.</translation>
</message>
@@ -2889,7 +2946,7 @@ Väljund:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Tagasiside</translation>
</message>
@@ -2897,43 +2954,43 @@ Väljund:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Sinu kasutajanimi on liiga pikk.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Sinu kasutajanimi sisaldab sobimatuid tähemärke. Lubatud on ainult väiketähed ja numbrid.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Sinu hostinimi on liiga lühike.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Sinu hostinimi on liiga pikk.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Sinu hostinimi sisaldab sobimatuid tähemärke. Ainult tähed, numbrid ja sidekriipsud on lubatud.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Sinu paroolid ei ühti!</translation>
</message>
@@ -2941,7 +2998,7 @@ Väljund:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Kasutajad</translation>
</message>
diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts
index 41deb4c28190fa102fc239263ed7f4d7fe406fdc..e5e21cf8f78f91ec0d20a2215d6e692ac592a391 100644
--- a/lang/calamares_eu.ts
+++ b/lang/calamares_eu.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>%1-(e)n Master Boot Record</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Abio partizioa</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Sistema-partizioa</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Ez instalatu abio kargatzailerik</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Tresnak</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Arazte informazioa</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instalatu</translation>
</message>
@@ -180,7 +180,7 @@
<translation>%1 script fitxategi nagusia ezin da irakurri python %2 lanerako</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python errorea "%1" lanean.</translation>
</message>
@@ -596,18 +596,18 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Ezin izan da komandoa exekutatu.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>Komandoa exekutatzen da ostalariaren inguruan eta erro bidea jakin behar da baina erroaren muntaketa punturik ez da zehaztu.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Komandoak erabiltzailearen izena jakin behar du baina ez da zehaztu erabiltzaile-izenik.</translation>
</message>
@@ -919,13 +919,13 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1243,6 +1243,32 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation>
<translation>Pantaila txikiegia da instalatzailea erakusteko.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation>
<translation>Formulario</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Goiko baldintzak onartzen ditut.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1497,6 +1523,37 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation>
<translation>Pakete aukeraketa</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Espazio librea</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Partizio berria</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Izena</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Fitxategi Sistema</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Muntatze Puntua</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Tamaina</translation>
</message>
@@ -1963,12 +2020,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation>
<translation>Ziur al zaude partizio-taula berri bat %1-(e)an sortu nahi duzula?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Ezin da partizio berririk sortu</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1976,107 +2033,107 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Sistemaren informazioa eskuratzen...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Partizioak</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Unekoa: </translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Ondoren:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Fitxategiak geroko gordetzen...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2289,69 +2346,69 @@ Irteera:
<translation>Formulario</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>%1eko EFI partizio sistema erabiliko da abiarazteko %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI sistema-partizioa:</translation>
</message>
@@ -2453,7 +2510,7 @@ Irteera:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Bolumen Talde berriaren tamaina aldatu</translation>
</message>
@@ -2755,7 +2812,7 @@ Irteera:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2772,12 +2829,12 @@ Irteera:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2888,7 +2945,7 @@ Irteera:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Feedback</translation>
</message>
@@ -2896,43 +2953,43 @@ Irteera:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Zure erabiltzaile-izena luzeegia da.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Zure erabiltzaile-izena baliodun ez diren karaktereak ditu. Letra xeheak eta zenbakiak bakarrik onartzen dira.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Zure ostalari-izena laburregia da.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Zure ostalari-izena luzeegia da.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Zure ostalariak baliodun ez diren karaktereak ditu. Letrak, zenbakiak eta marratxoak bakarrik onartzen dira.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Pasahitzak ez datoz bat!</translation>
</message>
@@ -2940,7 +2997,7 @@ Irteera:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Erabiltzaileak</translation>
</message>
diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts
index cd9dd17087b16ba0ba3fc934019da4624805b2a6..8dced3e460172937fee02b97c0a53fa7763693f3 100644
--- a/lang/calamares_fa.ts
+++ b/lang/calamares_fa.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -97,7 +97,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation type="unfinished"/>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation type="unfinished"/>
</message>
@@ -180,7 +180,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation type="unfinished"/>
</message>
@@ -595,18 +595,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -918,13 +918,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1242,6 +1242,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1320,27 +1346,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1496,6 +1522,37 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1862,34 +1919,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1962,12 +2019,12 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1975,107 +2032,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2123,17 +2180,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2286,69 +2343,69 @@ Output:
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2450,7 +2507,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2752,7 +2809,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2769,12 +2826,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2885,7 +2942,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2893,43 +2950,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
</message>
@@ -2937,7 +2994,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts
index 46a06147f4d4ebb1fa7cf83f3b0d34b3c37cd51a..1a66ae17d7e8f0e754a2ef2a96dd6144e07511da 100644
--- a/lang/calamares_fi_FI.ts
+++ b/lang/calamares_fi_FI.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>%1:n MBR</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Käynnistysosio</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Järjestelmäosio</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -97,7 +97,7 @@
<translation>Työkalut</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation type="unfinished"/>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Asenna</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Pääskriptitiedosto %1 pythonin työlle %2 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python virhe työlle "%1".</translation>
</message>
@@ -596,18 +596,18 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -919,13 +919,13 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1243,6 +1243,32 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<translation>Lomake</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1497,6 +1523,37 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Vapaa tila</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Uusi osiointi</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Nimi</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Tiedostojärjestelmä</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Liitoskohta</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Koko</translation>
</message>
@@ -1963,12 +2020,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<translation>Oletko varma, että haluat luoda uuden osion %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1976,107 +2033,107 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Kerätään järjestelmän tietoja...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Osiot</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Jälkeen:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2287,69 +2344,69 @@ Output:
<translation>Lomake</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Valitse minne %1 asennetaan.<br/><font color="red">Varoitus: </font>tämä poistaa kaikki tiedostot valitulta osiolta.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Valitsemaasi kohta ei näytä olevan kelvollinen osio.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 ei voi asentaa tyhjään tilaan. Valitse olemassa oleva osio.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 ei voida asentaa jatketun osion. Valitse olemassa oleva ensisijainen tai looginen osio.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 ei voida asentaa tähän osioon.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Data osio (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Tuntematon järjestelmä osio (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 järjestelmäosio (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2451,7 +2508,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2753,7 +2810,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2770,12 +2827,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2886,7 +2943,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2894,43 +2951,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Käyttäjänimesi on liian pitkä.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Isäntänimesi on liian lyhyt.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Isäntänimesi on liian pitkä.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Isäntänimesi sisältää epäkelpoja merkkejä. Vain kirjaimet, numerot ja väliviivat ovat sallittuja.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Salasanasi eivät täsmää!</translation>
</message>
@@ -2938,7 +2995,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Käyttäjät</translation>
</message>
diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts
index dcb65648491b233fc39493b19b8c1c75a1870a31..8bf0df529896c74ded3d852ccd3f25dea86d755d 100644
--- a/lang/calamares_fr.ts
+++ b/lang/calamares_fr.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record de %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Partition de démarrage</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Partition Système</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Ne pas installer de chargeur de démarrage</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Outils</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Informations de dépannage</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Installer</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Le fichier de script principal %1 pour la tâche python %2 n'est pas accessible en lecture.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Erreur Boost.Python pour le job "%1".</translation>
</message>
@@ -597,18 +597,18 @@ L'installateur se fermera et les changements seront perdus.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>La commande n'a pas pu être exécutée.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>La commande est exécutée dans l'environnement hôte et a besoin de connaître le chemin racine, mais aucun point de montage racine n'est défini.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>La commande a besoin de connaître le nom de l'utilisateur, mais aucun nom d'utilisateur n'est défini.</translation>
</message>
@@ -920,13 +920,13 @@ L'installateur se fermera et les changements seront perdus.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1244,6 +1244,32 @@ L'installateur se fermera et les changements seront perdus.</translation>
<translation>L'écran est trop petit pour afficher l'installateur.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation>Impossible de créer les répertoires <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation>Impossible d'ouvrir le fichier <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation>Impossible d'écrire dans le fichier <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ L'installateur se fermera et les changements seront perdus.</translation>
<translation>Formulaire</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>J'accepte les termes et conditions ci-dessus.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Accord de licence</h1>Cette procédure de configuration va installer des logiciels propriétaire sujet à des termes de licence.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Merci de relire les Contrats de Licence Utilisateur Final (CLUF/EULA) ci-dessus.<br/>Si vous n'acceptez pas les termes, la procédure ne peut pas continuer.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Accord de licence</h1>Cette procédure peut installer des logiciels propriétaires qui sont soumis à des termes de licence afin d'ajouter des fonctionnalités et améliorer l'expérience utilisateur.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Merci de relire les Contrats de Licence Utilisateur Final (CLUF/EULA) ci-dessus.<br/>Si vous n'acceptez pas les termes, les logiciels propriétaires ne seront pas installés, et des alternatives open-source seront utilisées à la place.</translation>
</message>
@@ -1498,6 +1524,37 @@ L'installateur se fermera et les changements seront perdus.</translation>
<translation>Sélection des paquets</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ L'installateur se fermera et les changements seront perdus.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Espace libre</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Nouvelle partition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Nom</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Système de fichiers</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Point de montage</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Taille</translation>
</message>
@@ -1964,12 +2021,12 @@ L'installateur se fermera et les changements seront perdus.</translation>
<translation>Êtes-vous sûr de vouloir créer une nouvelle table de partitionnement sur %1 ?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Impossible de créer une nouvelle partition</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>La table de partition sur %1 contient déjà %2 partitions primaires, et aucune supplémentaire ne peut être ajoutée. Veuillez supprimer une partition primaire et créer une partition étendue à la place.</translation>
</message>
@@ -1977,107 +2034,107 @@ L'installateur se fermera et les changements seront perdus.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Récupération des informations système…</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Partitions</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Installer %1 <strong>à côté</strong>d'un autre système d'exploitation.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Effacer</strong> le disque et installer %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Remplacer</strong> une partition avec %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation>Partitionnement <strong>manuel</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Installer %1 <strong>à côté</strong> d'un autre système d'exploitation sur le disque <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Effacer</strong> le disque <strong>%2</strong> (%3) et installer %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Remplacer</strong> une partition sur le disque <strong>%2</strong> (%3) avec %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>Partitionnement <strong>manuel</strong> sur le disque <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disque <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Actuel :</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Après :</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Aucune partition système EFI configurée</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Une partition système EFI est nécessaire pour démarrer %1.<br/><br/>Pour configurer une partition système EFI, revenez en arrière et sélectionnez ou créez une partition FAT32 avec le drapeau <strong>esp</strong> activé et le point de montage <strong>%2</strong>.<br/><br/>Vous pouvez continuer sans configurer de partition système EFI mais votre système pourrait refuser de démarrer.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Drapeau de partition système EFI non configuré</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Une partition système EFI est nécessaire pour démarrer %1.<br/><br/>Une partition a été configurée avec le point de montage <strong>%2</strong> mais son drapeau <strong>esp</strong> n'est pas activé.<br/>Pour activer le drapeau, revenez en arrière et éditez la partition.<br/><br/>Vous pouvez continuer sans activer le drapeau mais votre système pourrait refuser de démarrer.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Partition d'amorçage non chiffrée.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Une partition d'amorçage distincte a été configurée avec une partition racine chiffrée, mais la partition d'amorçage n'est pas chiffrée. <br/> <br/> Il y a des problèmes de sécurité avec ce type d'installation, car des fichiers système importants sont conservés sur une partition non chiffrée <br/> Vous pouvez continuer si vous le souhaitez, mais le déverrouillage du système de fichiers se produira plus tard au démarrage du système. <br/> Pour chiffrer la partition d'amorçage, revenez en arrière et recréez-la, en sélectionnant <strong> Chiffrer </ strong> dans la partition Fenêtre de création.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>a au moins un disque disponible.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>Il n'y a aucune partition pour l'installation.</translation>
</message>
@@ -2126,17 +2183,17 @@ Vous pouvez obtenir un aperçu des différentes apparences en cliquant sur celle
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Sauvegarde des fichiers en cours pour plus tard...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Aucun fichier de sélectionné pour sauvegarde ultérieure.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Certains des fichiers configurés n'ont pas pu être préservés.</translation>
</message>
@@ -2292,69 +2349,69 @@ Sortie
<translation>Formulaire</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Sélectionnez ou installer %1.<br><font color="red">Attention: </font>ceci va effacer tous les fichiers sur la partition sélectionnée.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>L'objet sélectionné ne semble pas être une partition valide.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 ne peut pas être installé sur un espace vide. Merci de sélectionner une partition existante.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 ne peut pas être installé sur une partition étendue. Merci de sélectionner une partition primaire ou logique existante.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 ne peut pas être installé sur cette partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Partition de données (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Partition système inconnue (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>Partition système %1 (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>La partition %1 est trop petite pour %2. Merci de sélectionner une partition avec au moins %3 Gio de capacité.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Une partition système EFI n'a pas pu être localisée sur ce système. Veuillez revenir en arrière et utiliser le partitionnement manuel pour configurer %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 va être installé sur %2.<br/><font color="red">Attention:</font> toutes les données sur la partition %2 seront perdues.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>La partition système EFI sur %1 sera utilisée pour démarrer %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Partition système EFI:</translation>
</message>
@@ -2456,7 +2513,7 @@ Sortie
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Redimensionner le Groupe de Volumes</translation>
</message>
@@ -2758,7 +2815,7 @@ Sortie
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Tâche des processus de l'intérpréteur de commande</translation>
</message>
@@ -2775,12 +2832,12 @@ Sortie
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation>Ceci est un aperçu de ce qui va arriver lorsque vous commencerez l'installation.</translation>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Ceci est un aperçu de ce qui va arriver lorsque vous commencerez l'installation.</translation>
</message>
@@ -2891,7 +2948,7 @@ Sortie
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Rapport</translation>
</message>
@@ -2899,43 +2956,43 @@ Sortie
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation><small>si plusieurs personnes utilisent cet ordinateur, vous pourrez créer plusieurs comptes après l'installation.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation><small>si plusieurs personnes utilisent cet ordinateur, vous pourrez créer plusieurs comptes après l'installation.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Votre nom d'utilisateur est trop long.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Votre nom d'utilisateur contient des caractères invalides. Seuls les lettres minuscules et les chiffres sont autorisés.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Le nom d'hôte est trop petit.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Le nom d'hôte est trop long.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Le nom d'hôte contient des caractères invalides. Seules les lettres, nombres et tirets sont autorisés.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Vos mots de passe ne correspondent pas !</translation>
</message>
@@ -2943,7 +3000,7 @@ Sortie
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Utilisateurs</translation>
</message>
diff --git a/lang/calamares_fr_CH.ts b/lang/calamares_fr_CH.ts
index 88e474f97585842a703c8f175b3183388041bb18..0ced942d36dec269644f4728aed191450cd7a4f8 100644
--- a/lang/calamares_fr_CH.ts
+++ b/lang/calamares_fr_CH.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -97,7 +97,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation type="unfinished"/>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation type="unfinished"/>
</message>
@@ -180,7 +180,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation type="unfinished"/>
</message>
@@ -595,18 +595,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -918,13 +918,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1242,6 +1242,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1320,27 +1346,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1496,6 +1522,37 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1862,34 +1919,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1962,12 +2019,12 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1975,107 +2032,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2123,17 +2180,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2286,69 +2343,69 @@ Output:
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2450,7 +2507,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2752,7 +2809,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2769,12 +2826,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2885,7 +2942,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2893,43 +2950,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
</message>
@@ -2937,7 +2994,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts
index b92d881cfd6b2485329430b74174a029cbbe605d..9e706e4759f84ab66304f1edfd8a6edd0efa1cfd 100644
--- a/lang/calamares_gl.ts
+++ b/lang/calamares_gl.ts
@@ -21,27 +21,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Rexistro de arranque maestro de %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Partición de arranque</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Partición do sistema</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Non instalar un cargador de arranque</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -98,7 +98,7 @@
<translation>Ferramentas</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Informe de depuración de erros.</translation>
</message>
@@ -106,7 +106,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instalar</translation>
</message>
@@ -181,7 +181,7 @@
<translation>O ficheiro principal de script %1 para a execución de python %2 non é lexible.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python tivo un erro na tarefa "%1".</translation>
</message>
@@ -597,18 +597,18 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Non foi posíbel executar a orde.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>A orde execútase no ambiente hóspede e precisa coñecer a ruta a root, mais non se indicou ningún rootMountPoint.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>A orde precisa coñecer o nome do usuario, mais non se indicou ningún nome de usuario.</translation>
</message>
@@ -920,13 +920,13 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1244,6 +1244,32 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<translation>A pantalla é demasiado pequena para mostrar o instalador.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<translation>Formulario</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Acepto os termos e condicións anteriores.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Acordo de licencia</h1>Este proceso de configuración instalará programas privativos suxeito a termos de licencia.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Faga o favor de revisalos Acordos de Licencia de Usuario Final (ALUF) seguintes. <br/>De non estar dacordo cos termos non se pode seguir co proceso de configuración.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Acordo de licencia</h1>Este proceso de configuración pode instalar programas privativos suxeito a termos de licencia para fornecer características adicionaís e mellorala experiencia do usuario.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Faga o favor de revisalos Acordos de Licencia de Usuario Final (ALUF) seguintes. <br/>De non estar dacordo cos termos non se instalará o programa privativo e no seu lugar usaranse alternativas de código aberto.</translation>
</message>
@@ -1498,6 +1524,37 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<translation>Selección de pacotes.</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Espazo libre</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Nova partición</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Nome</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Sistema de ficheiros</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Punto de montaxe</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Tamaño</translation>
</message>
@@ -1964,12 +2021,12 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<translation>Confirma que desexa crear unha táboa de particións nova en %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Non é posíbel crear a partición nova</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>A táboa de particións de %1 xa ten %2 particións primarias e non é posíbel engadir máis. Retire unha partición primaria e engada unha partición estendida.</translation>
</message>
@@ -1977,107 +2034,107 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>A reunir a información do sistema...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Particións</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Instalar %1 <strong>a carón</strong> doutro sistema operativo.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Limpar</strong> o disco e instalar %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Substituír</strong> unha partición por %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation>Particionamento <strong>manual</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Instalar %1 <strong>a carón</strong> doutro sistema operativo no disco <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Limpar</strong> o disco <strong>%2</strong> (%3) e instalar %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Substituír</strong> unha partición do disco <strong>%2</strong> (%3) por %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>Particionamento <strong>manual</strong> do disco <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disco <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Actual:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Despois:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Non hai ningunha partición de sistema EFI configurada</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>É necesaria unha partición de sistema EFI para iniciar %1.<br/><br/>Para configurar unha partición de sistema EFI volva atrás e seleccione ou cree un sistema de ficheiros FAT32 coa bandeira <strong>esp</strong> activada e co punto de montaxe <strong>%2.<br/><br/>Pode continuar sen configurar unha partición de sistema EFI mais pode que o sistema non dea arrancado.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>A bandeira da partición de sistema EFI non está configurada</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>É necesaria unha partición de sistema EFI para iniciar %1.<br/><br/>Configurouse unha partición co punto de montaxe <strong>%2</strong> mais a súa bandeira <strong>esp</strong> non está conrfigurada.<br/>Para configurar a bandeira volva atrás e edite a partición.<br/><br/>Pode continuar sen configurar unha partición de sistema EFI mais pode que o sistema non dea arrancado.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>A partición de arranque non está cifrada</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Configurouse unha partición de arranque separada xunto cunha partición raíz cifrada, mais a partición raíz non está cifrada.<br/><br/>Con este tipo de configuración preocupa a seguranza porque nunha partición sen cifrar grávanse ficheiros de sistema importantes.<br/>Pode continuar, se así o desexa, mais o desbloqueo do sistema de ficheiros producirase máis tarde durante o arranque do sistema.<br/>Para cifrar unha partición raíz volva atrás e créea de novo, seleccionando <strong>Cifrar</strong> na xanela de creación de particións.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2125,17 +2182,17 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>A gardar ficheiros para máis tarde...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Non hai ficheiros configurados que gardar para máis tarde</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Non foi posíbel manter todos os ficheiros configurados.</translation>
</message>
@@ -2291,69 +2348,69 @@ Saída:
<translation>Formulario</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Seleccione onde instalar %1.<br/><font color="red">Advertencia: </font>isto elimina todos os ficheiros da partición seleccionada.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>O elemento seleccionado non parece ser unha partición válida.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>Non é posíbel instalar %1 nun espazo baleiro. Seleccione unha partición existente.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>Non é posíbel instalar %1 nunha partición estendida. Seleccione unha partición primaria ou lóxica existente.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>Non é posíbel instalar %1 nesta partición</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Partición de datos (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Partición de sistema descoñecida (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 partición do sistema (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>A partición %1 é demasiado pequena para %2. Seleccione unha partición cunha capacidade mínima de %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Non foi posíbel atopar ningunha partición de sistema EFI neste sistema. Recúe e empregue o particionamento manual para configurar %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 vai ser instalado en %2. <br/><font color="red">Advertencia: </font>vanse perder todos os datos da partición %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>A partición EFI do sistema en %1 será usada para iniciar %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Partición EFI do sistema:</translation>
</message>
@@ -2455,7 +2512,7 @@ Saída:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Cambiar o tamaño do grupo de volumes</translation>
</message>
@@ -2757,7 +2814,7 @@ Saída:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Traballo de procesos de consola</translation>
</message>
@@ -2774,12 +2831,12 @@ Saída:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Esta é unha vista xeral do que vai acontecer cando inicie o procedemento de instalación.</translation>
</message>
@@ -2890,7 +2947,7 @@ Saída:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Opinións</translation>
</message>
@@ -2898,43 +2955,43 @@ Saída:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>O nome de usuario é demasiado longo.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>O nome de usuario contén caracteres non válidos. Só se permiten letras en minúscula e números.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>O nome do computador é demasiado curto.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>O nome do computador é demasiado longo.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>O nome do computador contén caracteres non válidos. Só se permiten letras, números e guións.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Os contrasinais non coinciden!</translation>
</message>
@@ -2942,7 +2999,7 @@ Saída:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Usuarios</translation>
</message>
diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts
index ad8ed2305b5e7ad03da3b6d260046570d5fba809..d009a11d2b0c20b23268b73349bd7b504b37c35c 100644
--- a/lang/calamares_gu.ts
+++ b/lang/calamares_gu.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -97,7 +97,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation type="unfinished"/>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation type="unfinished"/>
</message>
@@ -180,7 +180,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation type="unfinished"/>
</message>
@@ -595,18 +595,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -918,13 +918,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1242,6 +1242,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1320,27 +1346,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1496,6 +1522,37 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1862,34 +1919,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1962,12 +2019,12 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1975,107 +2032,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2123,17 +2180,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2286,69 +2343,69 @@ Output:
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2450,7 +2507,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2752,7 +2809,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2769,12 +2826,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2885,7 +2942,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2893,43 +2950,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
</message>
@@ -2937,7 +2994,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts
index 448682b18e0f6ceb54be0a7fe7b94a74ea5a9830..63788b022d29c1e105a71aced7e280088ebceba9 100644
--- a/lang/calamares_he.ts
+++ b/lang/calamares_he.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record של %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>מחיצת טעינת המערכת Boot</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>מחיצת מערכת</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>לא להתקין מנהל אתחול מערכת</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>כלים</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>מידע על ניפוי שגיאות</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>התקנה</translation>
</message>
@@ -180,7 +180,7 @@
<translation>קובץ תסריט הרצה ראשי %1 עבור משימת python %2 לא קריא. </translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>שגיאת Boost.Python במשימה „%1”.</translation>
</message>
@@ -597,18 +597,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>לא ניתן להריץ את הפקודה.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>הפקודה פועלת בסביבת המארח ועליה לדעת מה נתיב השורש, אך לא צוין rootMountPoint.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>הפקודה צריכה לדעת מה שם המשתמש, אך לא הוגדר שם משתמש.</translation>
</message>
@@ -920,13 +920,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1244,6 +1244,32 @@ The installer will quit and all changes will be lost.</source>
<translation>גודל המסך קטן מכדי להציג את תכנית ההתקנה.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation>מזהה מחזור משווק</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation>לא ניתן ליצור תיקיות <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation>לא ניתן לפתוח קובץ <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation>לא ניתן לכתוב לקובץ <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ The installer will quit and all changes will be lost.</source>
<translation>Form</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>התנאים וההגבלות שלמעלה מקובלים עלי.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>הסכם רישיון</h1>אשף התקנה זה יבצע התקנה של תכניות קנייניות אשר כפופות לתנאי רישיון. </translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>נא לעיין בהסכם משתמש הקצה (EULA) מעלה.<br/> אם התנאים אינם מקובלים עליך, תהליך ההתקנה יופסק.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>הסכם רישיון</h1>אשף התקנה זה יכול לבצע התקנה של תוכנות קנייניות אשר כפופות לתנאי רישיון בכדי לספק תכולות נוספות ולשדרג את חווית המשתמש.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>נא לעיין בהסכם משתמש הקצה (EULA) מעלה.<br/> אם התנאים אינם מקובלים עליך, לא תותקנה תכניות קנייניות, במקומן תותקנה תכניות חלופיות מבוססות קוד פתוח.</translation>
</message>
@@ -1498,6 +1524,37 @@ The installer will quit and all changes will be lost.</source>
<translation>בחירת חבילות</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation>מ&חזור:</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation><html><head/><body><p>נא להקליד כאן מזהה מחזור למשווק. ערך זה יאוחסן במערכת היעד.</p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation><html><head/><body><h1>הגדרות משווק</h1><p>Calamares ישתמש בהגדרות המשווק בעת הגדרת מערכת היעד.</p></body></html></translation>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation>הגדרות משווק</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation>הגדרת מזהה מחזור למשווק לערך <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>זכרון פנוי</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>מחיצה חדשה</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>שם</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>מערכת קבצים</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>נקודת עיגון</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>גודל</translation>
</message>
@@ -1964,12 +2021,12 @@ The installer will quit and all changes will be lost.</source>
<translation>ליצור טבלת מחיצות חדשה על %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>לא ניתן ליצור מחיצה חדשה</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>לטבלת המחיצות על %1 כבר יש %2 מחיצות עיקריות ואי אפשר להוסיף עוד כאלה. נא להסיר מחיצה עיקרית אחת ולהוסיף מחיצה מורחבת במקום.</translation>
</message>
@@ -1977,107 +2034,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>נאסף מידע על המערכת…</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>מחיצות</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>להתקין את %1 <strong>לצד</strong> מערכת הפעלה אחרת.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>למחוק</strong> את הכונן ולהתקין את %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>החלפת</strong> מחיצה עם %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation>להגדיר מחיצות באופן <strong>ידני</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>להתקין את %1 <strong>לצד</strong> מערכת הפעלה אחרת על כונן <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>למחוק</strong> את הכונן <strong>%2</strong> (%3) ולהתקין את %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>החלפת</strong> מחיצה על כונן <strong>%2</strong> (%3) ב־%1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>חלוקה למחיצות באופן <strong>ידני</strong> על כונן <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>כונן <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>נוכחי:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>לאחר:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>לא הוגדרה מחיצת מערכת EFI</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>מחיצת מערכת EFI נדרשת כדי להפעיל את %1.<br/><br/> כדי להגדיר מחיצת מערכת EFI, עליך לחזור ולבחור או ליצור מערכת קבצים מסוג FAT32 עם סימון <strong>esp</strong> פעיל ועם נקודת עיגון <strong>%2</strong>.<br/><br/> ניתן להמשיך ללא הגדרת מחיצת מערכת EFI אך טעינת המערכת עשויה להיכשל.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>לא מוגדר סימון מחיצת מערכת EFI</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>לצורך הפעלת %1 נדרשת מחיצת מערכת EFI.<br/><br/> הוגדרה מחיצה עם נקודת עיגון <strong>%2</strong> אך לא הוגדר סימון <strong>esp</strong>.<br/> כדי לסמן את המחיצה, עליך לחזור ולערוך את המחיצה.<br/><br/> ניתן להמשיך ללא הוספת הסימון אך טעינת המערכת עשויה להיכשל.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>מחיצת טעינת המערכת (Boot) אינה מוצפנת.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>מחיצת טעינה, boot, נפרדת הוגדרה יחד עם מחיצת מערכת ההפעלה, root, מוצפנת, אך מחיצת הטעינה לא הוצפנה.<br/><br/> ישנן השלכות בטיחותיות עם התצורה שהוגדרה, מכיוון שקבצי מערכת חשובים נשמרים על מחיצה לא מוצפנת.<br/>תוכל להמשיך אם תרצה, אך שחרור מערכת הקבצים יתרחש מאוחר יותר כחלק מטעינת המערכת.<br/>בכדי להצפין את מחיצת הטעינה, חזור וצור אותה מחדש, על ידי בחירה ב <strong>הצפן</strong> בחלונית יצירת המחיצה.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>יש לפחות התקן כונן אחד זמין.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>אין מחיצות להתקין עליהן.</translation>
</message>
@@ -2125,17 +2182,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>הקבצים נשמרים להמשך…</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>לא הוגדרו קבצים לשמירה בהמשך.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>לא ניתן לשמר את כל הקבצים שהוגדרו.</translation>
</message>
@@ -2291,69 +2348,69 @@ Output:
<translation>Form</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>בחר מיקום התקנת %1.<br/><font color="red">אזהרה: </font> הפעולה תמחק את כל הקבצים במחיצה שנבחרה.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>הפריט הנבחר איננו מחיצה תקינה.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>לא ניתן להתקין את %1 על זכרון ריק. אנא בחר מחיצה קיימת.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>לא ניתן להתקין את %1 על מחיצה מורחבת. אנא בחר מחיצה ראשית או לוגית קיימת.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>לא ניתן להתקין את %1 על מחיצה זו.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>מחיצת מידע (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>מחיצת מערכת (%1) לא מוכרת</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 מחיצת מערכת (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/> גודל המחיצה %1 קטן מדי עבור %2. אנא בחר מחיצה עם קיבולת בנפח %3 GiB לפחות.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/> מחיצת מערכת EFI לא נמצאה באף מקום על המערכת. חזור בבקשה והשתמש ביצירת מחיצות באופן ידני בכדי להגדיר את %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 יותקן על %2. <br/><font color="red">אזהרה: </font>כל המידע אשר קיים במחיצה %2 יאבד.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>מחיצת מערכת EFI ב %1 תשמש עבור טעינת %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>מחיצת מערכת EFI:</translation>
</message>
@@ -2455,7 +2512,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>שינוי גודל קבוצת כרכים</translation>
</message>
@@ -2757,7 +2814,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>משימת תהליכי מעטפת</translation>
</message>
@@ -2774,12 +2831,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation>זו סקירה של מה שיקרה לאחר התחלת תהליך ההתקנה.</translation>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>להלן סקירת המאורעות שיתרחשו עם תחילת תהליך ההתקנה.</translation>
</message>
@@ -2890,7 +2947,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>משוב</translation>
</message>
@@ -2898,43 +2955,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation><small>אם מחשב זה מיועד לשימוש לטובת למעלה ממשתמש אחד, ניתן ליצור מגוון חשבונות לאחר ההתקנה.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation><small>אם מחשב זה מיועד לשימוש לטובת למעלה ממשתמש אחד, ניתן ליצור מגוון חשבונות לאחר ההתקנה.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>שם המשתמש ארוך מדי.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>שם המחשב מכיל תווים בלתי תקינים. מותר להשתמש אך ורק באותיות ובמספרים.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>שם המחשב קצר מדי.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>שם המחשב ארוך מדי.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>שם המחשב מכיל תווים בלתי תקינים. מותר להשתמש אך ורק באותיות, במספרים ובמקפים.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>הססמאות לא תואמות!</translation>
</message>
@@ -2942,7 +2999,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>משתמשים</translation>
</message>
diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts
index e5abc4fd241f27ca53b6717170f77aae973953ee..fb5e7d1e6dbfb12cb050892a37f622185d363350 100644
--- a/lang/calamares_hi.ts
+++ b/lang/calamares_hi.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>%1 का Master Boot Record</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>बूट विभाजन</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>सिस्टम विभाजन</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>बूट लोडर इंस्टॉल न करें</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>साधन</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>डीबग संबंधी जानकारी</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>इंस्टॉल करें</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Python job %2 के लिए मुख्य स्क्रिप्ट फ़ाइल %1 रीड करने योग्य नहीं है।</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Job "%1" में Boost.Python त्रुटि।</translation>
</message>
@@ -596,18 +596,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>कमांड चलाई नहीं जा सकी।</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -919,13 +919,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1243,6 +1243,32 @@ The installer will quit and all changes will be lost.</source>
<translation>इंस्टॉलर दिखाने के लिए स्क्रीन बहुत छोटी है।</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ The installer will quit and all changes will be lost.</source>
<translation>रूप</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>मैं उपर्युक्त नियम व शर्तें स्वीकार करता हूँ।</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>लाइसेंस अनुबंध</h1>यह लाइसेंस शर्तों के अधीन अमुक्त सॉफ्टवेयर को इंस्टॉल करेगा।</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>कृपया ऊपर दिए गए लक्षित उपयोक्ता लाइसेंस अनुबंध (EULAs) ध्यानपूर्वक पढ़ें।<br/> यदि आप शर्तों से असहमत है, तो सेटअप को ज़ारी नहीं रखा जा सकता।</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>कृपया ऊपर दिए गए लक्षित उपयोक्ता लाइसेंस अनुबंध (EULAs) ध्यानपूर्वक पढ़ें।<br/> यदि आप शर्तों से असहमत है, तो अमुक्त सॉफ्टवेयर इंस्टाल नहीं किया जाएगा व उनके मुक्त विकल्प उपयोग किए जाएँगे।</translation>
</message>
@@ -1497,6 +1523,37 @@ The installer will quit and all changes will be lost.</source>
<translation>पैकेज चयन</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>खाली स्पेस</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>नया विभाजन</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>नाम</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>फ़ाइल सिस्टम</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>माउंट पॉइंट</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>आकार</translation>
</message>
@@ -1963,12 +2020,12 @@ The installer will quit and all changes will be lost.</source>
<translation>क्या आप वाकई %1 पर एक नई विभाजन तालिका बनाना चाहते हैं?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>नया विभाजन नहीं बनाया जा सकता</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1976,107 +2033,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>सिस्टम की जानकारी प्राप्त की जा रही है...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>विभाजन</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>%1 को दूसरे ऑपरेटिंग सिस्टम <strong>के साथ</strong> इंस्टॉल करें।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation>डिस्क का सारा डाटा<strong>हटाकर</strong> कर %1 इंस्टॉल करें।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation>विभाजन को %1 से <strong>बदलें</strong>।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>मैनुअल</strong> विभाजन।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>डिस्क <strong>%2</strong> (%3) पर %1 को दूसरे ऑपरेटिंग सिस्टम <strong>के साथ</strong> इंस्टॉल करें।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation>डिस्क <strong>%2</strong> (%3) <strong>erase</strong> कर %1 इंस्टॉल करें।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation>डिस्क <strong>%2</strong> (%3) के विभाजन को %1 से <strong>बदलें</strong>।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>डिस्क <strong>%1</strong> (%2) पर <strong>मैनुअल</strong> विभाजन।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>डिस्क <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>मौजूदा :</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>बाद में:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>कोई EFI सिस्टम विभाजन विन्यस्त नहीं है</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>%1 को शुरू करने हेतु EFI सिस्टम विभाजन ज़रूरी है।<br/><br/>EFI सिस्टम विभाजन को विन्यस्त करने के लिए, वापस जाएँ और चुनें या बनाएँ एक FAT32 फ़ाइल सिस्टम जिस पर <strong>esp</strong> flag चालू हो व माउंट पॉइंट <strong>%2</strong>हो।<br/><br/>आप बिना सेट भी आगे बढ़ सकते है पर सिस्टम चालू नहीं होगा।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>EFI सिस्टम विभाजन flag सेट नहीं है</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>%1 को शुरू करने हेतु EFI सिस्टम विभाजन ज़रूरी है।<br/><br/>विभाजन को माउंट पॉइंट <strong>%2</strong> के साथ विन्यस्त किया गया परंतु उसका <strong>esp</strong> flag सेट नहीं था।<br/> Flag सेट करने के लिए, वापस जाएँ और विभाजन को edit करें।<br/><br/>आप बिना सेट भी आगे बढ़ सकते है पर सिस्टम चालू नहीं होगा।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>बूट विभाजन एन्क्रिप्टेड नहीं है</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>एन्क्रिप्टेड रुट विभाजन के साथ एक अलग बूट विभाजन भी सेट किया गया था, पर बूट विभाजन एन्क्रिप्टेड नहीं था।<br/><br/> इस तरह का सेटअप सुरक्षित नहीं होता क्योंकि सिस्टम फ़ाइल एन्क्रिप्टेड विभाजन पर होती हैं।<br/>आप चाहे तो जारी रख सकते है, पर फिर फ़ाइल सिस्टम बाद में सिस्टम स्टार्टअप के दौरान अनलॉक होगा।<br/> विभाजन को एन्क्रिप्ट करने के लिए वापस जाकर उसे दोबारा बनाएँ व विभाजन निर्माण विंडो में<strong>एन्क्रिप्ट</strong> चुनें।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2290,69 +2347,69 @@ Output:
<translation>रूप</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>चुनें कि %1 को कहाँ इंस्टॉल करना है।<br/><font color="red">चेतावनी: </font> यह चयनित विभाजन पर मौजूद सभी फ़ाइलों को हटा देगा।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>चयनित आइटम एक मान्य विभाजन नहीं है।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 को खाली स्पेस पर इंस्टॉल नहीं किया जा सकता।कृपया कोई मौजूदा विभाजन चुनें।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 को विस्तृत विभाजन पर इंस्टॉल नहीं किया जा सकता।कृपया कोई मौजूदा मुख्य या तार्किक विभाजन चुनें।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>इस विभाजन पर %1 इंस्टॉल नहीं किया जा सकता।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>डाटा विभाजन (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>अज्ञात सिस्टम विभाजन (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 सिस्टम विभाजन (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>%2 के लिए विभाजन %1 बहुत छोटा है।कृपया कम-से-कम %3 GiB की क्षमता वाला कोई विभाजन चुनें ।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>इस सिस्टम पर कहीं भी कोई EFI सिस्टम विभाजन नहीं मिला। कृपया वापस जाएँ व %1 को सेट करने के लिए मैनुअल रूप से विभाजन करें।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%2 पर %1 इंस्टॉल किया जाएगा।<br/><font color="red">चेतावनी : </font>विभाजन %2 पर मौजूद सारा डाटा हटा दिया जाएगा।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>%1 वाले EFI सिस्टम विभाजन का उपयोग %2 को शुरू करने के लिए किया जाएगा।</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI सिस्टम विभाजन:</translation>
</message>
@@ -2454,7 +2511,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2756,7 +2813,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2773,12 +2830,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>यह अवलोकन है कि इंस्टॉल शुरू होने के बाद क्या होगा।</translation>
</message>
@@ -2889,7 +2946,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2897,43 +2954,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>आपका उपयोक्ता नाम बहुत लंबा है।</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>आपके होस्ट नाम में अमान्य अक्षर हैं । केवल lowercase अक्षरों व संख्याओं की ही अनुमति है ।</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>आपका होस्ट नाम बहुत छोटा है।</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>आपका होस्ट नाम बहुत लंबा है।</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>आपके होस्ट नाम में अमान्य अक्षर हैं । केवल अक्षरों, संख्याओं व dash की ही अनुमति है ।</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>आपके कूटशब्द मेल नहीं खाते!</translation>
</message>
@@ -2941,7 +2998,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>उपयोक्ता</translation>
</message>
diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts
index ded82670ef0d1f47761cf14cc683c6cbad905411..beaeb72f995b7d52f9de1f51189cabb25ee3e636 100644
--- a/lang/calamares_hr.ts
+++ b/lang/calamares_hr.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record od %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Boot particija</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Particija sustava</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Nemoj instalirati boot učitavač</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Alati</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Debug informacija</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instaliraj</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Glavna skriptna datoteka %1 za python zadatak %2 nije čitljiva.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python greška u zadatku "%1".</translation>
</message>
@@ -597,18 +597,18 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Ne mogu pokrenuti naredbu.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>Naredba se pokreće u okruženju domaćina i treba znati korijenski put, međutim, rootMountPoint nije definiran.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Naredba treba znati ime korisnika, ali nije definirano korisničko ime.</translation>
</message>
@@ -920,13 +920,13 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1244,6 +1244,32 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<translation>Zaslon je premalen za prikaz instalacijskog programa.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation>OEM serijski identifikator</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation>Nije moguće stvoriti direktorije <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation>Nije moguće otvoriti datoteku <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation>Nije moguće pisati u datoteku <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<translation>Oblik</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Prihvaćam gore navedene uvjete i odredbe.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Licencni ugovor</h1>Instalacijska procedura će instalirati vlasnički program koji podliježe uvjetima licenciranja.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Molimo vas da pogledate gore navedene End User License Agreements (EULAs).<br/>Ako se ne slažete s navedenim uvjetima, instalacijska procedura se ne može nastaviti.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Licencni ugovor</h1>Instalacijska procedura može instalirati vlasnički program, koji podliježe uvjetima licenciranja, kako bi pružio dodatne mogućnosti i poboljšao korisničko iskustvo.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Molimo vas da pogledate gore navedene End User License Agreements (EULAs).<br/>Ako se ne slažete s navedenim uvjetima, vlasnički program se ne će instalirati te će se umjesto toga koristiti program otvorenog koda.</translation>
</message>
@@ -1498,6 +1524,37 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<translation>Odabir paketa</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation>Se&rija:</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation><html><head/><body><p>Ovdje unesite identifikator serije. To će biti pohranjeno u ciljnom sustavu.</p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation><html><head/><body><h1>OEM konfiguracija</h1><p>Calamares će koristiti OEM postavke tijekom konfiguriranja ciljnog sustava.</p></body></html></translation>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation>OEM konfiguracija</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation>Postavite OEM identifikator serije na <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Slobodni prostor</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Nova particija</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Ime</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Datotečni sustav</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Točka montiranja</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Veličina</translation>
</message>
@@ -1964,12 +2021,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<translation>Jeste li sigurni da želite stvoriti novu particijsku tablicu na %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Ne mogu stvoriti novu particiju</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>Particijska tablica %1 već ima %2 primarne particije i nove se više ne mogu dodati. Molimo vas da uklonite jednu primarnu particiju i umjesto nje dodate proširenu particiju.</translation>
</message>
@@ -1977,107 +2034,107 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Skupljanje informacija o sustavu...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Particije</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Instaliraj %1 <strong>uz postojeći</strong> operacijski sustav.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Obriši</strong> disk i instaliraj %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Zamijeni</strong> particiju s %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Ručno</strong> particioniranje.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Instaliraj %1 <strong>uz postojeći</strong> operacijski sustav na disku <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Obriši</strong> disk <strong>%2</strong> (%3) i instaliraj %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Zamijeni</strong> particiju na disku <strong>%2</strong> (%3) s %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Ručno</strong> particioniram disk <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disk <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Trenutni:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Poslije:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>EFI particija nije konfigurirana</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>EFI particija je potrebna za pokretanje %1.<br/><br/>Da bi ste konfigurirali EFI particiju, idite natrag i odaberite ili stvorite FAT32 datotečni sustav s omogućenom <strong>esp</strong> oznakom i točkom montiranja <strong>%2</strong>.<br/><br/>Možete nastaviti bez postavljanja EFI particije, ali vaš sustav se možda neće moći pokrenuti.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Oznaka EFI particije nije postavljena</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>EFI particija je potrebna za pokretanje %1.<br><br/>Particija je konfigurirana s točkom montiranja <strong>%2</strong> ali njezina <strong>esp</strong> oznaka nije postavljena.<br/>Za postavljanje oznake, vratite se i uredite postavke particije.<br/><br/>Možete nastaviti bez postavljanja oznake, ali vaš sustav se možda neće moći pokrenuti.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Boot particija nije kriptirana</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Odvojena boot particija je postavljena zajedno s kriptiranom root particijom, ali boot particija nije kriptirana.<br/><br/>Zabrinuti smo za vašu sigurnost jer su važne datoteke sustava na nekriptiranoj particiji.<br/>Možete nastaviti ako želite, ali datotečni sustav će se otključati kasnije tijekom pokretanja sustava.<br/>Da bi ste kriptirali boot particiju, vratite se natrag i napravite ju, odabirom opcije <strong>Kriptiraj</strong> u prozoru za stvaranje prarticije.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>ima barem jedan disk dostupan.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>Nema particija na koje bi se izvršila instalacija.</translation>
</message>
@@ -2125,17 +2182,17 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Spremanje datoteka za kasnije ...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Nema datoteka konfiguriranih za spremanje za kasnije.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Nije moguće sačuvati sve konfigurirane datoteke.</translation>
</message>
@@ -2291,69 +2348,69 @@ Izlaz:
<translation>Oblik</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Odaberite gdje želite instalirati %1.<br/><font color="red">Upozorenje: </font>to će obrisati sve datoteke na odabranoj particiji.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Odabrana stavka se ne ćini kao ispravna particija.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 ne može biti instaliran na prazni prostor. Odaberite postojeću particiju.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 se ne može instalirati na proširenu particiju. Odaberite postojeću primarnu ili logičku particiju.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 se ne može instalirati na ovu particiju.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Podatkovna particija (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Nepoznata particija sustava (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 particija sustava (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Particija %1 je premala za %2. Odaberite particiju kapaciteta od najmanje %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>EFI particijane postoji na ovom sustavu. Vratite se natrag i koristite ručno particioniranje za postavljane %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 će biti instaliran na %2.<br/><font color="red">Upozorenje: </font>svi podaci na particiji %2 će biti izgubljeni.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>EFI particija na %1 će se koristiti za pokretanje %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI particija:</translation>
</message>
@@ -2455,7 +2512,7 @@ Izlaz:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Promijenite veličinu volume grupe</translation>
</message>
@@ -2557,7 +2614,7 @@ Izlaz:
<location filename="../src/modules/users/SetHostNameJob.cpp" line="76"/>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="87"/>
<source>Cannot write hostname to target system</source>
- <translation>Ne mogu zapisati ime računala na traženi sustav.</translation>
+ <translation>Ne mogu zapisati ime računala na ciljni sustav.</translation>
</message>
</context>
<context>
@@ -2757,7 +2814,7 @@ Izlaz:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Posao shell procesa</translation>
</message>
@@ -2774,12 +2831,12 @@ Izlaz:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation>Ovo je prikaz događaja koji će uslijediti jednom kad počne instalacijska procedura.</translation>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Ovo je prikaz događaja koji će uslijediti jednom kad počne instalacijska procedura.</translation>
</message>
@@ -2890,7 +2947,7 @@ Izlaz:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Povratna informacija</translation>
</message>
@@ -2898,43 +2955,43 @@ Izlaz:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation><small>Ako će više osoba koristiti ovo računalo, možete postaviti više korisničkih računa poslije instalacije.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation><small>Ako će više osoba koristiti ovo računalo, možete postaviti više korisničkih računa poslije instalacije.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Vaše korisničko ime je predugačko.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Korisničko ime sadržava nedozvoljene znakove. Dozvoljena su samo mala slova i brojevi.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Ime računala je kratko.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Ime računala je predugačko.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Ime računala sadrži nedozvoljene znakove. Samo slova, brojevi i crtice su dozvoljene.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Lozinke se ne podudaraju!</translation>
</message>
@@ -2942,7 +2999,7 @@ Izlaz:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Korisnici</translation>
</message>
diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts
index f27cf0b82d4476e4c5cf72244a7c3115afadccee..c510ab62da654dd033f53b9ac4bc5b11e71b49bd 100644
--- a/lang/calamares_hu.ts
+++ b/lang/calamares_hu.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Mester Boot Record - %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Indító partíció</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Rendszer Partíció</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Ne telepítsen rendszerbetöltőt</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Eszközök</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Hibakeresési információk</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Telepít</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Alap script fájl %1 a python folyamathoz %2 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost. Python hiba ebben a folyamatban "%1".</translation>
</message>
@@ -596,18 +596,18 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>A parancsot nem lehet futtatni.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>A parancs a gazdakörnyezetben fut, és ismernie kell a gyökér útvonalát, de nincs rootMountPoint megadva.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>A parancsnak tudnia kell a felhasználónevet, de az nincs megadva.</translation>
</message>
@@ -919,13 +919,13 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 – (%2)</translation>
@@ -1243,6 +1243,32 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation>
<translation>A képernyőméret túl kicsi a telepítő megjelenítéséhez.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation>
<translation>Adatlap</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Elfogadom a fentebbi felhasználási feltételeket.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Licensz</h1>A telepítő szabadalmaztatott szoftvert fog telepíteni. Információ a licenszben.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Kérlek, olvasd el a fenti végfelhasználói licenszfeltételeket (EULAs)<br/>Ha nem értesz egyet a feltételekkel, akkor a telepítés nem folytatódik.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Licensz</h1>A telepítő szabadalmaztatott szoftvert fog telepíteni. Információ a licenszben.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Kérlek, olvasd el a fenti végfelhasználói licenszfeltételeket (EULAs)<br/>Ha nem értesz egyet a feltételekkel, akkor a szabadalmaztatott program telepítése nem folytatódik és nyílt forrású program lesz telepítve helyette.</translation>
</message>
@@ -1497,6 +1523,37 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation>
<translation>Csomag választása</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Szabad terület</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Új partíció</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Név</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Fájlrendszer</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Csatolási pont</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Méret</translation>
</message>
@@ -1963,12 +2020,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation>
<translation>Biztos vagy benne, hogy létrehozol egy új partíciós táblát itt %1 ?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Nem hozható létre új partíció</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>A(z) %1 lemezen lévő partíciós táblában már %2 elsődleges partíció van, és több nem adható hozzá. Helyette távolítson el egy elsődleges partíciót, és adjon hozzá egy kiterjesztett partíciót.</translation>
</message>
@@ -1976,107 +2033,107 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Rendszerinformációk gyűjtése...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Partíciók</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>%1 telepítése más operációs rendszer <strong>mellé</strong> .</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Lemez törlés</strong>és %1 telepítés.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>A partíció lecserélése</strong> a következővel: %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Kézi</strong> partícionálás.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>%1 telepítése más operációs rendszer <strong>mellé</strong> a <strong>%2</strong> (%3) lemezen.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>%2 lemez törlése</strong> (%3) és %1 telepítés.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>A partíció lecserélése</strong> a <strong>%2</strong> lemezen(%3) a következővel: %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Kézi</strong> telepítés a <strong>%1</strong> (%2) lemezen.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Lemez <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Aktuális:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Utána:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Nincs EFI rendszer partíció beállítva</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>EFI rendszerpartíciónak léteznie kell %1 indításához.<br/><br/> Az EFI rendszer beállításához lépj vissza és hozz létre FAT32 fájlrendszert <strong>esp</strong> zászlóval és <strong>%2</strong> csatolási ponttal beállítva.<br/><br/> Folytathatod a telepítést EFI rendszerpartíció létrehozása nélkül is, de lehet, hogy a rendszer nem indul majd.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>EFI partíciós zászló nincs beállítva</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>EFI rendszerpartíciónak léteznie kell %1 indításához.<br/><br/> A csatolási pont <strong>%2</strong> beállítása sikerült a partíción de a zászló nincs beállítva. A beálíltásához lépj vissza szerkeszteni a partíciót..<br/><br/> Folytathatod a telepítést zászló beállítása nélkül is, de lehet, hogy a rendszer nem indul el majd.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Indító partíció nincs titkosítva</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Egy külön indító partíció lett beállítva egy titkosított root partícióval, de az indító partíció nincs titkosítva.br/><br/>Biztonsági aggályok merülnek fel ilyen beállítás mellet, mert fontos fájlok nem titkosított partíción vannak tárolva. <br/>Ha szeretnéd, folytathatod így, de a fájlrendszer zárolása meg fog történni az indítás után. <br/> Az indító partíció titkosításához lépj vissza és az újra létrehozáskor válaszd a <strong>Titkosít</strong> opciót.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Fájlok mentése későbbre …</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Nincsenek fájlok beállítva elmentésre későbbre</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Nem az összes beállított fájl örízhető meg.</translation>
</message>
@@ -2290,69 +2347,69 @@ Kimenet:
<translation>Adatlap</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Válaszd ki az telepítés helyét %1.<br/><font color="red">Figyelmeztetés: </font>minden fájl törölve lesz a kiválasztott partíción.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>A kiválasztott elem nem tűnik érvényes partíciónak.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 nem telepíthető, kérlek válassz egy létező partíciót.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 nem telepíthető a kiterjesztett partícióra. Kérlek, válassz egy létező elsődleges vagy logikai partíciót.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>Nem lehet telepíteni a következőt %1 erre a partícióra.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Adat partíció (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Ismeretlen rendszer partíció (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 rendszer partíció (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>A partíció %1 túl kicsi a következőhöz %2. Kérlek, válassz egy legalább %3 GB- os partíciót.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Az EFI rendszerpartíció nem található a rendszerben. Kérlek, lépj vissza és állítsd be manuális partícionálással %1- et.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 installálva lesz a következőre: %2.<br/><font color="red">Figyelmeztetés: </font>a partíción %2 minden törölve lesz.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>A %2 indításához az EFI rendszer partíciót használja a következőn: %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI rendszer partíció:</translation>
</message>
@@ -2454,7 +2511,7 @@ Kimenet:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Kötetcsoport átméretezése</translation>
</message>
@@ -2757,7 +2814,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Parancssori folyamatok feladat</translation>
</message>
@@ -2774,12 +2831,12 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Ez áttekintése annak, hogy mi fog történni, ha megkezded a telepítést.</translation>
</message>
@@ -2891,7 +2948,7 @@ Calamares hiba %1.</translation>
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Visszacsatolás</translation>
</message>
@@ -2899,43 +2956,43 @@ Calamares hiba %1.</translation>
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>A felhasználónév túl hosszú.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>A felhasználónév érvénytelen karaktereket tartalmaz. Csak kis kezdőbetűk és számok érvényesek.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>A hálózati név túl rövid.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>A hálózati név túl hosszú.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>A hálózati név érvénytelen karaktereket tartalmaz. Csak betűk, számok és kötőjel érvényes.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>A két jelszó nem egyezik!</translation>
</message>
@@ -2943,7 +3000,7 @@ Calamares hiba %1.</translation>
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Felhasználók</translation>
</message>
diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts
index be248e8f2f26d28949947311cc8734180c549c34..315f61aa6337d32c09b1513d8d581af08294cffc 100644
--- a/lang/calamares_id.ts
+++ b/lang/calamares_id.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Partisi Boot</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Partisi Sistem</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Jangan instal boot loader</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Alat</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Informasi debug</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instal</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Berkas skrip utama %1 untuk penugasan python %2 tidak dapat dibaca.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python mogok dalam penugasan "%1".</translation>
</message>
@@ -596,18 +596,18 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Tidak dapat menjalankan perintah</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>Perintah berjalan di lingkungan host dan perlu diketahui alur root-nya, tetapi bukan rootMountPoint yang ditentukan.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Perintah perlu diketahui nama si pengguna, tetapi bukan nama pengguna yang ditentukan.</translation>
</message>
@@ -919,13 +919,13 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1243,6 +1243,32 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation>
<translation>Layar terlalu kecil untuk menampilkan installer.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation>
<translation>Isian</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Saya menyetujui segala persyaratan di atas.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Persetujuan Lisensi</h1>Prosedur ini akan memasang perangkat lunak berpemilik yang terkait dengan lisensi. </translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Mohon periksa End User License Agreements (EULA) di atas.<br/>Bila Anda tidak setuju, maka prosedur tidak bisa dilanjutkan.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Persetujuan Lisensi</h1>Prosedur ini dapat memasang perangkat lunak yang terkait dengan lisensi agar bisa menyediakan fitur tambahan dan meningkatkan pengalaman pengguna.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Mohon periksa End User License Agreements(EULA) di atas.<br/>Bila Anda tidak setuju, perangkat lunak proprietary tidak akan diinstal, dan alternatif open source akan diinstal sebagai gantinya </translation>
</message>
@@ -1497,6 +1523,37 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation>
<translation>Pemilihan paket</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Ruang Kosong</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Partisi baru</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Nama</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Berkas Sistem</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Lokasi Mount</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Ukuran</translation>
</message>
@@ -1963,12 +2020,12 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation>
<translation>Apakah Anda yakin ingin membuat tabel partisi baru pada %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Tidak bisa menciptakan partisi baru.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>Partisi tabel pada %1 sudah memiliki %2 partisi primer, dan tidak ada lagi yang bisa ditambahkan. Silakan hapus salah satu partisi primer dan tambahkan sebuah partisi extended, sebagai gantinya.</translation>
</message>
@@ -1976,107 +2033,107 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Mengumpulkan informasi sistem...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Paritsi</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Instal %1 <strong>berdampingan</strong> dengan sistem operasi lain.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Hapus</strong> diska dan instal %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Ganti</strong> partisi dengan %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation>Partisi <strong>manual</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Instal %1 <strong>berdampingan</strong> dengan sistem operasi lain di disk <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Hapus</strong> diska <strong>%2</strong> (%3) dan instal %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Ganti</strong> partisi pada diska <strong>%2</strong> (%3) dengan %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Partisi Manual</strong> pada diska <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disk <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Saat ini:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Sesudah:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Tiada partisi sistem EFI terkonfigurasi</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Sebuah partisi sistem EFI perlu memulai %1.<br/><br/>Untuk mengkonfigurasi sebuah partisi sistem EFI, pergi mundur dan pilih atau ciptakan sebuah filesystem FAT32 dengan bendera <strong>esp</strong> yang difungsikan dan titik kait <strong>%2</strong>.<br/><br/>Kamu bisa melanjutkan tanpa menyetel sebuah partisi sistem EFI tapi sistemmu mungkin gagal memulai.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Bendera partisi sistem EFI tidak disetel</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Sebuah partisi sistem EFI perlu memulai %1.<br/><br/>Sebuah partisi telah dikonfigurasi dengan titik kait <strong>%2</strong> tapi bendera <strong>esp</strong> tersebut tidak disetel.<br/>Untuk mengeset bendera, pergi mundur dan editlah partisi.<br/><br/>Kamu bisa melanjutkan tanpa menyetel bendera tapi sistemmu mungkin gagal memulai.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Partisi boot tidak dienkripsi</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Sebuah partisi tersendiri telah terset bersama dengan sebuah partisi root terenkripsi, tapi partisi boot tidak terenkripsi.<br/><br/>Ada kekhawatiran keamanan dengan jenis setup ini, karena file sistem penting tetap pada partisi tak terenkripsi.<br/>Kamu bisa melanjutkan jika kamu menghendaki, tapi filesystem unlocking akan terjadi nanti selama memulai sistem.<br/>Untuk mengenkripsi partisi boot, pergi mundur dan menciptakannya ulang, memilih <strong>Encrypt</strong> di jendela penciptaan partisi.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Menyimpan file untuk kemudian...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Tiada file yang dikonfigurasi untuk penyimpanan nanti.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Tidak semua file yang dikonfigurasi dapat dipertahankan.</translation>
</message>
@@ -2290,69 +2347,69 @@ Keluaran:
<translation>Isian</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Pilih tempat instalasi %1.<br/><font color="red">Peringatan: </font>hal ini akan menghapus semua berkas di partisi terpilih.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Item yang dipilih tidak tampak seperti partisi yang valid.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 tidak dapat diinstal di ruang kosong. Mohon pilih partisi yang tersedia.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 tidak bisa diinstal pada Partisi Extended. Mohon pilih Partisi Primary atau Logical yang tersedia.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 tidak dapat diinstal di partisi ini.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Partisi data (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Partisi sistem tidak dikenal (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>Partisi sistem %1 (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Partisi %1 teralu kecil untuk %2. Mohon pilih partisi dengan kapasitas minimal %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Tidak ditemui adanya Partisi EFI pada sistem ini. Mohon kembali dan gunakan Pemartisi Manual untuk set up %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 akan diinstal pada %2.<br/><font color="red">Peringatan: </font>seluruh data %2 akan hilang.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>Partisi EFI pada %1 akan digunakan untuk memulai %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Partisi sistem EFI:</translation>
</message>
@@ -2454,7 +2511,7 @@ Keluaran:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Ubah-ukuran Grup Volume</translation>
</message>
@@ -2758,7 +2815,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</translat
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Pekerjaan yang diselesaikan oleh shell</translation>
</message>
@@ -2775,12 +2832,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</translat
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Berikut adalah tinjauan mengenai yang akan terjadi setelah Anda memulai prosedur instalasi.</translation>
</message>
@@ -2891,7 +2948,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</translat
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Umpan balik</translation>
</message>
@@ -2899,43 +2956,43 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</translat
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Nama pengguna Anda terlalu panjang.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Nama pengguna Anda berisi karakter yang tidak sah. Hanya huruf kecil dan angka yang diperbolehkan.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Hostname Anda terlalu pendek.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Hostname Anda terlalu panjang.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Hostname Anda berisi karakter yang tidak sah. Hanya huruf kecil, angka, dan strip yang diperbolehkan.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Sandi Anda tidak sama!</translation>
</message>
@@ -2943,7 +3000,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</translat
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Pengguna</translation>
</message>
diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts
index 9cef2814415b34772a18bf3cea0cbf03a630a0cc..1904789dd5e14b05900be8201d48251c9db58085 100644
--- a/lang/calamares_is.ts
+++ b/lang/calamares_is.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Aðalræsifærsla (MBR) %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Ræsidisksneið</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Kerfisdisksneið</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Ekki setja upp ræsistjóra</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Verkfæri</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Villuleitarupplýsingar</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Setja upp</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Aðal-skriftuskrá %1 fyrir python-verkið %2 er ekki lesanleg.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python villa í verkinu "%1".</translation>
</message>
@@ -596,18 +596,18 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Gat ekki keyrt skipun.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -919,13 +919,13 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1243,6 +1243,32 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
<translation>Skjárinn er of lítill til að birta uppsetningarforritið.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
<translation>Eyðublað</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Ég samþykki skilyrði leyfissamningsins hér að ofan.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1497,6 +1523,37 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
<translation>Valdir pakkar</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Laust pláss</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Ný disksneið</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Heiti</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Skráakerfi</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Tengipunktur</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Stærð</translation>
</message>
@@ -1963,12 +2020,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
<translation>Ertu viss um að þú viljir búa til nýja disksneið á %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1976,107 +2033,107 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Söfnun kerfis upplýsingar...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Disksneiðar</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Setja upp %1 <strong>ásamt</strong> ásamt öðru stýrikerfi.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Eyða</strong> disk og setja upp %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Skipta út</strong> disksneið með %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Handvirk</strong> disksneiðaskipting.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Uppsetning %1 <strong>með</strong> öðru stýrikerfi á disk <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Eyða</strong> disk <strong>%2</strong> (%3) og setja upp %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Skipta út</strong> disksneið á diski <strong>%2</strong> (%3) með %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Handvirk</strong> disksneiðaskipting á diski <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Diskur <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Núverandi:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Eftir:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Ekkert EFI kerfisdisksneið stillt</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Vista skrár fyrir seinna ...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2287,69 +2344,69 @@ Output:
<translation>Eyðublað</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Veldu hvar á að setja upp %1.<br/><font color="red">Aðvörun: </font>þetta mun eyða öllum skrám á valinni disksneið.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Valið atriði virðist ekki vera gild disksneið.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 er hægt að setja upp á þessari disksneið.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Gagnadisksneið (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Óþekkt kerfisdisksneið (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 kerfisdisksneið (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Disksneið %1 er of lítil fyrir %2. Vinsamlegast veldu disksneið með að lámark %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>EFI kerfisdisksneið er hvergi að finna á þessu kerfi. Vinsamlegast farðu til baka og notaðu handvirka skiptingu til að setja upp %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 mun vera sett upp á %2.<br/><font color="red">Aðvörun: </font>öll gögn á disksneið %2 mun verða eytt.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>EFI kerfis stýring á %1 mun vera notuð til að byrja %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI kerfisdisksneið:</translation>
</message>
@@ -2451,7 +2508,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2753,7 +2810,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2770,12 +2827,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Þetta er yfirlit yfir það sem mun gerast þegar þú byrjar að setja upp aðferð.</translation>
</message>
@@ -2886,7 +2943,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2894,43 +2951,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Notandanafnið þitt er of langt.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Notandanafnið þitt inniheldur ógilda stafi. Aðeins lágstöfum og númer eru leyfð.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Notandanafnið þitt er of stutt.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Notandanafnið þitt er of langt.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Lykilorð passa ekki!</translation>
</message>
@@ -2938,7 +2995,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Notendur</translation>
</message>
diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts
index 39dfeabb39792c4c0855950f0914d10329bc5184..b7a293073ac823fd257f9ebb3125039b26b41e81 100644
--- a/lang/calamares_it_IT.ts
+++ b/lang/calamares_it_IT.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record di %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Partizione di avvio</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Partizione di sistema</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Non installare un boot loader</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Strumenti</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Informazioni di debug</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Installa</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Il file principale dello script %1 per l'attività di python %2 non è accessibile.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Errore da Boost.Python nell'operazione "%1".</translation>
</message>
@@ -596,18 +596,18 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Impossibile eseguire il comando.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>Il comando viene eseguito nell'ambiente host e richiede il percorso di root ma nessun rootMountPoint (punto di montaggio di root) è definito.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Il comando richiede il nome utente, nessun nome utente definito.</translation>
</message>
@@ -919,13 +919,13 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1243,6 +1243,32 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<translation>Schermo troppo piccolo per mostrare il programma d'installazione.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<translation>Modulo</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Accetto i termini e le condizioni sopra indicati.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Accordo di licenza</h1>Questa procedura di configurazione installerà software proprietario sottoposto a termini di licenza.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Leggere attentamente le licenze d'uso (EULA) riportate sopra.<br/>Se non ne accetti i termini, la procedura di configurazione non può proseguire.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Accordo di licenza</h1>Questa procedura di configurazione installerà software proprietario sottoposto a termini di licenza, per fornire caratteristiche aggiuntive e migliorare l'esperienza utente.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Si prega di leggere attentamente gli accordi di licenza dell'utente finale (EULA) riportati sopra.</br>Se non se ne accettano i termini, il software proprietario non verrà installato e al suo posto saranno utilizzate alternative open source.</translation>
</message>
@@ -1497,6 +1523,37 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<translation>Selezione del pacchetto</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Spazio disponibile</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Nuova partizione</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Nome</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>File System</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Punto di mount</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Dimensione</translation>
</message>
@@ -1963,12 +2020,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<translation>Si è sicuri di voler creare una nuova tabella delle partizioni su %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Impossibile creare nuova partizione</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>La tabella delle partizioni su %1 contiene già %2 partizioni primarie, non se ne possono aggiungere altre. Rimuovere una partizione primaria e aggiungere una partizione estesa invece.</translation>
</message>
@@ -1976,107 +2033,107 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Raccolta delle informazioni di sistema...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Partizioni</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Installare %1 <strong>a fianco</strong> di un altro sistema operativo.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Cancellare</strong> il disco e installare %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Sostituire</strong> una partizione con %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation>Partizionamento <strong>manuale</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Installare %1 <strong>a fianco</strong> di un altro sistema operativo sul disco<strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Cancellare</strong> il disco <strong>%2</strong> (%3) e installa %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Sostituire</strong> una partizione sul disco <strong>%2</strong> (%3) con %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>Partizionamento <strong>manuale</strong> sul disco <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disco <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Corrente:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Dopo:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Nessuna partizione EFI di sistema è configurata</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Una partizione EFI di sistema è necessaria per avviare %1.<br/><br/>Per configurare una partizione EFI di sistema, tornare indietro e selezionare o creare un filesystem FAT32 con il flag <strong>esp</strong> abilitato e un punto di mount <strong>%2</strong>.<br/><br/>Si può continuare senza configurare una partizione EFI ma il sistema rischia di non avviarsi.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Il flag della partizione EFI di sistema non è impostato.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Una partizione EFI di sistema è necessaria per avviare %1.<br/><br/>Una partizione è stata configurata con punto di mount <strong>%2</strong> ma il relativo flag <strong>esp</strong> non è impostato.<br/>Per impostare il flag, tornare indietro e modificare la partizione.<br/><br/>Si può continuare senza impostare il flag ma il sistema rischia di non avviarsi.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Partizione di avvio non criptata</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>E' stata configurata una partizione di avvio non criptata assieme ad una partizione root criptata. <br/><br/>Ci sono problemi di sicurezza con questo tipo di configurazione perchè dei file di sistema importanti sono tenuti su una partizione non criptata.<br/>Si può continuare se lo si desidera ma dopo ci sarà lo sblocco del file system, durante l'avvio del sistema.<br/>Per criptare la partizione di avvio, tornare indietro e ricrearla, selezionando <strong>Criptare</strong> nella finestra di creazione della partizione.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>ha almeno un'unità disco disponibile.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>Non ci sono partizioni su cui installare</translation>
</message>
@@ -2124,17 +2181,17 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Salvataggio dei file per dopo ...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Nessun file configurato per dopo.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Non tutti i file configurati possono essere preservati.</translation>
</message>
@@ -2290,69 +2347,69 @@ Output:
<translation>Modulo</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Selezionare dove installare %1.<br/><font color="red">Attenzione: </font>questo eliminerà tutti i file dalla partizione selezionata.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>L'elemento selezionato non sembra essere una partizione valida.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 non può essere installato su spazio non partizionato. Si prega di selezionare una partizione esistente.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 non può essere installato su una partizione estesa. Si prega di selezionare una partizione primaria o logica esistente.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 non può essere installato su questa partizione.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Partizione dati (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Partizione di sistema sconosciuta (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 partizione di sistema (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>La partizione %1 è troppo piccola per %2. Si prega di selezionare una partizione con capacità di almeno %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Nessuna partizione EFI di sistema rilevata. Si prega di tornare indietro e usare il partizionamento manuale per configurare %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 sarà installato su %2.<br/><font color="red">Attenzione: </font>tutti i dati sulla partizione %2 saranno persi.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>La partizione EFI di sistema a %1 sarà usata per avviare %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Partizione EFI di sistema:</translation>
</message>
@@ -2454,7 +2511,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>RIdimensiona Gruppo di Volumi</translation>
</message>
@@ -2756,7 +2813,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Job dei processi della shell</translation>
</message>
@@ -2773,12 +2830,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Una panoramica delle modifiche che saranno effettuate una volta avviata la procedura di installazione.</translation>
</message>
@@ -2889,7 +2946,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Valutazione</translation>
</message>
@@ -2897,43 +2954,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Il nome utente è troppo lungo.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Il nome utente contiene caratteri non validi. Sono ammessi solo lettere minuscole e numeri.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Hostname è troppo corto.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Hostname è troppo lungo.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Hostname contiene caratteri non validi. Sono ammessi solo lettere, numeri e trattini.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Le password non corrispondono!</translation>
</message>
@@ -2941,7 +2998,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Utenti</translation>
</message>
diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts
index 2503989be4e90dc1a6d6ab7eab3f2c44ac999f93..96f559e1337649ccb7f973d8371ced3bf973ccd9 100644
--- a/lang/calamares_ja.ts
+++ b/lang/calamares_ja.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>%1 のマスターブートレコード</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>ブートパーティション</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>システムパーティション</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>ブートローダーをインストールしません</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>ツール</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>デバッグ情報</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>インストール</translation>
</message>
@@ -180,7 +180,7 @@
<translation>python ジョブ %2 におけるメインスクリプトファイル %1 が読み込めません。</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>ジョブ "%1" での Boost.Python エラー。</translation>
</message>
@@ -597,18 +597,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>コマンドを実行できませんでした。</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>コマンドがホスト環境で実行される際、rootのパスの情報が必要になりますが、root のマウントポイントが定義されていません。</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>ユーザー名が必要ですが、定義されていません。</translation>
</message>
@@ -920,13 +920,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1245,6 +1245,32 @@ The installer will quit and all changes will be lost.</source>
<translation>インストーラーを表示するためには、画面が小さすぎます。</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1323,27 +1349,27 @@ The installer will quit and all changes will be lost.</source>
<translation>フォーム</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>上記の項目及び条件に同意します。</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>ライセンス契約条項</h1> このセットアップはライセンス条項に従うことが必要なプロプライエタリなソフトウェアをインストールします。</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>上記のエンドユーザーライセンス条項 (EULAs) を確認してください。<br/>もしライセンス条項に同意できない場合、セットアップを続行することはできません。</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>ライセンス契約条項</h1> このセットアップは、機能を追加し、ユーザーの使いやすさを向上させるために、ライセンス条項に従うことが必要なプロプライエタリなソフトウェアをインストールします。</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>上記のエンドユーザーライセンス条項 (EULAs) を確認してください。<br/>もしライセンス条項に同意できない場合、プロプライエタリなソフトウェアはインストールされず、代わりにオープンソースのソフトウェアが使用されます。</translation>
</message>
@@ -1499,6 +1525,37 @@ The installer will quit and all changes will be lost.</source>
<translation>パッケージの選択</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1865,34 +1922,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>空き領域</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>新しいパーティション</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>名前</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>ファイルシステム</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>マウントポイント</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>サイズ</translation>
</message>
@@ -1965,12 +2022,12 @@ The installer will quit and all changes will be lost.</source>
<translation>%1 上で新しいパーティションテーブルを作成します。よろしいですか？</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>新しいパーティションを作成できません</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>%1 上のパーティションテーブルには既にプライマリパーティション %2 が配置されており、追加することができません。プライマリパーティションを消去して代わりに拡張パーティションを追加してください。</translation>
</message>
@@ -1978,107 +2035,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>システム情報を取得中...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>パーティション</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>他のオペレーティングシステムに<strong>共存して</strong> %1 をインストール。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation>ディスクを<strong>消去</strong>し %1 をインストール。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation>パーティションを %1 に<strong>置き換える。</strong></translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>手動</strong>でパーティションを設定する。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>ディスク <strong>%2</strong> (%3) 上ののオペレーティングシステムと<strong>共存</strong>して %1 をインストール。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation> ディスク <strong>%2</strong> (%3) を<strong>消去して</strong> %1 をインストール。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation>ディスク <strong>%2</strong> (%3) 上のパーティションを %1 に<strong>置き換える。</strong></translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>ディスク <strong>%1</strong> (%2) 上で <strong>手動で</strong>パーティショニングする。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>ディスク <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>現在:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>変更後:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>EFI システムパーティションが設定されていません</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>%1 を起動するためにはEFI システムパ ーティションが必要です。<br/><br/> EFI システムパーティションを設定するためには、元に戻って、マウントポイント<strong>%2</strong>で<strong>esp</strong>フラグを設定したFAT32ファイルシステムを選択するか作成します。<br/><br/>EFI システムパ ーティションの設定をせずに続行することはできますが、その場合はシステムの起動に失敗することになるかもしれません。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>EFI システムパーティションのフラグが設定されていません</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>%1 を起動するためにはEFI システムパ ーティションが必要です。<br/><br/>パーティションはマウントポイント<strong>%2</strong>に設定されていますが、<strong>esp</strong> フラグが設定されていません。<br/>フラグを設定するには、元に戻ってパーティションを編集してください。<br/><br/>フラグの設定をせずに続けることはできますが、その場合、システムの起動に失敗することになるかもしれません。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>ブートパーティションが暗号化されていません</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>ブートパーティションは暗号化されたルートパーティションとともにセットアップされましたが、ブートパーティションは暗号化されていません。<br/><br/>重要なシステムファイルが暗号化されていないパーティションに残されているため、このようなセットアップは安全上の懸念があります。<br/>セットアップを続行することはできますが、後でシステムの起動中にファイルシステムが解除されるおそれがあります。<br/>ブートパーティションを暗号化させるには、前の画面に戻って、再度パーティションを作成し、パーティション作成ウィンドウ内で<strong>Encrypt</strong> (暗号化) を選択してください。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2126,17 +2183,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>後でファイルを保存する...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>保存するための設定ファイルがありません。</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>設定ファイルはすべて保護されるわけではありません。</translation>
</message>
@@ -2292,69 +2349,69 @@ Output:
<translation>フォーム</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>%1 をインストールする場所を選択します。<br/><font color="red">警告: </font>選択したパーティション内のすべてのファイルが削除されます。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>選択した項目は有効なパーティションではないようです。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 は空き領域にインストールすることはできません。既存のパーティションを選択してください。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 は拡張パーティションにインストールできません。既存のプライマリまたは論理パーティションを選択してください。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 はこのパーティションにインストールできません。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>データパーティション (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>不明なシステムパーティション (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 システムパーティション (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>パーティション %1 は、%2 には小さすぎます。少なくとも %3 GB 以上のパーティションを選択してください。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>EFI システムパーティションがシステムに見つかりません。%1 を設定するために一旦戻って手動パーティショニングを使用してください。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 は %2 にインストールされます。<br/><font color="red">警告: </font>パーティション %2 のすべてのデータは失われます。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>%1 上の EFI システムパーティションは %2 開始時に使用されます。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI システムパーティション:</translation>
</message>
@@ -2456,7 +2513,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>ボリュームグループのサイズ変更</translation>
</message>
@@ -2758,7 +2815,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>シェルプロセスジョブ</translation>
</message>
@@ -2775,12 +2832,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>これはインストールを開始した時に起こることの概要です。</translation>
</message>
@@ -2891,7 +2948,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>フィードバック</translation>
</message>
@@ -2899,43 +2956,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>ユーザー名が長すぎます。</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>ユーザー名に不適切な文字が含まれています。アルファベットの小文字と数字のみが使用できます。</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>ホスト名が短すぎます。</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>ホスト名が長過ぎます。</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>ホスト名に不適切な文字が含まれています。アルファベット、数字及びハイフンのみが使用できます。</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>パスワードが一致していません！</translation>
</message>
@@ -2943,7 +3000,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>ユーザー情報</translation>
</message>
diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts
index eadd5e0f3de333110079aa272ac61ef243c4c915..0763d38841b6c6d185ff0246324cebc9c9f0812f 100644
--- a/lang/calamares_kk.ts
+++ b/lang/calamares_kk.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Саймандар</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Жөндеу ақпараты</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Орнату</translation>
</message>
@@ -180,7 +180,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation type="unfinished"/>
</message>
@@ -595,18 +595,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -918,13 +918,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1242,6 +1242,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1320,27 +1346,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1496,6 +1522,37 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1862,34 +1919,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1962,12 +2019,12 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1975,107 +2032,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2123,17 +2180,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2286,69 +2343,69 @@ Output:
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI жүйелік бөлімі:</translation>
</message>
@@ -2450,7 +2507,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2752,7 +2809,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2769,12 +2826,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2885,7 +2942,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2893,43 +2950,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
</message>
@@ -2937,7 +2994,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Пайдаланушылар</translation>
</message>
diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts
index 9597a4e4ae6c79cb0764cd3a08f8416654776d0e..d35896ecb149f263b2287fc1d7072e9540a8cc52 100644
--- a/lang/calamares_kn.ts
+++ b/lang/calamares_kn.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -97,7 +97,7 @@
<translation>ಉಪಕರಣಗಳು</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation type="unfinished"/>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>ಸ್ಥಾಪಿಸು</translation>
</message>
@@ -180,7 +180,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation type="unfinished"/>
</message>
@@ -595,18 +595,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -918,13 +918,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1242,6 +1242,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1320,27 +1346,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1496,6 +1522,37 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1862,34 +1919,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1962,12 +2019,12 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1975,107 +2032,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>ಪ್ರಸಕ್ತ:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2123,17 +2180,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2286,69 +2343,69 @@ Output:
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2450,7 +2507,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2752,7 +2809,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2769,12 +2826,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2885,7 +2942,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2893,43 +2950,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
</message>
@@ -2937,7 +2994,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts
index 9d209f30ff282ee8c70fb010300610b27724127c..84a4cea96597486fe96868d5d61fce7d7a231273 100644
--- a/lang/calamares_ko.ts
+++ b/lang/calamares_ko.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>%1의 마스터 부트 레코드</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>부트 파티션</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>시스템 파티션</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>부트로더를 설치하지 않습니다</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>도구</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>디버그 정보</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>설치</translation>
</message>
@@ -180,7 +180,7 @@
<translation>파이썬 작업 %2에 대한 주 스크립트 파일 %1을 읽을 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>작업 "%1"에서 Boost.Python 오류</translation>
</message>
@@ -597,18 +597,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>명령을 실행할 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>이 명령은 호스트 환경에서 실행되며 루트 경로를 알아야하지만, rootMountPoint가 정의되지 않았습니다.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>이 명령은 사용자 이름을 알아야 하지만, username이 정의되지 않았습니다.</translation>
</message>
@@ -920,13 +920,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1244,6 +1244,32 @@ The installer will quit and all changes will be lost.</source>
<translation>설치 관리자를 표시하기에 화면이 너무 작습니다.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ The installer will quit and all changes will be lost.</source>
<translation>형식</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>상기 계약 조건을 모두 동의합니다.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>라이센스 동의</h1>이 설치 절차는 라이센스 조항의 적용을 받는 독점 소프트웨어를 설치합니다.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>상기 최종 사용자 라이센스 동의 (EULAs) 를 검토해주시길 바랍니다.<br/>조건에 동의하지 않는다면, 설치 절차를 계속할 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>라이센스 동의</h1>이 설치 절차는 추가적인 기능들을 제공하고 사용자 환경을 개선하기 위한 독점 소프트웨어를 설치할 수 있으며, 이 소프트웨어는 라이센스 조항의 적용을 받습니다.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>상기 최종 사용자 라이센스 동의 (EULAs) 를 검토해주시길 바랍니다. <br/>조건에 동의하지 않는다면, 독점 소프트웨어는 설치되지 않을 것이며, 대체하여 사용할 수 있는 오픈 소스 소프트웨어가 사용될 것입니다.</translation>
</message>
@@ -1498,6 +1524,37 @@ The installer will quit and all changes will be lost.</source>
<translation>패키지 선택</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>여유 공간</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>새로운 파티션</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>이름</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>파일 시스템</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>마운트 위치</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>크기</translation>
</message>
@@ -1964,12 +2021,12 @@ The installer will quit and all changes will be lost.</source>
<translation>%1에 새 파티션 테이블을 생성하시겠습니까?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>새로운 파티션을 만들 수 없습니다</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>%1의 파티션 테이블에는 이미 %2 기본 파티션이 있으므로 더 이상 추가할 수 없습니다. 대신 기본 파티션 하나를 제거하고 확장 파티션을 추가하세요.</translation>
</message>
@@ -1977,107 +2034,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>시스템 정보 수집 중...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>파티션</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>%1을 다른 운영 체제와 <strong>함께</strong> 설치합니다.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation>디스크를 <strong>지우고</strong> %1을 설치합니다.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation>파티션을 %1로 <strong>바꿉니다</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>수동</strong> 파티션 작업</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>디스크 <strong>%2</strong> (%3)에 다른 운영 체제와 <strong>함께</strong> %1을 설치합니다.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation>디스크 <strong>%2</strong> (%3)를 <strong>지우고</strong> %1을 설치합니다.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation>디스크 <strong>%2</strong> (%3)의 파티션을 %1로 <strong>바꿉니다</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>디스크 <strong>%1</strong> (%2) 의 <strong>수동</strong> 파티션 작업입니다.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>디스크 <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>현재:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>이후:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>EFI 시스템 파티션이 설정되지 않았습니다</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>%1를 시작하려면 EFI 시스템 파티션이 필요합니다.<br/><br/>EFI 시스템 파티션을 구성하려면 돌아가서 <strong>esp</strong> 플래그를 사용하도록 설정한 FAT32 파일 시스템을 선택하거나 생성하여 <strong>%2</strong> 위치를 마운트합니다.<br/><br/>EFI 시스템 파티션을 설정하지 않고 계속할 수 있지만 시스템이 시작되지 않을 수 있습니다.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>EFI 시스템 파티션 플래그가 설정되지 않았습니다</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>%1를 시작하려면 EFI 시스템 파티션이 필요합니다.<br/><br/><strong>%2</strong> 마운트 위치로 파티션이 구성되었지만 해당 <strong>esp</strong> 플래그가 설정되지 않았습니다.<br/>플래그를 설정하려면 돌아가서 파티션을 편집합니다.<br/><br/>플래그를 설정하지 않고 계속할 수 있지만 시스템이 시작되지 않을 수 있습니다.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>부트 파티션이 암호화되지 않았습니다</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>암호화된 루트 파티션과 함께 별도의 부팅 파티션이 설정되었지만 부팅 파티션은 암호화되지 않았습니다.<br/><br/>중요한 시스템 파일은 암호화되지 않은 파티션에 보관되기 때문에 이러한 설정과 관련하여 보안 문제가 있습니다.<br/>원하는 경우 계속할 수 있지만 나중에 시스템을 시작하는 동안 파일 시스템 잠금이 해제됩니다.<br/>부팅 파티션을 암호화하려면 돌아가서 다시 생성하여 파티션 생성 창에서 <strong>암호화</strong>를 선택합니다.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>하나 이상의 디스크 장치를 사용할 수 있습니다.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>설치할 파티션이 없습니다.</translation>
</message>
@@ -2125,17 +2182,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>나중을 위해 파일들을 저장하는 중...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>나중을 위해 저장될 설정된 파일들이 없습니다.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>모든 설정된 파일들이 보존되는 것은 아닙니다.</translation>
</message>
@@ -2291,69 +2348,69 @@ Output:
<translation>형식</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>%1을 설치할 위치를 선택합니다.<br/><font color="red">경고: </font>선택한 파티션의 모든 파일이 삭제됩니다.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>선택된 항목은 유효한 파티션으로 표시되지 않습니다.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1은 빈 공간에 설치될 수 없습니다. 존재하는 파티션을 선택해주세요.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1은 확장 파티션에 설치될 수 없습니다. 주 파티션 혹은 논리 파티션을 선택해주세요.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1은 이 파티션에 설치될 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>데이터 파티션 (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>알 수 없는 시스템 파티션 (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 시스템 파티션 (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>%1 파티션이 %2에 비해 너무 작습니다. 용량이 %3 GiB 이상인 파티션을 선택하십시오.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>이 시스템에서는 EFI 시스템 파티션을 찾을 수 없습니다. 돌아가서 수동 파티션 작업을 사용하여 %1을 설정하세요.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1이 %2에 설치됩니다.<br/><font color="red">경고: </font>%2 파티션의 모든 데이터가 손실됩니다.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>%1의 EFI 시스템 파티션은 %2의 시작으로 사용될 것입니다.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI 시스템 파티션:</translation>
</message>
@@ -2455,7 +2512,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>볼륨 그룹 크기조정</translation>
</message>
@@ -2757,7 +2814,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>셸 처리 작업</translation>
</message>
@@ -2774,12 +2831,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation>설치 절차를 시작하면 어떻게 되는지 간략히 설명합니다.</translation>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>설치 절차를 시작하면 어떻게 되는지 간략히 설명합니다.</translation>
</message>
@@ -2890,7 +2947,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>피드백</translation>
</message>
@@ -2898,43 +2955,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation><small>둘 이상의 사용자가 이 컴퓨터를 사용할 경우, 설정 후 계정을 여러 개 만들 수 있습니다.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation><small>둘 이상의 사용자가 이 컴퓨터를 사용할 경우 설치 후 계정을 여러 개 만들 수 있습니다.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>사용자 이름이 너무 깁니다.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>사용자 이름이 유효하지 않은 문자들을 포함하고 있습니다. 소문자 그리고 숫자만이 허용됩니다.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>호스트 이름이 너무 짧습니다.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>호스트 이름이 너무 깁니다.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>호스트명에 부적절한 문자가 포함되어 있습니다.알파벳, 숫자 및 하이푼만 사용할 수 있습니다.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>암호가 일치하지 않습니다!</translation>
</message>
@@ -2942,7 +2999,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>사용자</translation>
</message>
diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts
index 0e37e0bbff2ce51705ede7b043d7bce2b70f7449..15b650cb9a5b1c7ed08a0f07b0a5ef0c501df30e 100644
--- a/lang/calamares_lo.ts
+++ b/lang/calamares_lo.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -97,7 +97,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation type="unfinished"/>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation type="unfinished"/>
</message>
@@ -180,7 +180,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation type="unfinished"/>
</message>
@@ -595,18 +595,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -918,13 +918,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1242,6 +1242,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1320,27 +1346,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1496,6 +1522,37 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1862,34 +1919,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1962,12 +2019,12 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1975,107 +2032,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2123,17 +2180,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2286,69 +2343,69 @@ Output:
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2450,7 +2507,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2752,7 +2809,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2769,12 +2826,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2885,7 +2942,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2893,43 +2950,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
</message>
@@ -2937,7 +2994,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts
index 429732ebd6da43fbf79b2e5b063e532eca1e9720..964fb02ba48cc235b547aa47f80ea142ae49cb17 100644
--- a/lang/calamares_lt.ts
+++ b/lang/calamares_lt.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation> %1 paleidimo įrašas (MBR)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Paleidimo skaidinys</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Sistemos skaidinys</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Nediegti paleidyklės</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Įrankiai</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Derinimo informacija</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Diegimas</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Pagrindinis scenarijus %1 dėl python %2 užduoties yra neskaitomas</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python klaida užduotyje "%1".</translation>
</message>
@@ -597,18 +597,18 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Nepavyko paleisti komandos.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>Komanda yra vykdoma serverio aplinkoje ir turi žinoti šaknies kelią, tačiau nėra apibrėžtas joks rootMountPoint.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Komanda turi žinoti naudotojo vardą, tačiau nebuvo apibrėžtas joks naudotojo vardas.</translation>
</message>
@@ -920,13 +920,13 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1244,6 +1244,32 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<translation>Ekranas yra per mažas, kad būtų parodyta diegimo programa.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation>OEM partijos identifikatorius</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation>Nepavyko sukurti katalogų <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation>Nepavyko atverti failo <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation>Nepavyko rašyti į failą <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<translation>Forma</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Sutinku su aukščiau išdėstytomis nuostatomis ir sąlygomis.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Licencijos Sutartis</h1>Ši sąrankos procedūra įdiegs nuosavybinę programinę įrangą, kuriai yra taikomos licencijavimo nuostatos.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Prašome aukščiau peržiūrėti Galutinio Vartotojo Licencijos Sutartis (angl. EULA).<br/>Jeigu nesutiksite su nuostatomis, sąrankos procedūra negalės būti tęsiama.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Licencijos Sutartis</h1>Tam, kad pateiktų papildomas ypatybes ir pagerintų naudotojo patirtį, ši sąrankos procedūra gali įdiegti nuosavybinę programinę įrangą, kuriai yra taikomos licencijavimo nuostatos.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Prašome aukščiau peržiūrėti Galutinio Vartotojo Licencijos Sutartis (angl. EULA).<br/>Jeigu nesutiksite su nuostatomis, tuomet nuosavybinė programinė įranga nebus įdiegta, o vietoj jos, bus naudojamos atviro kodo alternatyvos.</translation>
</message>
@@ -1498,6 +1524,37 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<translation>Paketų pasirinkimas</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation>Par&tija:</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation><html><head/><body><p>Čia įveskite partijos identifikatorių. Jis bus saugomas paskirties sistemoje.</p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation><html><head/><body><h1>OEM konfigūracija</h1><p>Konfigūruojant paskirties sistemą, Calamares naudos OEM nustatymus.</p></body></html></translation>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation>OEM konfigūracija</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation>Nustatyti OEM partijos identifikatorių į <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Laisva vieta</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Naujas skaidinys</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Pavadinimas</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Failų sistema</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Prijungimo vieta</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Dydis</translation>
</message>
@@ -1964,12 +2021,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<translation>Ar tikrai %1 norite sukurti naują skaidinių lentelę?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Nepavyksta sukurti naują skaidinį</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>Skaidinių lentelėje ties %1 jau yra %2 pirminiai skaidiniai ir daugiau nebegali būti pridėta. Pašalinkite vieną pirminį skaidinį ir vietoj jo, pridėkite išplėstą skaidinį.</translation>
</message>
@@ -1977,107 +2034,107 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Renkama sistemos informacija...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Skaidiniai</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Diegti %1 <strong>šalia</strong> kitos operacinės sistemos.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Ištrinti</strong> diską ir diegti %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Pakeisti</strong> skaidinį, įrašant %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Rankinis</strong> skaidymas.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Įdiegti %1 <strong>šalia</strong> kitos operacinės sistemos diske <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Ištrinti</strong> diską <strong>%2</strong> (%3) ir diegti %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Pakeisti</strong> skaidinį diske <strong>%2</strong> (%3), įrašant %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Rankinis</strong> skaidymas diske <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Diskas <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Dabartinis:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Po:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Nėra sukonfigūruoto EFI sistemos skaidinio</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>EFI sistemos skaidinys yra būtinas, norint paleisti %1.<br/><br/>Tam, kad sukonfigūruotumėte EFI sistemos skaidinį, grįžkite atgal ir pasirinkite arba sukurkite FAT32 failų sistemą su įjungta <strong>esp</strong> vėliavėle ir <strong>%2</strong> prijungimo tašku.<br/><br/>Jūs galite tęsti ir nenustatę EFI sistemos skaidinio, tačiau tokiu atveju, gali nepavykti paleisti jūsų sistemos.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Nenustatyta EFI sistemos skaidinio vėliavėlė</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>EFI sistemos skaidinys yra būtinas, norint paleisti %1.<br/><br/>Skaidinys buvo sukonfigūruotas su prijungimo tašku <strong>%2</strong>, tačiau jo <strong>esp</strong> vėliavėlė yra nenustatyta.<br/>Tam, kad nustatytumėte vėliavėlę, grįžkite atgal ir redaguokite skaidinį.<br/><br/>Jūs galite tęsti ir nenustatę vėliavėlės, tačiau tokiu atveju, gali nepavykti paleisti jūsų sistemos.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Paleidimo skaidinys nėra užšifruotas</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Kartu su užšifruotu šaknies skaidiniu, buvo nustatytas atskiras paleidimo skaidinys, tačiau paleidimo skaidinys nėra užšifruotas.<br/><br/>Dėl tokios sąrankos iškyla tam tikrų saugumo klausimų, kadangi svarbūs sisteminiai failai yra laikomi neužšifruotame skaidinyje.<br/>Jeigu norite, galite tęsti, tačiau failų sistemos atrakinimas įvyks vėliau, sistemos paleidimo metu.<br/>Norėdami užšifruoti paleidimo skaidinį, grįžkite atgal ir sukurkite jį iš naujo bei skaidinių kūrimo lange pažymėkite parinktį <strong>Užšifruoti</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>turi bent vieną prieinamą disko įrenginį.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>Nėra skaidinių į kuriuos diegti.</translation>
</message>
@@ -2125,17 +2182,17 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Įrašomi failai vėlesniam naudojimui ...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Nėra sukonfigūruota įrašyti jokius failus vėlesniam naudojimui.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Ne visus iš sukonfigūruotų failų pavyko išsaugoti.</translation>
</message>
@@ -2291,69 +2348,69 @@ Išvestis:
<translation>Forma</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Pasirinkite, kur norėtumėte įdiegti %1.<br/><font color="red">Įspėjimas: </font>tai ištrins visus, pasirinktame skaidinyje esančius, failus.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Pasirinktas elementas neatrodo kaip teisingas skaidinys.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 negali būti įdiegta laisvoje vietoje. Prašome pasirinkti esamą skaidinį.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 negali būti įdiegta išplėstame skaidinyje. Prašome pasirinkti esamą pirminį ar loginį skaidinį.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 negali būti įdiegta šiame skaidinyje.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Duomenų skaidinys (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Nežinomas sistemos skaidinys (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 sistemos skaidinys (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Skaidinys %1 yra pernelyg mažas sistemai %2. Prašome pasirinkti skaidinį, kurio dydis siektų bent %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Šioje sistemoje niekur nepavyko rasti EFI skaidinio. Prašome grįžti ir naudoti rankinį skaidymą, kad nustatytumėte %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 sistema bus įdiegta skaidinyje %2.<br/><font color="red">Įspėjimas: </font>visi duomenys skaidinyje %2 bus prarasti.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>%2 paleidimui bus naudojamas EFI sistemos skaidinys, esantis %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI sistemos skaidinys:</translation>
</message>
@@ -2455,7 +2512,7 @@ Išvestis:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Keisti tomų grupės dydį</translation>
</message>
@@ -2757,7 +2814,7 @@ Išvestis:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Apvalkalo procesų užduotis</translation>
</message>
@@ -2774,12 +2831,12 @@ Išvestis:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation>Tai yra apžvalga to, kas įvyks, prasidėjus sąrankos procedūrai.</translation>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Tai yra apžvalga to, kas įvyks, prasidėjus diegimo procedūrai.</translation>
</message>
@@ -2890,7 +2947,7 @@ Išvestis:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Grįžtamasis ryšys</translation>
</message>
@@ -2898,43 +2955,43 @@ Išvestis:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation><small>Jei šiuo kompiuteriu naudosis keli žmonės, po sąrankos galite sukurti papildomas paskyras.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation><small>Jei šiuo kompiuteriu naudosis keli žmonės, po diegimo galite sukurti papildomas paskyras.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Jūsų naudotojo vardas yra pernelyg ilgas.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Jūsų naudotojo varde yra neleistinų simbolių. Leidžiamos tik mažosios raidės ir skaičiai.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Jūsų kompiuterio vardas yra pernelyg trumpas.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Jūsų kompiuterio vardas yra pernelyg ilgas.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Jūsų kompiuterio varde yra neleistinų simbolių. Kompiuterio varde gali būti tik raidės, skaičiai ir brūkšniai.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Jūsų slaptažodžiai nesutampa!</translation>
</message>
@@ -2942,7 +2999,7 @@ Išvestis:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Naudotojai</translation>
</message>
diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts
index e2aff3ed5649a347cdca2cb0c18bfc087141ce12..83bf1d1bbbff0dd8e18a76bef347ae7653b1f525 100644
--- a/lang/calamares_mk.ts
+++ b/lang/calamares_mk.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -97,7 +97,7 @@
<translation>Алатки</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation type="unfinished"/>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Инсталирај</translation>
</message>
@@ -180,7 +180,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation type="unfinished"/>
</message>
@@ -595,18 +595,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -918,13 +918,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1242,6 +1242,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1320,27 +1346,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1496,6 +1522,37 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1862,34 +1919,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1962,12 +2019,12 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1975,107 +2032,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2123,17 +2180,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2286,69 +2343,69 @@ Output:
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2450,7 +2507,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2752,7 +2809,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2769,12 +2826,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2885,7 +2942,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2893,43 +2950,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
</message>
@@ -2937,7 +2994,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts
index 5d1018d7ee842fef7866e03618226a61d30562a6..c49a732351e0020296ed4ca7d5f6d52cbad7a9d1 100644
--- a/lang/calamares_mr.ts
+++ b/lang/calamares_mr.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>%1 च्या मुख्य आरंभ अभिलेखामधे</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>आरंभक विभाजन</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>प्रणाली विभाजन</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>आरंभ सूचक अधिष्ठापित करु नका</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation> साधने</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>दोषमार्जन माहिती</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>अधिष्ठापना</translation>
</message>
@@ -180,7 +180,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation type="unfinished"/>
</message>
@@ -595,18 +595,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -918,13 +918,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1242,6 +1242,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1320,27 +1346,27 @@ The installer will quit and all changes will be lost.</source>
<translation>स्वरुप</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1496,6 +1522,37 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1862,34 +1919,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1962,12 +2019,12 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1975,107 +2032,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>सद्या :</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>नंतर :</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2123,17 +2180,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2286,69 +2343,69 @@ Output:
<translation>स्वरुप</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2450,7 +2507,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2752,7 +2809,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2769,12 +2826,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2885,7 +2942,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2893,43 +2950,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>तुमचा वापरकर्तानाव खूप लांब आहे</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>तुमच्या वापरकर्तानावात अवैध अक्षरे आहेत. फक्त अक्षरे, अंक आणि डॅश स्वीकारले जातील.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>तुमचा संगणकनाव खूप लहान आहे</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>तुमचा संगणकनाव खूप लांब आहे</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>तुमच्या संगणकनावात अवैध अक्षरे आहेत. फक्त अक्षरे, अंक आणि डॅश स्वीकारले जातील.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>तुमचा परवलीशब्द जुळत नाही</translation>
</message>
@@ -2937,7 +2994,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>वापरकर्ते</translation>
</message>
diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts
index 55306b736333cf1d0eb53cd52bb9f8244b21b8ea..c6b321ff7e4b7e0fcdf7d3cfac5ba23738e17845 100644
--- a/lang/calamares_nb.ts
+++ b/lang/calamares_nb.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record til %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Bootpartisjon</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Systempartisjon</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Ikke installer en oppstartslaster</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Verktøy</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Debug informasjon</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Installer</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Hovedskriptfil %1 for python oppgave %2 er ikke lesbar.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python feil i oppgave "%1".</translation>
</message>
@@ -596,18 +596,18 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -919,13 +919,13 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1243,6 +1243,32 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<translation>Form</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1497,6 +1523,37 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1963,12 +2020,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1976,107 +2033,107 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2287,69 +2344,69 @@ Output:
<translation>Form</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 kan ikke bli installert på denne partisjonen.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2451,7 +2508,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2753,7 +2810,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2770,12 +2827,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2886,7 +2943,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2894,43 +2951,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Brukernavnet ditt er for langt.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
</message>
@@ -2938,7 +2995,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Brukere</translation>
</message>
diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts
index d863761f6347528d924d321f1382b102298166db..fd326fed829f99db43e5c42e6c8fc3159341c032 100644
--- a/lang/calamares_ne_NP.ts
+++ b/lang/calamares_ne_NP.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -97,7 +97,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation type="unfinished"/>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation type="unfinished"/>
</message>
@@ -180,7 +180,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation type="unfinished"/>
</message>
@@ -595,18 +595,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -918,13 +918,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1242,6 +1242,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1320,27 +1346,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1496,6 +1522,37 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1862,34 +1919,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1962,12 +2019,12 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1975,107 +2032,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2123,17 +2180,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2286,69 +2343,69 @@ Output:
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2450,7 +2507,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2752,7 +2809,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2769,12 +2826,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2885,7 +2942,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2893,43 +2950,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
</message>
@@ -2937,7 +2994,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts
index bd3b23bb47b52c6656266571891035f33c27be3b..255e9f09065f550e63477e03719ba0871711a2a7 100644
--- a/lang/calamares_nl.ts
+++ b/lang/calamares_nl.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record van %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Bootpartitie</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Systeempartitie</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Geen bootloader installeren</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Hulpmiddelen</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Debug informatie</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Installeer</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Hoofdscriptbestand %1 voor python taak %2 onleesbaar.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python fout in taak "%1".</translation>
</message>
@@ -596,18 +596,18 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Kon de opdracht niet uitvoeren.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>De opdracht loopt in de gastomgeving en moet het root pad weten, maar rootMountPoint is niet gedefinieerd.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>De opdracht moet de naam van de gebruiker weten, maar de gebruikersnaam is niet gedefinieerd.</translation>
</message>
@@ -919,13 +919,13 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2) </translation>
@@ -1243,6 +1243,32 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<translation>Het schem is te klein on het installatieprogramma te vertonen.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<translation>Formulier</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Ik aanvaard de bovenstaande algemene voorwaarden.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Licentieovereenkomst</h1>Deze installatieprocedure zal propriëtaire software installeren die onderworpen is aan licentievoorwaarden.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Gelieve bovenstaande licentieovereenkomsten voor eindgebruikers (EULA's) na te kijken.<br/>Indien je de voorwaarden niet aanvaardt, kan de installatie niet doorgaan.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Licentieovereenkomst</h1>Deze installatieprocedure kan mogelijk propriëtaire software, onderworpen aan licentievoorwaarden, installeren om bijkomende functies aan te bieden of de gebruikservaring te verbeteren.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Gelieve bovenstaande licentieovereenkomsten voor eindgebruikers (EULA's) na te kijken.<br/>Indien je de voorwaarden niet aanvaardt zal de propriëtaire software vervangen worden door openbron alternatieven.</translation>
</message>
@@ -1497,6 +1523,37 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<translation>Pakketkeuze</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Vrije ruimte</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Nieuwe partitie</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Naam</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Bestandssysteem</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Aankoppelpunt</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Grootte</translation>
</message>
@@ -1963,12 +2020,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<translation>Weet u zeker dat u een nieuwe partitie tabel wil maken op %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Kan de nieuwe partitie niet aanmaken</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>De partitietabel op %1 bevat al %2 primaire partities en er kunnen geen nieuwe worden aangemaakt. In plaats hiervan kan één primaire partitie verwijderen en een uitgebreide partitie toevoegen.</translation>
</message>
@@ -1976,107 +2033,107 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Systeeminformatie verzamelen...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Partities</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Installeer %1 <strong>naast</strong> een ander besturingssysteem.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Wis</strong> schijf en installeer %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Vervang</strong> een partitie met %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Handmatig</strong> partitioneren.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Installeer %1 <strong>naast</strong> een ander besturingssysteem op schijf <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Wis</strong> schijf <strong>%2</strong> (%3) en installeer %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Vervang</strong> een partitie op schijf <strong>%2</strong> (%3) met %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Handmatig</strong> partitioneren van schijf <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Schijf <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Huidig:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Na:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Geen EFI systeempartitie geconfigureerd</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Een EFI systeempartitie is vereist om %1 te starten.<br/><br/>Om een EFI systeempartitie in te stellen, ga terug en selecteer of maak een FAT32 bestandssysteem met de <strong>esp</strong>-vlag aangevinkt en aankoppelpunt <strong>%2</strong>.<br/><br/>Je kan verdergaan zonder een EFI systeempartitie, maar mogelijk start je systeem dan niet op.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>EFI-systeem partitievlag niet ingesteld.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Een EFI systeempartitie is vereist om %1 op te starten.<br/><br/>Een partitie is ingesteld met aankoppelpunt <strong>%2</strong>, maar de de <strong>esp</strong>-vlag is niet aangevinkt.<br/>Om deze vlag aan te vinken, ga terug en pas de partitie aan.<br/><br/>Je kan verdergaan zonder deze vlag, maar mogelijk start je systeem dan niet op.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Bootpartitie niet versleuteld</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Een aparte bootpartitie was ingesteld samen met een versleutelde rootpartitie, maar de bootpartitie zelf is niet versleuteld.<br/><br/>Dit is niet volledig veilig, aangezien belangrijke systeembestanden bewaard worden op een niet-versleutelde partitie.<br/>Je kan doorgaan als je wil, maar het ontgrendelen van bestandssystemen zal tijdens het opstarten later plaatsvinden.<br/>Om de bootpartitie toch te versleutelen: keer terug en maak de bootpartitie opnieuw, waarbij je <strong>Versleutelen</strong> aanvinkt in het venster partitie aanmaken. </translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Bestanden opslaan voor later...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Geen bestanden geconfigureerd om op te slaan voor later.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Niet alle geconfigureerde bestanden konden worden bewaard.</translation>
</message>
@@ -2290,69 +2347,69 @@ Uitvoer:
<translation>Formulier</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Kies waar %1 te installeren. <br/><font color="red">Opgelet: </font>dit zal alle bestanden op de geselecteerde partitie wissen.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Het geselecteerde item is geen geldige partitie.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 kan niet worden geïnstalleerd op lege ruimte. Kies een bestaande partitie.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 kan niet op een uitgebreide partitie geïnstalleerd worden. Kies een bestaande primaire of logische partitie.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 kan niet op deze partitie geïnstalleerd worden.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Gegevenspartitie (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Onbekende systeempartitie (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 systeempartitie (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Partitie %1 is te klein voor %2. Gelieve een partitie te selecteren met een capaciteit van minstens %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Er werd geen EFI systeempartite gevonden op dit systeem. Gelieve terug te keren en manueel te partitioneren om %1 in te stellen.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 zal geïnstalleerd worden op %2.<br/><font color="red">Opgelet: </font>alle gegevens op partitie %2 zullen verloren gaan.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>De EFI systeempartitie op %1 zal gebruikt worden om %2 te starten.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI systeempartitie:</translation>
</message>
@@ -2454,7 +2511,7 @@ Uitvoer:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Volumegroep herschalen</translation>
</message>
@@ -2756,7 +2813,7 @@ Uitvoer:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Shell-processen Taak</translation>
</message>
@@ -2773,12 +2830,12 @@ Uitvoer:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Dit is een overzicht van wat zal gebeuren wanneer je de installatieprocedure start.</translation>
</message>
@@ -2889,7 +2946,7 @@ Uitvoer:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Feedback</translation>
</message>
@@ -2897,43 +2954,43 @@ Uitvoer:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>De gebruikersnaam is te lang.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>De gebruikersnaam bevat ongeldige tekens. Enkel kleine letters en nummers zijn toegelaten.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>De hostnaam is te kort.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>De hostnaam is te lang.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>De hostnaam bevat ongeldige tekens. Enkel letters, cijfers en liggende streepjes zijn toegelaten.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Je wachtwoorden komen niet overeen!</translation>
</message>
@@ -2941,7 +2998,7 @@ Uitvoer:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Gebruikers</translation>
</message>
diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts
index 7c83701641d6b60454c9df8dc50db105d02e372a..32149abd7b98e0722b1aa04c52fa1dd1f51761c5 100644
--- a/lang/calamares_pl.ts
+++ b/lang/calamares_pl.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Partycja rozruchowa</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Partycja systemowa</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Nie instaluj programu rozruchowego</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Narzędzia</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Informacje debugowania</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Zainstaluj</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Główny plik skryptu %1 dla zadań pythona %2 jest nieczytelny.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Wystąpił błąd Boost.Python w zadaniu "%1".</translation>
</message>
@@ -596,18 +596,18 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Nie można wykonać polecenia.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>Polecenie uruchomione jest w środowisku hosta i musi znać ścieżkę katalogu głównego, jednakże nie został określony punkt montowania katalogu głównego (root).</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Polecenie musi znać nazwę użytkownika, ale żadna nazwa nie została jeszcze zdefiniowana.</translation>
</message>
@@ -919,13 +919,13 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1-(%2) </translation>
@@ -1243,6 +1243,32 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<translation>Zbyt niska rozdzielczość ekranu, aby wyświetlić instalator.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<translation>Formularz</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Akceptuję powyższe warunki korzystania.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Umowy licencyjne</h1>Ten etap instalacji zainstaluje własnościowe oprogramowanie, którego dotyczą zasady licencji.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Przeczytaj znajdujące się poniżej Umowy Licencyjne Końcowego Użytkownika (EULA).<br/>Jeżeli nie zgadzasz się z tymi warunkami, nie możesz kontynuować.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Umowy licencyjne</h1>Ten etap instalacji pozwoli zainstalować własnościowe oprogramowanie, którego dotyczą zasady licencji w celu poprawienia doświadczenia i zapewnienia dodatkowych funkcji.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Przeczytaj znajdujące się poniżej Umowy Licencyjne Końcowego Użytkownika (EULA).<br/>Jeżeli nie zaakceptujesz tych warunków, własnościowe oprogramowanie nie zostanie zainstalowane, zamiast tego zostaną użyte otwartoźródłowe odpowiedniki.</translation>
</message>
@@ -1497,6 +1523,37 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<translation>Wybór pakietów</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Wolna powierzchnia</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Nowa partycja</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Nazwa</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>System plików</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Punkt montowania</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Rozmiar</translation>
</message>
@@ -1963,12 +2020,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<translation>Czy na pewno chcesz utworzyć nową tablicę partycji na %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Nie można utworzyć nowej partycji</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>Tablica partycji na %1 ma już %2 podstawowych partycji i więcej nie może już być dodanych. Prosimy o usunięcie jednej partycji systemowej i dodanie zamiast niej partycji rozszerzonej.</translation>
</message>
@@ -1976,107 +2033,107 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Zbieranie informacji o systemie...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Partycje</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Zainstaluj %1 <strong>obok</strong> innego systemu operacyjnego.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Wyczyść</strong> dysk i zainstaluj %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Zastąp</strong> partycję poprzez %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Ręczne</strong> partycjonowanie.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Zainstaluj %1 <strong>obok</strong> innego systemu operacyjnego na dysku <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Wyczyść</strong> dysk <strong>%2</strong> (%3) i zainstaluj %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Zastąp</strong> partycję na dysku <strong>%2</strong> (%3) poprzez %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Ręczne</strong> partycjonowanie na dysku <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Dysk <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Bieżący:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Po:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Nie skonfigurowano partycji systemowej EFI</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Partycja systemu EFI jest zalecana aby rozpocząć %1.<br/><br/>Aby ją skonfigurować, wróć i wybierz lub utwórz partycję z systemem plików FAT32 i flagą <strong>esp</strong> o punkcie montowania <strong>%2</strong>.<br/><br/>Możesz kontynuować bez ustawiania partycji systemu EFI, ale twój system może nie uruchomić się.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Flaga partycji systemowej EFI nie została ustawiona</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Partycja systemu EFI jest konieczna, aby rozpocząć %1.<br/><br/>Partycja została skonfigurowana w punkcie montowania <strong>%2</strong>, ale nie została ustawiona flaga <strong>esp</strong>. Aby ustawić tę flagę, wróć i zmodyfikuj tę partycję.<br/><br/>Możesz kontynuować bez ustawienia tej flagi, ale Twój system może się nie uruchomić.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Niezaszyfrowana partycja rozruchowa</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Oddzielna partycja rozruchowa została skonfigurowana razem z zaszyfrowaną partycją roota, ale partycja rozruchowa nie jest szyfrowana.<br/><br/>Nie jest to najbezpieczniejsze rozwiązanie, ponieważ ważne pliki systemowe znajdują się na niezaszyfrowanej partycji.<br/>Możesz kontynuować, ale odblokowywanie systemu nastąpi później, w trakcie uruchamiania.<br/>Aby zaszyfrować partycję rozruchową, wróć i utwórz ją ponownie zaznaczając opcję <strong>Szyfruj</strong> w oknie tworzenia partycji.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Zapisywanie plików na później ...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Nie skonfigurowano żadnych plików do zapisania na później.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Nie wszystkie pliki konfiguracyjne mogą być zachowane.</translation>
</message>
@@ -2290,69 +2347,69 @@ Wyjście:
<translation>Formularz</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Wskaż gdzie zainstalować %1.<br/><font color="red">Uwaga: </font>na wybranej partycji zostaną usunięte wszystkie pliki.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Wybrany element zdaje się nie być poprawną partycją.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>Nie można zainstalować %1 na pustej przestrzeni. Prosimy wybrać istniejącą partycję.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>Nie można zainstalować %1 na rozszerzonej partycji. Prosimy wybrać istniejącą partycję podstawową lub logiczną.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 nie może zostać zainstalowany na tej partycji.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Partycja z danymi (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Nieznana partycja systemowa (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 partycja systemowa (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Partycja %1 jest zbyt mała dla %2. Prosimy wybrać partycję o pojemności przynajmniej %3 GB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Nigdzie w tym systemie nie można odnaleźć partycji systemowej EFI. Prosimy się cofnąć i użyć ręcznego partycjonowania dysku do ustawienia %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 zostanie zainstalowany na %2.<br/><font color="red">Uwaga: </font>wszystkie dane znajdujące się na partycji %2 zostaną utracone.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>Partycja systemowa EFI na %1 będzie użyta do uruchamiania %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Partycja systemowa EFI:</translation>
</message>
@@ -2455,7 +2512,7 @@ i nie uruchomi się</translation>
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Zmień Rozmiar Grupy Woluminów</translation>
</message>
@@ -2757,7 +2814,7 @@ i nie uruchomi się</translation>
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Działania procesów powłoki</translation>
</message>
@@ -2774,12 +2831,12 @@ i nie uruchomi się</translation>
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>To jest podsumowanie czynności, które zostaną wykonane po rozpoczęciu przez Ciebie instalacji.</translation>
</message>
@@ -2890,7 +2947,7 @@ i nie uruchomi się</translation>
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Informacje zwrotne</translation>
</message>
@@ -2898,43 +2955,43 @@ i nie uruchomi się</translation>
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Twoja nazwa użytkownika jest za długa.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Twoja nazwa użytkownika zawiera niepoprawne znaki. Dozwolone są tylko małe litery i cyfry.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Twoja nazwa komputera jest za krótka.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Twoja nazwa komputera jest za długa.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Twoja nazwa komputera zawiera niepoprawne znaki. Dozwolone są tylko litery, cyfry i myślniki.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Twoje hasła nie są zgodne!</translation>
</message>
@@ -2942,7 +2999,7 @@ i nie uruchomi się</translation>
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Użytkownicy</translation>
</message>
diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts
index d2be605f82f51e0ab5bdc5641b87942d5b26656a..383235c19105fe39d09260e04bd2a84272d57eba 100644
--- a/lang/calamares_pt_BR.ts
+++ b/lang/calamares_pt_BR.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record de %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Partição de Boot</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Partição de Sistema</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Não instalar um gerenciador de inicialização</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Ferramentas</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Informações de depuração</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instalar</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Arquivo de script principal %1 para a tarefa do python %2 não é legível.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python erro na tarefa "%1".</translation>
</message>
@@ -597,18 +597,18 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Não foi possível executar o comando.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>O comando é executado no ambiente do hospedeiro e precisa saber o caminho root, mas nenhum rootMountPoint foi definido.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>O comando precisa saber do nome do usuário, mas nenhum nome de usuário foi definido.</translation>
</message>
@@ -920,13 +920,13 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1244,6 +1244,32 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<translation>A tela é muito pequena para exibir o instalador.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation>Identificador de Lote OEM</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation>Não foi possível criar diretórios <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation>Não foi possível abrir arquivo <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation>Não foi possível escrever no arquivo <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<translation>Formulário</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Aceito os termos e condições acima.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Termos de licença</h1>Este procedimento de configuração irá instalar software proprietário, que está sujeito aos termos de licenciamento.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Por favor, revise os acordos de licença de usuário final (EULAs) acima.<br/>Se você não concordar com os termos, o procedimento de configuração não pode continuar.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Termos de licença</h1>Este procedimento de instalação pode instalar o software proprietário, que está sujeito a termos de licenciamento, a fim de fornecer recursos adicionais e melhorar a experiência do usuário.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Por favor, revise os acordos de licença de usuário final (EULAs) acima.<br/>Se você não concordar com os termos, o software proprietário não será instalado e as alternativas de código aberto serão utilizadas em seu lugar.</translation>
</message>
@@ -1498,6 +1524,37 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<translation>Seleção de pacotes</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation>&Lote:</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation><html><head/><body><p>Especifique um identificador de lote aqui. Ele será armazenado no sistema de destino.</p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation><html><head/><body><h1>Configuração OEM</h1><p>O Calamares irá utilizar as configurações OEM enquanto configurar o sistema de destino.</p></body></html></translation>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation>Configuração OEM</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation>Definir o identificador de Lote OEM em <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Espaço livre</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Nova partição</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Nome</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Sistema de arquivos</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Ponto de montagem</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Tamanho</translation>
</message>
@@ -1964,12 +2021,12 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<translation>Você tem certeza de que deseja criar uma nova tabela de partições em %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Não foi possível criar uma nova partição</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>A tabela de partições %1 já tem %2 partições primárias, e nenhuma a mais pode ser adicionada. Por favor, remova uma partição primária e adicione uma partição estendida no lugar.</translation>
</message>
@@ -1977,107 +2034,107 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Coletando informações do sistema...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Partições</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Instalar %1 <strong>ao lado de</strong> outro sistema operacional.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Apagar</strong> disco e instalar %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Substituir</strong> uma partição com %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation>Particionamento <strong>manual</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Instalar %1 <strong>ao lado de</strong> outro sistema operacional no disco <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Apagar</strong> disco <strong>%2</strong> (%3) e instalar %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Substituir</strong> uma partição no disco <strong>%2</strong> (%3) com %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>Particionamento <strong>manual</strong> no disco <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disco <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Atualmente:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Depois:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Nenhuma partição de sistema EFI configurada</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Uma partição de sistema EFI é necessária para iniciar %1.<br/><br/>Para configurar uma partição de sistema EFI, volte, selecione ou crie um sistema de arquivos FAT32 com o marcador <strong>esp</strong> ativado e ponto de montagem <strong>%2</strong>.<br/><br/>Você pode continuar sem definir uma partição de sistema EFI, mas seu sistema pode não iniciar.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Marcador da partição do sistema EFI não definida</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Uma partição de sistema EFI é necessária para iniciar %1.<br/><br/>Uma partição foi configurada com o ponto de montagem <strong>%2</strong>, mas seu marcador <strong>esp</strong> não foi definido.<br/>Para definir o marcador, volte e edite a partição.<br/><br/>Você pode continuar sem definir um marcador, mas seu sistema pode não iniciar.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Partição de boot não criptografada</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Uma partição de inicialização separada foi configurada juntamente com uma partição raiz criptografada, mas a partição de inicialização não é criptografada.<br/><br/>Há preocupações de segurança quanto a esse tipo de configuração, porque arquivos de sistema importantes são mantidos em uma partição não criptografada.<br/>Você pode continuar se quiser, mas o desbloqueio do sistema de arquivos acontecerá mais tarde durante a inicialização do sistema.<br/>Para criptografar a partição de inicialização, volte e recrie-a, selecionando <strong>Criptografar</strong> na janela de criação da partição.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>tem pelo menos um dispositivo de disco disponível.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>Não existem partições para a instalação.</translation>
</message>
@@ -2125,17 +2182,17 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Salvando arquivos para mais tarde...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Nenhum arquivo configurado para ser salvo mais tarde.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Nem todos os arquivos configurados puderam ser preservados.</translation>
</message>
@@ -2291,69 +2348,69 @@ Saída:
<translation>Formulário</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Selecione onde instalar %1.<br/><font color="red">Atenção:</font> isto excluirá todos os arquivos existentes na partição selecionada.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>O item selecionado não parece ser uma partição válida.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 não pode ser instalado no espaço vazio. Por favor, selecione uma partição existente.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 não pode ser instalado em uma partição estendida. Por favor, selecione uma partição primária ou lógica existente.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 não pode ser instalado nesta partição.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Partição de dados (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Partição de sistema desconhecida (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>Partição de sistema %1 (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>A partição %1 é muito pequena para %2. Por favor, selecione uma partição com capacidade mínima de %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Não foi encontrada uma partição de sistema EFI no sistema. Por favor, volte e use o particionamento manual para configurar %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 será instalado em %2.<br/><font color="red">Atenção: </font>todos os dados da partição %2 serão perdidos.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>A partição do sistema EFI em %1 será utilizada para iniciar %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Partição do sistema EFI:</translation>
</message>
@@ -2455,7 +2512,7 @@ Saída:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Redimensionar Grupo de Volumes</translation>
</message>
@@ -2757,7 +2814,7 @@ Saída:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Processos de trabalho do Shell</translation>
</message>
@@ -2774,12 +2831,12 @@ Saída:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation>Esta é uma visão geral do que acontecerá quando você iniciar o procedimento de configuração.</translation>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Este é um resumo do que acontecerá assim que o processo de instalação for iniciado.</translation>
</message>
@@ -2890,7 +2947,7 @@ Saída:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Feedback</translation>
</message>
@@ -2898,43 +2955,43 @@ Saída:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation><small>Se mais de uma pessoa for utilizar este computador, você poderá criar múltiplas contas após terminar a configuração.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation><small>Se mais de uma pessoa for utilizar este computador, você poderá criar múltiplas contas após terminar de instalar.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>O nome de usuário é grande demais.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>O nome de usuário contém caracteres inválidos. Apenas letras minúsculas e números são permitidos.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>O nome da máquina é muito curto.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>O nome da máquina é muito grande.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>O nome da máquina contém caracteres inválidos. Apenas letras, números e traços são permitidos.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>As senhas não estão iguais!</translation>
</message>
@@ -2942,7 +2999,7 @@ Saída:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Usuários</translation>
</message>
diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts
index 8f8ca6e4f6cc229b537d0ffe0be9b7158a3e486a..b58475e2562b3e595e6aa21ec34566bd0cb26781 100644
--- a/lang/calamares_pt_PT.ts
+++ b/lang/calamares_pt_PT.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record de %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Partição de arranque</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Partição do Sistema</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Não instalar um carregador de arranque</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Ferramentas</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Informação de depuração</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instalar</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Ficheiro de script principal %1 para a tarefa python %2 não é legível.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Erro Boost.Python na tarefa "%1".</translation>
</message>
@@ -597,18 +597,18 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Não foi possível correr o comando.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>O comando corre no ambiente do host e precisa de conhecer o caminho root, mas nenhum Ponto de Montagem root está definido.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>O comando precisa de saber o nome do utilizador, mas não está definido nenhum nome de utilizador.</translation>
</message>
@@ -920,13 +920,13 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1244,6 +1244,32 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<translation>O ecrã tem um tamanho demasiado pequeno para mostrar o instalador.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<translation>Formulário</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Aceito os termos e condições acima descritos.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Acordo de Licença</h1>Este procedimento instalará programas proprietários que estão sujeitos a termos de licenciamento.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Por favor reveja o Acordo de Utilização do Utilizador Final (EULA) acima.<br/>Se não concordar com os termos, o procedimento de instalação não pode continuar.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Acordo de Licença</h1>Este procedimento pode instalar programas proprietários que estão sujeitos a termos de licenciamento com vista a proporcionar funcionalidades adicionais e melhorar a experiência do utilizador.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Por favor reveja o Acordo de Utilização do Utilizador Final (EULA) acima.<br/>Se não concordar com os termos, programas proprietários não serão instalados, e em vez disso serão usadas soluções alternativas de código aberto.</translation>
</message>
@@ -1498,6 +1524,37 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<translation>Seleção de pacotes</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Espaço Livre</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Nova partição</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Nome</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Sistema de Ficheiros</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Ponto de Montagem</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Tamanho</translation>
</message>
@@ -1964,12 +2021,12 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<translation>Tem certeza de que deseja criar uma nova tabela de partições em %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Não é possível criar nova partição</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>A tabela de partições em %1 já tem %2 partições primárias, e não podem ser adicionadas mais. Em vez disso, por favor remova uma partição primária e adicione uma partição estendida.</translation>
</message>
@@ -1977,107 +2034,107 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>A recolher informações do sistema...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Partições</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Instalar %1 <strong>paralelamente</strong> a outro sistema operativo.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Apagar</strong> disco e instalar %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Substituir</strong> a partição com %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation>Particionamento <strong>Manual</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Instalar %1 <strong>paralelamente</strong> a outro sistema operativo no disco <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Apagar</strong> disco <strong>%2</strong> (%3) e instalar %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Substituir</strong> a partição no disco <strong>%2</strong> (%3) com %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>Particionamento <strong>Manual</strong> no disco <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disco <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Atual:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Depois:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Nenhuma partição de sistema EFI configurada</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>É necessária uma partição de sistema EFI para iniciar %1.<br/><br/>Para configurar uma partição de sistema EFI, volte atrás e selecione ou crie um sistema de ficheiros FAT32 com a flag <strong>esp</strong> ativada e ponto de montagem <strong>%2</strong>.<br/><br/>Pode continuar sem configurar uma partição de sistema EFI mas o seu sistema pode falhar o arranque.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>flag não definida da partição de sistema EFI</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>É necessária uma partição de sistema EFI para iniciar %1.<br/><br/>A partitição foi configurada com o ponto de montagem <strong>%2</strong> mas a sua flag <strong>esp</strong> não está definida.<br/>Para definir a flag, volte atrás e edite a partição.<br/><br/>Pode continuar sem definir a flag mas o seu sistema pode falhar o arranque.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Partição de arranque não encriptada</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Foi preparada uma partição de arranque separada juntamente com uma partição root encriptada, mas a partição de arranque não está encriptada.<br/><br/>Existem preocupações de segurança com este tipo de configuração, por causa de importantes ficheiros de sistema serem guardados numa partição não encriptada.<br/>Se desejar pode continuar, mas o destrancar do sistema de ficheiros irá ocorrer mais tarde durante o arranque do sistema.<br/>Para encriptar a partição de arranque, volte atrás e recrie-a, e selecione <strong>Encriptar</strong> na janela de criação de partições.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>tem pelo menos um dispositivo de disco disponível.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>Não há partições para onde instalar.</translation>
</message>
@@ -2125,17 +2182,17 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>A guardar ficheiros para mais tarde ...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Nenhuns ficheiros configurados para guardar para mais tarde.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Nem todos os ficheiros configurados puderam ser preservados.</translation>
</message>
@@ -2291,69 +2348,69 @@ Saída de Dados:
<translation>Formulário</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Selecione onde instalar %1.<br/><font color="red">Aviso: </font>isto irá apagar todos os ficheiros na partição selecionada.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>O item selecionado não aparenta ser uma partição válida.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 não pode ser instalado no espaço vazio. Por favor selecione uma partição existente.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 não pode ser instalado numa partição estendida. Por favor selecione uma partição primária ou partição lógica. </translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 não pode ser instalado nesta partição.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Partição de dados (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Partição de sistema desconhecida (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 partição de sistema (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>A partição %1 é demasiado pequena para %2. Por favor selecione uma partição com pelo menos %3 GiB de capacidade.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Uma partição de sistema EFI não pode ser encontrada em nenhum sítio neste sistema. Por favor volte atrás e use o particionamento manual para instalar %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 será instalado na %2.<br/><font color="red">Aviso: </font>todos os dados na partição %2 serão perdidos.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>A partição de sistema EFI em %1 será usada para iniciar %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Partição de sistema EFI:</translation>
</message>
@@ -2455,7 +2512,7 @@ Saída de Dados:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Redimensionar Grupo de Volume</translation>
</message>
@@ -2757,7 +2814,7 @@ Saída de Dados:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Tarefa de Processos da Shell</translation>
</message>
@@ -2774,12 +2831,12 @@ Saída de Dados:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Isto é uma visão geral do que acontecerá assim que iniciar o procedimento de instalação.</translation>
</message>
@@ -2890,7 +2947,7 @@ Saída de Dados:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Relatório</translation>
</message>
@@ -2898,43 +2955,43 @@ Saída de Dados:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>O seu nome de utilizador é demasiado longo.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>O seu nome de utilizador contem caractéres inválidos. Apenas letras minúsculas e números são permitidos.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>O nome da sua máquina é demasiado curto.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>O nome da sua máquina é demasiado longo.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>O nome da sua máquina contém caratéres inválidos. Apenas letras, números e traços são permitidos.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>As suas palavras-passe não coincidem!</translation>
</message>
@@ -2942,7 +2999,7 @@ Saída de Dados:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Utilizadores</translation>
</message>
diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts
index d955e4cab7d15633b244734fc6143e4d87b018a9..e80c885681594cdede74f1dc162acd76a0b7209b 100644
--- a/lang/calamares_ro.ts
+++ b/lang/calamares_ro.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master boot record (MBR) al %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Partiție de boot</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Partiție de sistem</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Nu instala un bootloader</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Unelte</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Informație pentru depanare</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instalează</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Fișierul script peincipal %1 pentru sarcina Python %2 nu este citibil.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Eroare Boost.Python în sarcina „%1”.</translation>
</message>
@@ -596,18 +596,18 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Nu s-a putut executa comanda.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -919,13 +919,13 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1243,6 +1243,32 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<translation>Ecranu este prea mic pentru a afișa instalatorul.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<translation>Formular</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Sunt de acord cu termenii și condițiile de mai sus.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Acord de licențiere</h1>Această procedură va instala software proprietar supus unor termeni de licențiere.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Vă rugăm să citiți Licența de utilizare (EULA) de mai sus.<br>Dacă nu sunteți de acord cu termenii, procedura de instalare nu poate continua.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Acord de licențiere</h1>Această procedură de instalare poate instala software proprietar supus unor termeni de licențiere, pentru a putea oferi funcții suplimentare și pentru a îmbunătăți experiența utilizatorilor.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Vă rugăm să citiți Licența de utilizare (EULA) de mai sus.<br/>Dacă nu sunteți de acord cu termenii, softwareul proprietar nu va fi instalat și se vor folosi alternative open-source în loc.</translation>
</message>
@@ -1497,6 +1523,37 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<translation>Selecția pachetelor</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1866,34 +1923,34 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Spațiu liber</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Partiție nouă</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Nume</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Sistem de fișiere</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Punct de montare</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Mărime</translation>
</message>
@@ -1966,12 +2023,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<translation>Sigur doriți să creați o nouă tabelă de partiție pe %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1979,107 +2036,107 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Se adună informații despre sistem...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Partiții</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Instalează %1 <strong>laolaltă</strong> cu un alt sistem de operare.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Șterge</strong> discul și instalează %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Înlocuiește</strong> o partiție cu %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation>Partiționare <strong>manuală</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Instalează %1 <strong>laolaltă</strong> cu un alt sistem de operare pe discul <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Șterge</strong> discul <strong>%2</strong> (%3) și instalează %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Înlocuiește</strong> o partiție pe discul <strong>%2</strong> (%3) cu %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>Partiționare <strong>manuală</strong> a discului <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Discul <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Actual:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>După:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Nicio partiție de sistem EFI nu a fost configurată</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Este necesară o partiție de sistem EFI pentru a porni %1.<br/><br/>Pentru a configura o partiție de sistem EFI, reveniți și selectați sau creați o partiție FAT32 cu flag-ul <strong>esp</strong> activat și montată la <strong>%2</strong>.<br/><br/>Puteți continua și fără configurarea unei partiții de sistem EFI, dar este posibil ca sistemul să nu pornească.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Flag-ul de partiție de sistem pentru EFI nu a fost setat</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>O partiție de sistem EFI este necesară pentru a porni %1.<br/><br/>A fost configurată o partiție cu punct de montare la <strong>%2</strong> dar flag-ul <strong>esp</strong> al acesteia nu a fost setat.<br/>Pentru a seta flag-ul, reveniți și editați partiția.<br/><br/>Puteți continua și fără setarea flag-ului, dar este posibil ca sistemul să nu pornească.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Partiția de boot nu este criptată</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>A fost creată o partiție de boot împreună cu o partiție root criptată, dar partiția de boot nu este criptată.<br/><br/>Sunt potențiale probleme de securitate cu un astfel de aranjament deoarece importante fișiere de sistem sunt păstrate pe o partiție necriptată.<br/>Puteți continua dacă doriți, dar descuierea sistemului se va petrece mai târziu în timpul pornirii.<br/>Pentru a cripta partiția de boot, reveniți și recreați-o, alegând opțiunea <strong>Criptează</strong> din fereastra de creare de partiții.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2127,17 +2184,17 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2293,69 +2350,69 @@ Output
<translation>Formular</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Selectați locul în care să instalați %1.<br/><font color="red">Atenție: </font>aceasta va șterge toate fișierele de pe partiția selectată.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Elementul selectat nu pare a fi o partiție validă.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 nu poate fi instalat în spațiul liber. Vă rugăm să alegeți o partiție existentă.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 nu poate fi instalat pe o partiție extinsă. Vă rugăm selectați o partiție primară existentă sau o partiție logică.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 nu poate fi instalat pe această partiție.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Partiție de date (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Partiție de sistem necunoscută (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 partiție de sistem (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Partiția %1 este prea mică pentru %2. Vă rugăm selectați o partiție cu o capacitate de cel puțin %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>O partiție de sistem EFI nu a putut fi găsită nicăieri pe sistem. Vă rugăm să reveniți și să utilizați partiționarea manuală pentru a seta %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 va fi instalat pe %2.<br/><font color="red">Atenție: </font>toate datele de pe partiția %2 se vor pierde.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>Partiția de sistem EFI de la %1 va fi folosită pentru a porni %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Partiție de sistem EFI:</translation>
</message>
@@ -2457,7 +2514,7 @@ Output
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2759,7 +2816,7 @@ Output
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Shell-ul procesează sarcina.</translation>
</message>
@@ -2776,12 +2833,12 @@ Output
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Acesta este un rezumat a ce se va întâmpla după ce începeți procedura de instalare.</translation>
</message>
@@ -2892,7 +2949,7 @@ Output
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Feedback</translation>
</message>
@@ -2900,43 +2957,43 @@ Output
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Numele de utilizator este prea lung.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Numele de utilizator conține caractere invalide. Folosiți doar litere mici și numere.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Hostname este prea scurt.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Hostname este prea lung.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Hostname conține caractere invalide. Folosiți doar litere, numere și cratime.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Parolele nu se potrivesc!</translation>
</message>
@@ -2944,7 +3001,7 @@ Output
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Utilizatori</translation>
</message>
diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts
index c611c50ac98fe51d8d4ed1b2572f15e04c258bc8..a977941d33d570c373799f7d3f41bd84bd847be4 100644
--- a/lang/calamares_ru.ts
+++ b/lang/calamares_ru.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Главная загрузочная запись %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Загрузочный раздел</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Системный раздел</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Не устанавливать загрузчик</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Инструменты</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Отладочная информация</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Установить</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Главный файл сценария %1 для задачи python %2 недоступен для чтения.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python ошибка в задаче "%1".</translation>
</message>
@@ -595,18 +595,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Не удалось выполнить команду.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>Команда выполняется в окружении установщика, и ей необходимо знать путь корневого раздела, но rootMountPoint не определено.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Команде необходимо знать имя пользователя, но оно не задано.</translation>
</message>
@@ -918,13 +918,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1242,6 +1242,32 @@ The installer will quit and all changes will be lost.</source>
<translation>Слишком маленький экран для окна установщика.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1320,27 +1346,27 @@ The installer will quit and all changes will be lost.</source>
<translation>Форма</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Я принимаю приведенные выше условия.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Лицензионное соглашение</h1>На этом этапе будет установлено программное обеспечение с проприетарной лицензией.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Ознакомьтесь с приведенными выше Лицензионными соглашениями пользователя (EULA).<br/>Если не согласны с условиями, продолжение установки невозможно.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Лицензионное соглашение</h1>На этом этапе можно установить программное обеспечение с проприетарной лицензией, дающее дополнительные возможности и повышающее удобство работы.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Ознакомьтесь выше, с Лицензионными соглашениями конечного пользователя (EULA).<br/>Если вы не согласны с условиями, проприетарное программное обеспечение будет заменено на альтернативное открытое программное обеспечение.</translation>
</message>
@@ -1496,6 +1522,37 @@ The installer will quit and all changes will be lost.</source>
<translation>Выбор пакетов</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1862,34 +1919,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Доступное место</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Новый раздел</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Имя</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Файловая система</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Точка монтирования</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Размер</translation>
</message>
@@ -1962,12 +2019,12 @@ The installer will quit and all changes will be lost.</source>
<translation>Вы уверены, что хотите создать новую таблицу разделов на %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Не удалось создать новый раздел</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>В таблице разделов на %1 уже %2 первичных разделов, больше добавить нельзя. Удалите один из первичных разделов и добавьте расширенный раздел.</translation>
</message>
@@ -1975,107 +2032,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Сбор информации о системе...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Разделы</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Установить %1 <strong>параллельно</strong> к другой операционной системе.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Очистить</strong> диск и установить %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Заменить</strong> раздел на %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Ручная</strong> разметка.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Установить %1 <strong>параллельно</strong> к другой операционной системе на диске <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Очистить</strong> диск <strong>%2</strong> (%3) и установить %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Заменить</strong> раздел на диске <strong>%2</strong> (%3) на %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Ручная</strong> разметка диска <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Диск <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Текущий:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>После:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Нет настроенного системного раздела EFI</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Чтобы начать, необходим системный раздел EFI %1.<br/><br/>Для настройки системного раздела EFI, вернитесь, выберите или создайте файловую систему FAT32 с установленным флагом <strong>esp</strong> и точкой монтирования <strong>%2</strong>.<br/><br/>Вы можете продолжить и без настройки системного раздела EFI, но Ваша система может не загрузиться.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Не установлен флаг системного раздела EFI</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Чтобы начать, необходим системный раздел EFI %1.<br/><br/>Был настроен раздел с точкой монтирования <strong>%2</strong>, но его флаг <strong>esp</strong> не установлен.<br/>Для установки флага вернитесь и отредактируйте раздел.<br/><br/>Вы можете продолжить и без установки флага, но Ваша система может не загрузиться.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Загрузочный раздел не зашифрован</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Включено шифрование корневого раздела, но использован отдельный загрузочный раздел без шифрования.<br/><br/>При такой конфигурации возникают проблемы с безопасностью, потому что важные системные файлы хранятся на разделе без шифрования.<br/>Если хотите, можете продолжить, но файловая система будет разблокирована позднее во время загрузки системы.<br/>Чтобы включить шифрование загрузочного раздела, вернитесь назад и снова создайте его, отметив <strong>Шифровать</strong> в окне создания раздела.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2123,17 +2180,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Сохраняю файлы на потом...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Нет файлов, которые требуется сохранить на потом.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2289,69 +2346,69 @@ Output:
<translation>Форма</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Выберите, где установить %1.<br/><font color="red">Внимание: </font>это удалит все файлы на выбранном разделе.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Выбранный элемент, видимо, не является действующим разделом.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 не может быть установлен вне раздела. Пожалуйста выберите существующий раздел.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 не может быть установлен прямо в расширенный раздел. Выберите существующий основной или логический раздел.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 не может быть установлен в этот раздел.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Раздел данных (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Неизвестный системный раздел (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 системный раздел (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Раздел %1 слишком мал для %2. Пожалуйста выберите раздел объемом не менее %3 Гиб.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Не найден системный раздел EFI. Вернитесь назад и выполните ручную разметку для установки %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 будет установлен в %2.<br/><font color="red">Внимание: </font>все данные на разделе %2 будут потеряны.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>Системный раздел EFI на %1 будет использован для запуска %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Системный раздел EFI:</translation>
</message>
@@ -2453,7 +2510,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Изменить размер группы томов</translation>
</message>
@@ -2755,7 +2812,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2772,12 +2829,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Это обзор изменений, которые будут применены при запуске процедуры установки.</translation>
</message>
@@ -2888,7 +2945,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Отзывы</translation>
</message>
@@ -2896,43 +2953,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Ваше имя пользователя слишком длинное.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Ваше имя пользователя содержит недопустимые символы. Допускаются только строчные буквы и цифры.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Имя вашего компьютера слишком коротко.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Имя вашего компьютера слишком длинное.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Имя вашего компьютера содержит недопустимые символы. Разрешены буквы, цифры и тире.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Пароли не совпадают!</translation>
</message>
@@ -2940,7 +2997,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Пользователи</translation>
</message>
diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts
index 77e0f21353ce3c8026c36e62933f3615080c89d6..002c9851babb651aa54dacf1bc43fd7822f9676d 100644
--- a/lang/calamares_sk.ts
+++ b/lang/calamares_sk.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Hlavný zavádzací záznam (MBR) zariadenia %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Zavádzací oddiel</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Systémový oddiel</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Neinštalovať zavádzač</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Nástroje</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Ladiace informácie</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Inštalácia</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Súbor hlavného skriptu %1 pre úlohu jazyka python %2 nie je možné čítať.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Chyba knižnice Boost.Python v úlohe „%1“.</translation>
</message>
@@ -597,18 +597,18 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Nepodarilo sa spustiť príkaz.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>Príkaz beží v hostiteľskom prostredí a potrebuje poznať koreňovú cestu, ale nie je definovaný žiadny koreňový prípojný bod.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Príkaz musí poznať meno používateľa, ale žiadne nie je definované.</translation>
</message>
@@ -920,13 +920,13 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1244,6 +1244,32 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<translation>Obrazovka je príliš malá na to, aby bolo možné zobraziť inštalátor.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<translation>Forma</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Prijímam podmienky vyššie.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Licenčné podmienky</h1>Tento proces inštalácie môže nainštalovať uzavretý softvér, ktorý je predmetom licenčných podmienok.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Prosím, prečítajte si licenčnú zmluvu koncového používateľa (EULAs) vyššie.<br/>Ak nesúhlasíte s podmienkami, proces inštalácie nemôže pokračovať.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Licenčné podmienky</h1>Tento proces inštalácie môže nainštalovať uzavretý softvér, ktorý je predmetom licenčných podmienok v rámci poskytovania dodatočných funkcií a vylepšenia používateľských skúseností.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Prosím, prečítajte si licenčnú zmluvu koncového používateľa (EULAs) vyššie.<br/>Ak nesúhlasíte s podmienkami, uzavretý softvér nebude nainštalovaný a namiesto neho budú použité alternatívy s otvoreným zdrojom.</translation>
</message>
@@ -1498,6 +1524,37 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<translation>Výber balíkov</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Voľné miesto</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Nový oddiel</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Názov</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Systém súborov</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Bod pripojenia</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Veľkosť</translation>
</message>
@@ -1964,12 +2021,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<translation>Naozaj chcete vytvoriť novú tabuľku oddielov na zariadení %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Nedá sa vytvoriť nový oddiel</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>Tabuľka oddielov na %1 už obsahuje primárne oddiely %2 a nie je možné pridávať žiadne ďalšie. Odstráňte jeden primárny oddiel a namiesto toho pridajte rozšírenú oblasť.</translation>
</message>
@@ -1977,107 +2034,107 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Zbierajú sa informácie o počítači...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Oddiely</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Inštalácia distribúcie %1 <strong>popri</strong> inom operačnom systéme.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Vymazanie</strong> disku a inštalácia distribúcie %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Nahradenie</strong> oddielu distribúciou %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Ručné</strong> rozdelenie oddielov.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Inštalácia distribúcie %1 <strong>popri</strong> inom operačnom systéme na disku <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Vymazanie</strong> disku <strong>%2</strong> (%3) a inštalácia distribúcie %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Nahradenie</strong> oddielu na disku <strong>%2</strong> (%3) distribúciou %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Ručné</strong> rozdelenie oddielov na disku <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disk <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Teraz:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Potom:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Nie je nastavený žiadny oddiel systému EFI</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Oddiel systému EFI je potrebný pre spustenie distribúcie %1.<br/><br/>Na nastavenie oddielu systému EFI prejdite späť a vyberte alebo vytvorte systém súborov FAT32 s povolenou značkou <strong>esp</strong> a bod pripojenia <strong>%2</strong>.<br/><br/>Môžete pokračovať bez nastavenia oddielu systému EFI, ale váš systém môže pri spustení zlyhať.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Značka oddielu systému EFI nie je nastavená</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Oddiel systému EFI je potrebný pre spustenie distribúcie %1.<br/><br/>Oddiel bol nastavený s bodom pripojenia <strong>%2</strong>, ale nemá nastavenú značku <strong>esp</strong>.<br/>Na nastavenie značky prejdite späť a upravte oddiel.<br/><br/>Môžete pokračovať bez nastavenia značky, ale váš systém môže pri spustení zlyhať.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Zavádzací oddiel nie je zašifrovaný</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Spolu so zašifrovaným koreňovým oddielom bol nainštalovaný oddelený zavádzací oddiel, ktorý ale nie je zašifrovaný.<br/><br/>S týmto typom inštalácie je ohrozená bezpečnosť, pretože dôležité systémové súbory sú uchovávané na nezašifrovanom oddieli.<br/>Ak si to želáte, môžete pokračovať, ale neskôr, počas spúšťania systému sa vykoná odomknutie systému súborov.<br/>Na zašifrovanie zavádzacieho oddielu prejdite späť a vytvorte ju znovu vybraním voľby <strong>Zašifrovať</strong> v okne vytvárania oddielu.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>má dostupné aspoň jedno diskové zariadenie.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>Neexistujú žiadne oddiely, na ktoré je možné vykonať inštaláciu.</translation>
</message>
@@ -2125,17 +2182,17 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Ukladajú sa súbory na neskôr...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Žiadne konfigurované súbory pre uloženie na neskôr.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Nie všetky konfigurované súbory môžu byť uchované.</translation>
</message>
@@ -2291,69 +2348,69 @@ Výstup:
<translation>Forma</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Vyberte, kam sa má nainštalovať distribúcia %1.<br/><font color="red">Upozornenie: </font>týmto sa odstránia všetky súbory na vybranom oddieli.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Zdá sa, že vybraná položka nie je platným oddielom.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>Distribúcia %1 sa nedá nainštalovať na prázdne miesto. Prosím, vyberte existujúci oddiel.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>Distribúcia %1 sa nedá nainštalovať na rozšírený oddiel. Prosím, vyberte existujúci primárny alebo logický oddiel.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>Distribúcia %1 sa nedá nainštalovať na tento oddiel.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Údajový oddiel (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Neznámy systémový oddiel (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>Systémový oddiel operačného systému %1 (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Oddiel %1 je príliš malý pre distribúciu %2. Prosím, vyberte oddiel s kapacitou aspoň %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Oddiel systému EFI sa nedá v tomto počítači nájsť. Prosím, prejdite späť a použite ručné rozdelenie oddielov na inštaláciu distribúcie %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>Distribúcia %1 bude nainštalovaná na oddiel %2.<br/><font color="red">Upozornenie: </font>všetky údaje na oddieli %2 budú stratené.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>Oddiel systému EFI na %1 bude použitý pre spustenie distribúcie %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Oddiel systému EFI:</translation>
</message>
@@ -2455,7 +2512,7 @@ Výstup:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Zmeniť veľkosť skupiny zväzkov</translation>
</message>
@@ -2757,7 +2814,7 @@ Výstup:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Úloha procesov príkazového riadku</translation>
</message>
@@ -2774,12 +2831,12 @@ Výstup:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Toto je prehľad toho, čo sa stane, keď spustíte inštaláciu.</translation>
</message>
@@ -2890,7 +2947,7 @@ Výstup:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Spätná väzba</translation>
</message>
@@ -2898,43 +2955,43 @@ Výstup:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Vaše používateľské meno je príliš dlhé.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Vaše používateľské meno obsahuje neplatné znaky. Povolené sú iba písmená, čísla a pomlčky.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Váš názov hostiteľa je príliš krátky.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Váš názov hostiteľa je príliš dlhý.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Váš názov hostiteľa obsahuje neplatné znaky. Povolené sú iba písmená, čísla a pomlčky.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Vaše heslá sa nezhodujú!</translation>
</message>
@@ -2942,7 +2999,7 @@ Výstup:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Používatelia</translation>
</message>
diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts
index 1989da1399a0c6dc90e039edfbded4bdcbc3b7de..62cc65a6d6451fc0d5d3005973dcdfa7d3b2eb4b 100644
--- a/lang/calamares_sl.ts
+++ b/lang/calamares_sl.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Zagonski razdelek</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Sistemski razdelek</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -97,7 +97,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation type="unfinished"/>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Namesti</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Ni mogoče brati datoteke %1 glavnega skripta za pythonovo opravilo %2.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Napaka Boost.Python v opravilu "%1".</translation>
</message>
@@ -596,18 +596,18 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -919,13 +919,13 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1243,6 +1243,32 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<translation>Oblika</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1497,6 +1523,37 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Razpoložljiv prostor</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Nov razdelek</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Ime</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Datotečni sistem</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Priklopna točka</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Velikost</translation>
</message>
@@ -1963,12 +2020,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<translation>Ali ste prepričani, da želite ustvariti novo razpredelnico razdelkov na %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1976,107 +2033,107 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Zbiranje informacij o sistemu ...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Razdelki</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Potem:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2287,69 +2344,69 @@ Output:
<translation>Oblika</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2451,7 +2508,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2753,7 +2810,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2770,12 +2827,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2886,7 +2943,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2894,43 +2951,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
</message>
@@ -2938,7 +2995,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts
index 72eba9242dc4d13778802843597b25ee235253d6..75679b363b7c7c7734d07672930c1c39aacdb041 100644
--- a/lang/calamares_sq.ts
+++ b/lang/calamares_sq.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record për %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Pjesë Nisjesh</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Pjesëzim Sistemi</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Mos instalo ngarkues nisjesh</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Mjete</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Të dhëna diagnostikimi</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instaloje</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Kartela kryesore e programthit file %1 për aktin python %2 s’është e lexueshme.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Gabim Boost.Python tek akti \"%1\".</translation>
</message>
@@ -597,18 +597,18 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>S’u xhirua dot urdhri.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>Urdhri xhirohet në mjedisin strehë dhe është e nevojshme të dijë shtegun për rrënjën, por nuk ka rootMountPoint të përcaktuar.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Urdhri lypset të dijë emrin e përdoruesit, por s’ka të përcaktuar emër përdoruesi.</translation>
</message>
@@ -920,13 +920,13 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1244,6 +1244,32 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<translation>Ekrani është shumë i vogël për shfaqjen e instaluesit.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation>Identifikues Partie OEM</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation>S’u krijuan dot drejtoritë <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation>S’u hap dot kartela <code>%1</code>.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation>S’u shkrua dot te kartelë <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<translation>Formular</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>I pranoj termat dhe kushtet më sipër.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Marrëveshje Licence</h1>Kjo procedurë rregullimi do të instalojë software pronësor që është subjekt kushtesh licencimi.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Ju lutemi, shqyrtoni Marrëveshje Licencimi Për Përdorues të Thjeshtë (EULAs) më sipër.<br/>Nëse nuk pajtohemi me kushtet, procedura e rregullimit s’mund të shkojë më tej.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Marrëveshje Licence</h1>Që të furnizojë veçori shtesë dhe të përmirësojë punën e përdoruesit, kjo procedurë rregullimi mundet të instalojë software pronësor që është subjekt kushtesh licencimi.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Ju lutemi, shqyrtoni Marrëveshje Licencimi Për Përdorues të Thjeshtë (EULAs) më sipër.<br/>Nëse nuk pajtohemi me kushtet, nuk do të instalohet software pronësor, dhe në vend të tij do të përdoren alternativa nga burimi i hapët.</translation>
</message>
@@ -1498,6 +1524,37 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<translation>Përzgjedhje paketash</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation>&amp;Parti</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation><html><head/><body><p>Jepni këtu një identifikues partie. Ky do të depozitohet te sistemi i synuar.</p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation><html><head/><body><h1>Formësim OEM-i</h1><p>Calamares do të përdorë rregullime OEM ndërkohë që formëson sistemin e synuar.</p></body></html></translation>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation>Formësim OEM-i</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation>Caktoni Identifikues partie OEM si <code>%1</code>.</translation>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Hapësirë e Lirë</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Pjesë e re</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Emër</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Sistem Kartelash</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Pikë Montimi</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Madhësi</translation>
</message>
@@ -1964,12 +2021,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<translation>Jeni i sigurt se doni të krijoni një tabelë të re pjesësh në %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>S’krijohet dot pjesë e re</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>Tabela e pjesëzimit te %1 ka tashmë %2 pjesë parësore, dhe s’mund të shtohen të tjera. Ju lutemi, në vend të kësaj, hiqni një pjesë parësore dhe shtoni një pjesë të zgjeruar.</translation>
</message>
@@ -1977,107 +2034,107 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Po grumbullohen të dhëna mbi sistemin…</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Pjesë</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Instalojeni %1 <strong>në krah</strong> të një tjetër sistemi operativ.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Fshije</strong> diskun dhe instalo %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Zëvendësojeni</strong> një pjesë me %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation>Pjesëzim <strong>dorazi</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Instaloje %1 <strong>në krah</strong> të një tjetri sistemi operativ në diskun <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Fshije</strong> diskun <strong>%2</strong> (%3) dhe instalo %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Zëvendëso</strong> një pjesë te disku <strong>%2</strong> (%3) me %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>Pjesëzim <strong>dorazi</strong> në diskun <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disku <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>E tanishmja:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Më Pas:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>S’ka të formësuar pjesë sistemi EFI</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Që të niset %1, është e domosdoshme një pjesë sistemi EFI.<br/><br/>Që të formësoni një pjesë sistemi EFI, kthehuni mbrapsht dhe përzgjidhni ose krijoni një sistem kartelash FAT32 me flamurkën <strong>esp</strong> të aktivizuar dhe me pikë montimi <strong>%2</strong>.<br/><br/>Mund të vazhdoni pa rregulluar një pjesë sistemi EFI, por mundet që sistemi të mos arrijë dot të niset.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>S’është vënë flamurkë EFI pjese sistemi</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Që të niset %1, është e domosdoshme një pjesë sistemi EFI.<br/><br/>Është formësuar një pjesë me pikë montimi <strong>%2</strong>, por pa i vënë flamurkën <strong>esp</strong>.<br/>Që t’ia vini, kthehuni mbrapsht dhe përpunoni pjesë.<br/><br/>Mund të vazhdoni pa i vënë flamurkën, por mundet që sistemi të mos arrijë dot të niset.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Pjesë nisjesh e pafshehtëzuar</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Tok me pjesën e fshehtëzuar <em>root</em> qe rregulluar edhe një pjesë <em>boot</em> veçmas, por pjesa <em>boot</em> s’është e fshehtëzuar.<br/><br/>Ka preokupime mbi sigurinë e këtij lloj rregullimi, ngaqë kartela të rëndësishme sistemi mbahen në një pjesë të pafshehtëzuar.<br/>Mund të vazhdoni, nëse doni, por shkyçja e sistemit të kartelave do të ndodhë më vonë, gjatë nisjes së sistemit.<br/>Që të fshehtëzoni pjesën <em>boot</em>, kthehuni mbrapsht dhe rikrijojeni, duke përzgjedhur te skena e krijimit të pjesës <strong>Fshehtëzoje</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>ka të paktën një pajisje disku për përdorim.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>S’ka pjesë ku të instalohet.</translation>
</message>
@@ -2125,17 +2182,17 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Po ruhen kartela për më vonë ...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>S’ka kartela të formësuara për t’i ruajtur më vonë.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>S’u mbajtën dot tërë kartelat e formësuara.</translation>
</message>
@@ -2291,69 +2348,69 @@ Përfundim:
<translation>Formular</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Përzgjidhni ku të instalohet %1.<br/><font color=\"red\">Kujdes: </font>kjo do të sjellë fshirjen e krejt kartelave në pjesën e përzgjedhur.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Objekti i përzgjedhur s’duket se është pjesë e vlefshme.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 s’mund të instalohet në hapësirë të zbrazët. Ju lutemi, përzgjidhni një pjesë ekzistuese.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 s’mund të instalohet në një pjesë të llojit extended. Ju lutemi, përzgjidhni një pjesë parësore ose logjike ekzistuese.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 s’mund të instalohet në këtë pjesë.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Pjesë të dhënash (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Pjesë sistemi e panjohur (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>Pjesë sistemi %1 (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Ndarja %1 është shumë e vogël për %2. Ju lutemi, përzgjidhni një pjesë me kapacitet të paktën %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Në këtë sistem s’gjendet dot ndonjë pjesë sistemi EFI. Ju lutemi, që të rregulloni %1, kthehuni mbrapsht dhe përdorni procesin e pjesëzimit dorazi.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 do të instalohet në %2.<br/><font color=\"red\">Kujdes: </font>krejt të dhënat në pjesën %2 do të humbin.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>Për nisjen e %2 do të përdoret ndarja EFI e sistemit te %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Pjesë Sistemi EFI:</translation>
</message>
@@ -2455,7 +2512,7 @@ Përfundim:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Ripërmaso Grup Vëllimesh</translation>
</message>
@@ -2757,7 +2814,7 @@ Përfundim:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Akt Procesesh Shelli</translation>
</message>
@@ -2774,12 +2831,12 @@ Përfundim:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation>Kjo është një përmbledhje e asaj që do të ndodhë sapo të nisni procedurën e rregullimit.</translation>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Kjo është një përmbledhje e asaj që do të ndodhë sapo të nisni procedurën e instalimit.</translation>
</message>
@@ -2890,7 +2947,7 @@ Përfundim:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Përshtypje</translation>
</message>
@@ -2898,43 +2955,43 @@ Përfundim:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation><small>Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni disa llogari, pas rregullimit.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation><small>Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni disa llogari, pas instalimit.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Emri juaj i përdoruesit është shumë i gjatë.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Emri juaj i përdoruesit përmban shenja të pavlefshme. Lejohen vetëm shkronja të vogla dhe shifra.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Strehëemri juaj është shumë i shkurtër.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Strehëemri juaj është shumë i gjatë.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Strehëemri juaj përmban shenja të pavlefshme. Lejohen vetëm shkronja të vogla dhe shifra.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Fjalëkalimet tuaj s’përputhen!</translation>
</message>
@@ -2942,7 +2999,7 @@ Përfundim:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Përdorues</translation>
</message>
diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts
index 807cccdde5ebe58d165e290211d76255947ada1d..6848f5f798c0fbb2afce2cf35383d94983692f3f 100644
--- a/lang/calamares_sr.ts
+++ b/lang/calamares_sr.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Подизна партиција</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Системска партиција</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Не инсталирај подизни учитавач</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Алатке</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation type="unfinished"/>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Инсталирај</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Фајл главне скрипте %1 за питонов посао %2 није читљив.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python грешка у послу „%1“.</translation>
</message>
@@ -596,18 +596,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -919,13 +919,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1243,6 +1243,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ The installer will quit and all changes will be lost.</source>
<translation>Форма</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1497,6 +1523,37 @@ The installer will quit and all changes will be lost.</source>
<translation>Избор пакета</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Назив</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Фајл систем</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1963,12 +2020,12 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1976,107 +2033,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Тренутно:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>После:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2287,69 +2344,69 @@ Output:
<translation>Форма</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2451,7 +2508,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2753,7 +2810,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2770,12 +2827,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2886,7 +2943,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2894,43 +2951,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Ваше корисничко име је предугачко.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Име вашег "домаћина" - hostname је прекратко.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Ваше име домаћина је предуго - hostname</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Ваше име "домаћина" - hostname садржи недозвољене карактере. Могуће је користити само слова, бројеве и цртице.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Лозинке се не поклапају!</translation>
</message>
@@ -2938,7 +2995,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Корисници</translation>
</message>
diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts
index f5d6ab370983713f99ddb894adc02b395c392871..d6d6b772fd927b70c07c98d9df0a9bb3c1962b2f 100644
--- a/lang/calamares_sr@latin.ts
+++ b/lang/calamares_sr@latin.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record na %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Particija za pokretanje sistema</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Sistemska particija</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -97,7 +97,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation type="unfinished"/>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Instaliraj</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Glavna datoteka za skriptu %1 za Python funkciju %2 se ne može pročitati.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python greška u funkciji %1</translation>
</message>
@@ -596,18 +596,18 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -919,13 +919,13 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1243,6 +1243,32 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1497,6 +1523,37 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Slobodan prostor</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Nova particija</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Naziv</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Fajl sistem</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Veličina</translation>
</message>
@@ -1963,12 +2020,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1976,107 +2033,107 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Particije</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Poslije:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2287,69 +2344,69 @@ Output:
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2451,7 +2508,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2753,7 +2810,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2770,12 +2827,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2886,7 +2943,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2894,43 +2951,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Vaše lozinke se ne poklapaju</translation>
</message>
@@ -2938,7 +2995,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Korisnici</translation>
</message>
diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts
index f22d2b42a4b272d2873970ae3ddd3ff1f1b84aef..046ba7ee317328a5429e015c2590d505ce201b67 100644
--- a/lang/calamares_sv.ts
+++ b/lang/calamares_sv.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record på %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Uppstartspartition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Systempartition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Installera inte en uppstartsladdare</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Verktyg</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Avlusningsinformation</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Installera</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Huvudskriptfil %1 för pythonuppgift %2 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python-fel i uppgift "%'1".</translation>
</message>
@@ -596,18 +596,18 @@ Alla ändringar kommer att gå förlorade.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -919,13 +919,13 @@ Alla ändringar kommer att gå förlorade.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1243,6 +1243,32 @@ Alla ändringar kommer att gå förlorade.</translation>
<translation>Skärmen är för liten för att visa installationshanteraren.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ Alla ändringar kommer att gå förlorade.</translation>
<translation>Formulär</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Jag accepterar villkoren och avtalet ovan.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Licensavtal</h1>Denna installationsprocedur kommer att installera proprietär mjukvara som omfattas av licensvillkor.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Läs igenom End User Agreements (EULA:s) ovan.<br/>Om du inte accepterar villkoren kan inte installationsproceduren fortsätta.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Licensavtal</h1>Denna installationsprocedur kan installera proprietär mjukvara som omfattas av licensvillkor för att tillhandahålla ytterligare funktioner och förbättra användarupplevelsen.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1497,6 +1523,37 @@ Alla ändringar kommer att gå förlorade.</translation>
<translation>Paketval</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ Alla ändringar kommer att gå förlorade.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Ledigt utrymme</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Ny partition</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Namn</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Filsystem</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Monteringspunkt</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Storlek</translation>
</message>
@@ -1963,12 +2020,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<translation>Är du säker på att du vill skapa en ny partitionstabell på %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1976,107 +2033,107 @@ Alla ändringar kommer att gå förlorade.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Samlar systeminformation...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Partitioner</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Installera %1 <strong>bredvid</strong> ett annat operativsystem.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Rensa</strong> disken och installera %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Ersätt</strong> en partition med %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Manuell</strong> partitionering.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Installera %1 <strong>bredvid</strong> ett annat operativsystem på disken <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Rensa</strong> disken <strong>%2</strong> (%3) och installera %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Ersätt</strong> en partition på disken <strong>%2</strong> (%3) med %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>Manuell</strong> partitionering på disken <strong>%1</strong> (%2).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disk <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Nuvarande:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Efter:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Ingen EFI system partition konfigurerad</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ Alla ändringar kommer att gå förlorade.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2287,69 +2344,69 @@ Output:
<translation>Formulär</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Välj var du vill installera %1.<br/><font color="red">Varning: </font>detta kommer att radera alla filer på den valda partitionen.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Det valda alternativet verkar inte vara en giltig partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 kan inte installeras i tomt utrymme. Välj en existerande partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 kan inte installeras på en utökad partition. Välj en existerande primär eller logisk partition.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 kan inte installeras på den här partitionen.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Datapartition (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Okänd systempartition (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>Systempartition för %1 (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Partitionen %1 är för liten för %2. Välj en partition med minst storleken %3 GiB.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 kommer att installeras på %2.<br/><font color="red">Varning: </font>all data på partition %2 kommer att gå förlorad.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>EFI-systempartitionen %1 kommer att användas för att starta %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI-systempartition:</translation>
</message>
@@ -2451,7 +2508,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2753,7 +2810,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2770,12 +2827,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Detta är en överblick av vad som kommer att ske när du startar installationsprocessen.</translation>
</message>
@@ -2886,7 +2943,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2894,43 +2951,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Ditt användarnamn är för långt.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Ditt användarnamn innehåller otillåtna tecken! Endast små bokstäver och siffror tillåts.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Ditt värdnamn är för kort.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Ditt värdnamn är för långt.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Ditt värdnamn innehåller otillåtna tecken! Endast bokstäver, siffror och bindestreck tillåts.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Dina lösenord matchar inte!</translation>
</message>
@@ -2938,7 +2995,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Användare</translation>
</message>
diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts
index 5fe858ba391c72c68b5729039aacf7adac04c34e..6b02c0da9997fcb3dff4c5be545df579a6b6092b 100644
--- a/lang/calamares_th.ts
+++ b/lang/calamares_th.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Master Boot Record ของ %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>พาร์ทิชัน Boot</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>พาร์ทิชันระบบ</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>ไม่ต้องติดตั้งบูตโหลดเดอร์</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>ข้อมูลดีบั๊ก</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>ติดตั้ง</translation>
</message>
@@ -180,7 +180,7 @@
<translation>ไม่สามารถอ่านไฟล์สคริปต์หลัก %1 สำหรับ python %2 ได้</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python ผิดพลาดที่งาน "%1".</translation>
</message>
@@ -596,18 +596,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -919,13 +919,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1243,6 +1243,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ The installer will quit and all changes will be lost.</source>
<translation>แบบฟอร์ม</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1497,6 +1523,37 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1863,34 +1920,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>พื้นที่ว่าง</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>พาร์ทิชันใหม่</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>ชื่อ</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>ระบบไฟล์</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>จุดเชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>ขนาด</translation>
</message>
@@ -1963,12 +2020,12 @@ The installer will quit and all changes will be lost.</source>
<translation>คุณแน่ใจว่าจะสร้างตารางพาร์ทิชันใหม่บน %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1976,107 +2033,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>กำลังรวบรวมข้อมูลของระบบ...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>พาร์ทิชัน</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>หลัง:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2124,17 +2181,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2287,69 +2344,69 @@ Output:
<translation>ฟอร์ม</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>เลือกที่ที่จะติดตั้ง %1<br/><font color="red">คำเตือน: </font>ตัวเลือกนี้จะลบไฟล์ทั้งหมดบนพาร์ทิชันที่เลือก</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>ไอเทมที่เลือกไม่ใช่พาร์ทิชันที่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>ไม่สามารถติดตั้ง %1 บนพื้นที่ว่าง กรุณาเลือกพาร์ทิชันที่มี</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>ไม่สามารถติดตั้ง %1 บนพาร์ทิชัน extended กรุณาเลือกพาร์ทิชันหลักหรือพาร์ทิชันโลจิคัลที่มีอยู่ </translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>ไม่สามารถติดตั้ง %1 บนพาร์ทิชันนี้</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>พาร์ทิชันข้อมูล (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>พาร์ทิชันระบบที่ไม่รู้จัก (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 พาร์ทิชันระบบ (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>พาร์ทิชันสำหรับระบบ EFI ที่ %1 จะถูกใช้เพื่อเริ่มต้น %2</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>พาร์ทิชันสำหรับระบบ EFI:</translation>
</message>
@@ -2451,7 +2508,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2753,7 +2810,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2770,12 +2827,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2886,7 +2943,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2894,43 +2951,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>ชื่อผู้ใช้ของคุณยาวเกินไป</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>ชื่อผู้ใช้ของคุณมีตัวอักษรที่ไม่ถูกต้อง ใช้ได้เฉพาะตัวอักษรภาษาอังกฤษตัวเล็กและตัวเลขเท่านั้น</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>ชื่อโฮสต์ของคุณสั้นเกินไป</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>ชื่อโฮสต์ของคุณยาวเกินไป</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>ชื่อโฮสต์ของคุณมีตัวอักษรที่ไม่ถูกต้อง ใช้ได้เฉพาะตัวอักษรภาษาอังกฤษ ตัวเลข และขีดกลาง "-" เท่านั้น</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>รหัสผ่านของคุณไม่ตรงกัน!</translation>
</message>
@@ -2938,7 +2995,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>ผู้ใช้</translation>
</message>
diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts
index 48907a0ee9e81d30a983699d33453ee684a70a25..06e0c8dcea349e5e1772803f35f70f5757a2285a 100644
--- a/lang/calamares_tr_TR.ts
+++ b/lang/calamares_tr_TR.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>%1 Üzerine Önyükleyici Kur</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Önyükleyici Disk Bölümü</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Sistem Disk Bölümü</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Bir önyükleyici kurmayın</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Araçlar</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Hata ayıklama bilgisi</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Sistem Kuruluyor</translation>
</message>
@@ -180,7 +180,7 @@
<translation>%2 python işleri için %1 sorunlu betik okunamadı.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Boost.Python iş hatası "%1".</translation>
</message>
@@ -598,18 +598,18 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.</translation>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>Komut çalıştırılamadı.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>Komut, ana bilgisayar ortamında çalışır ve kök yolunu bilmesi gerekir, ancak kökMontajNoktası tanımlanmamıştır.</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>Komutun kullanıcının adını bilmesi gerekir, ancak kullanıcı adı tanımlanmamıştır.</translation>
</message>
@@ -921,13 +921,13 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.</translation>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1246,6 +1246,32 @@ Sistem güç kaynağına bağlı değil.</translation>
<translation>Ekran, sistem yükleyiciyi görüntülemek için çok küçük.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation>OEM Toplu Tanımlayıcı</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation><code>%1</code> dizinleri oluşturulamadı.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation><code>%1</code> dosyası açılamadı.</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation><code>%1</code> dosyasına yazılamadı.</translation>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1324,27 +1350,27 @@ Sistem güç kaynağına bağlı değil.</translation>
<translation>Form</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Yukarıdaki şartları ve koşulları kabul ediyorum.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Lisans Anlaşması</h1> Sistem yükleyici uygulaması belli lisans şartlarına bağlıdır ve şimdi sisteminizi kuracaktır.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Yukarıdaki son kullanıcı lisans sözleşmesini (EULA) gözden geçiriniz.<br/>Şartları kabul etmiyorsanız kurulum devam etmeyecektir.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Lisans Sözleşmesi</h1>Bu kurulum işlemi kullanıcı deneyimini ölçümlemek, ek özellikler sağlamak ve geliştirmek amacıyla lisansa tabi özel yazılım yükleyebilir.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Yukarıdaki Son Kullanıcı Lisans Sözleşmelerini (EULA) gözden geçirin.<br/>Eğer şartları kabul etmiyorsanız kapalı kaynak yazılımların yerine açık kaynak alternatifleri yüklenecektir.</translation>
</message>
@@ -1500,6 +1526,37 @@ Sistem güç kaynağına bağlı değil.</translation>
<translation>Paket seçimi</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation>Top&lu:</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation><html><head/><body><p>Buraya toplu tanımlayıcı girin. Bu hedef sistemde depolanır.</p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation><html><head/><body><h1>OEM Yapılandırma</h1><p>Calamares hedef sistemi yapılandırırken OEM ayarlarını kullanacaktır.</p></body></html></translation>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation>OEM Yapılandırma</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation>OEM Toplu Tanımlayıcıyı <code>%1</code>'e Ayarlayın.</translation>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1866,34 +1923,34 @@ Sistem güç kaynağına bağlı değil.</translation>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Boş Alan</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Yeni bölüm</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>İsim</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Dosya Sistemi</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Bağlama Noktası</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Boyut</translation>
</message>
@@ -1966,12 +2023,12 @@ Sistem güç kaynağına bağlı değil.</translation>
<translation>%1 tablosunda yeni bölüm oluşturmaya devam etmek istiyor musunuz?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>Yeni disk bölümü oluşturulamıyor</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>%1 üzerindeki disk bölümü tablosu zaten %2 birincil disk bölümüne sahip ve artık eklenemiyor. Lütfen bir birincil disk bölümü kaldırın ve bunun yerine uzatılmış bir disk bölümü ekleyin.</translation>
</message>
@@ -1979,108 +2036,108 @@ Sistem güç kaynağına bağlı değil.</translation>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Sistem bilgileri toplanıyor...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Disk Bölümleme</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Diğer işletim sisteminin <strong>yanına</strong> %1 yükle.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation>Diski <strong>sil</strong> ve %1 yükle.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation>%1 ile disk bölümünün üzerine <strong>yaz</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>Manuel</strong> bölümleme.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation><strong>%2</strong> (%3) diskindeki diğer işletim sisteminin <strong>yanına</strong> %1 yükle.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>%2</strong> (%3) diski <strong>sil</strong> ve %1 yükle.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>%2</strong> (%3) disk bölümünün %1 ile <strong>üzerine yaz</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation><strong>%1</strong> (%2) disk bölümünü <strong>manuel</strong> bölümle.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Disk <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Geçerli:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Sonra:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>EFI sistem bölümü yapılandırılmamış</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>%1 başlatmak için bir EFI sistem bölümü gereklidir.<br/><br/>EFI sistem bölümünü yapılandırmak için geri dönün ve seçim yapın veya FAT32 dosya sistemi ile <strong>esp</strong> etiketiyle <strong>%2</strong> noktasına bağlayın.<br/><br/>Bir EFI sistem bölümü kurmadan devam edebilirsiniz fakat işletim sistemi başlatılamayabilir.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>EFI sistem bölümü bayrağı ayarlanmadı</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>%1 başlatmak için bir EFI sistem bölümü gereklidir.<br/><br/>Bir bağlama noktası <strong>%2</strong> olarak yapılandırıldı fakat <strong>esp</strong>bayrağı ayarlanmadı.<br/>Bayrağı ayarlamak için, geri dönün ve bölümü düzenleyin.<br/><br/>Sen bayrağı ayarlamadan devam edebilirsin fakat işletim sistemi başlatılamayabilir.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Önyükleme yani boot diski şifrelenmedi</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Ayrı bir önyükleme yani boot disk bölümü, şifrenmiş bir kök bölüm ile birlikte ayarlandı, fakat önyükleme bölümü şifrelenmedi.<br/><br/>Bu tip kurulumun güvenlik endişeleri vardır, çünkü önemli sistem dosyaları şifrelenmemiş bir bölümde saklanır.<br/>İsterseniz kuruluma devam edebilirsiniz, fakat dosya sistemi kilidi daha sonra sistem başlatılırken açılacak.<br/>
Önyükleme bölümünü şifrelemek için geri dönün ve bölüm oluşturma penceresinde <strong>Şifreleme</strong>seçeneği ile yeniden oluşturun.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>Mevcut en az bir disk aygıtı var.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>Yüklenecek disk bölümü yok.</translation>
</message>
@@ -2128,17 +2185,17 @@ Sistem güç kaynağına bağlı değil.</translation>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Dosyalar daha sonrası için kaydediliyor ...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>Daha sonra kaydetmek için dosya yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>Yapılandırılmış dosyaların tümü korunamadı.</translation>
</message>
@@ -2294,69 +2351,69 @@ Output:
<translation>Biçim</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>%1 kurulacak diski seçin.<br/><font color="red">Uyarı: </font>Bu işlem seçili disk üzerindeki tüm dosyaları silecek.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Seçili nesne, geçerli bir disk bölümü olarak görünmüyor.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 tanımlanmamış boş bir alana kurulamaz. Lütfen geçerli bir disk bölümü seçin.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 uzatılmış bir disk bölümüne kurulamaz. Geçerli bir, birincil disk ya da mantıksal disk bölümü seçiniz.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 bu disk bölümüne yüklenemedi.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Veri diski (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Bilinmeyen sistem bölümü (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 sistem bölümü (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>disk bölümü %2 için %1 daha küçük. Lütfen, en az %3 GB kapasiteli bir disk bölümü seçiniz.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Bu sistemde EFI disk bölümü bulamadı. Lütfen geri dönün ve %1 kurmak için gelişmiş kurulum seçeneğini kullanın.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%2 üzerine %1 kuracak.<br/><font color="red">Uyarı: </font>%2 diskindeki tüm veriler kaybedilecek.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>%1 EFI sistem bölümü %2 başlatmak için kullanılacaktır.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI sistem bölümü:</translation>
</message>
@@ -2458,7 +2515,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>Birim Grubunu Yeniden Boyutlandır</translation>
</message>
@@ -2762,7 +2819,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Kabuk İşlemleri İşi</translation>
</message>
@@ -2779,12 +2836,12 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation>Bu, kurulum prosedürü başlatıldıktan sonra ne gibi değişiklikler dair olacağına genel bir bakış.</translation>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Yükleme işlemleri başladıktan sonra yapılacak işlere genel bir bakış.</translation>
</message>
@@ -2895,7 +2952,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>Geribildirim</translation>
</message>
@@ -2903,43 +2960,43 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation><small>Bu bilgisayarı birden fazla kişi kullanacaksa, kurulumdan sonra birden fazla kullanıcı hesabı oluşturabilirsiniz.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation><small>Bu bilgisayarı birden fazla kişi kullanacaksa, yükleme bittikten sonra birden fazla kullanıcı hesabı oluşturabilirsiniz.</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Kullanıcı adınız çok uzun.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Kullanıcı adınız geçersiz karakterler içeriyor. Sadece küçük harfleri ve sayıları kullanabilirsiniz.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Makine adınız çok kısa.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Makine adınız çok uzun.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Makine adınız geçersiz karakterler içeriyor. Sadece küçük harfleri ve sayıları ve tire işaretini kullanabilirsiniz.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Parolanız eşleşmiyor!</translation>
</message>
@@ -2947,7 +3004,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Kullanıcı Tercihleri</translation>
</message>
diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts
index 034baf1babbffe01bc4c84a0a4ee3ab26e9dbc68..5ced55f8f19b6eb8ebdc012f914ee72855e87383 100644
--- a/lang/calamares_uk.ts
+++ b/lang/calamares_uk.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>Головний Завантажувальний Запис (Master Boot Record) %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>Розділ Boot</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>Системний розділ</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>Не встановлювати завантажувач</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>Інструменти</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>Відлагоджувальна інформація</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>Встановити</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Неможливо прочитати файл головного сценарію %1 для завдання python %2.</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>Помилка Boost.Python у завданні "%1".</translation>
</message>
@@ -596,18 +596,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -919,13 +919,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1243,6 +1243,32 @@ The installer will quit and all changes will be lost.</source>
<translation>Екран замалий для відображення установника.</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1321,27 +1347,27 @@ The installer will quit and all changes will be lost.</source>
<translation>Форма</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>Я приймаю положення та умови, що наведені вище.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>Ліцензійна угода</h1>Процедура встановить пропрієтарне програмне забезпечення, яке підлягає умовам ліцензування.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>Будь-ласка, перегляньте Ліцензійні Угоди Кінцевого Користувача (EULAs), що наведені вище.<br/>Якщо ви не згодні з умовами, процедуру встановлення не можна продовжити.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>Ліцензійна угода</h1>Для надання додаткових можливостей та з метою покращення користувацького досвіду, процедура може встановити пропрієтарне програмне забезпечення, яке підлягає умовам ліцензування.</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>Будь-ласка, перегляньте Ліцензійні Угоди Кінцевого Користувача (EULAs), що наведені вище.<br/>Якщо ви не згодні з умовами, пропрієтарне програмне забезпечення не буде встановлено, та замість нього буде використано альтернативи з відкритим сирцевим кодом.</translation>
</message>
@@ -1497,6 +1523,37 @@ The installer will quit and all changes will be lost.</source>
<translation>Вибір пакетів</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>Вільний простір</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>Новий розділ</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>Ім'я</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>Файлова система</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>Точка підключення</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>Розмір</translation>
</message>
@@ -1964,12 +2021,12 @@ The installer will quit and all changes will be lost.</source>
<translation>Ви впевнені, що бажаєте створити нову таблицю розділів на %1?</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1977,107 +2034,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>Збір інформації про систему...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>Розділи</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>Встановити %1 <strong>поруч</strong> з іншою операційною системою.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>Очистити</strong> диск та встановити %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation><strong>Замінити</strong> розділ на %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation>Розподілення диску <strong>власноруч</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>Встановити %1 <strong>поруч</strong> з іншою операційною системою на диск <strong>%2</strong> (%3).</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>Очистити</strong> диск <strong>%2</strong> (%3) та встановити %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation><strong>Замінити</strong> розділ на диску <strong>%2</strong> (%3) на %1.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>Розподілення диску <strong>%1</strong> (%2) <strong>власноруч</strong>.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>Диск <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>Зараз:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>Після:</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>Не налаштовано жодного системного розділу EFI</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>Щоб запустити %1, потрібен системний розділ EFI.<br/><br/>Щоб налаштувати системний розділ EFI, поверніться та оберіть або створіть файлову систему FAT32 з увімкненною опцією <strong>esp</strong> та точкою підключення <strong>%2</strong>.<br/><br/>Ви можете продовжити не налаштовуючи системний розділ EFI, але ваша система може не запускатись.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>Опцію системного розділу EFI не встановлено</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>Для запуску %1 потрібен системний розділ EFI.<br/><br/>Розділ налаштовано з точкою підключення <strong>%2</strong>, але опція <strong>esp</strong> не встановлено.<br/>Щоб встановити опцію, поверніться та відредагуйте розділ.<br/><br/>Ви можете продовжити не налаштовуючи цю опцію, але ваша система може не запускатись.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>Завантажувальний розділ незашифрований</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>Було налаштовано окремий завантажувальний розділ поряд із зашифрованим кореневим розділом, але завантажувальний розділ незашифрований.<br/><br/>Існують проблеми з безпекою такого типу, оскільки важливі системні файли зберігаються на незашифрованому розділі.<br/>Ви можете продовжувати, якщо бажаєте, але розблокування файлової системи відбудеться пізніше під час запуску системи.<br/>Щоб зашифрувати завантажувальний розділ, поверніться і створіть його знов, обравши <strong>Зашифрувати</strong> у вікні створення розділів.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2125,17 +2182,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>Збереження файлів на потім ...</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2288,69 +2345,69 @@ Output:
<translation>Форма</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>Оберіть, куди встановити %1.<br/><font color="red">Увага: </font>це знищить всі файли на обраному розділі.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>Вибраний елемент не є дійсним розділом.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 не можна встановити на порожній простір. Будь ласка, оберіть дійсний розділ.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 не можна встановити на розширений розділ. Будь ласка, оберіть дійсний первинний фбо логічний розділ.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 не можна встановити на цей розділ.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>Розділ з даними (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>Невідомий системний розділ (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>Системний розділ %1 (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>Розділ %1 замалий для %2. Будь ласка оберіть розділ розміром хоча б %3 Гб.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>Системний розділ EFI у цій системі не знайдено. Для встановлення %1, будь ласка, поверніться назад і скористайтеся розподіленням вручну.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 буде встановлено на %2.<br/><font color="red">Увага: </font>всі дані на розділі %2 буде загублено.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>Системний розділ EFI на %1 буде використано для запуску %2.</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>Системний розділ EFI:</translation>
</message>
@@ -2452,7 +2509,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2754,7 +2811,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2771,12 +2828,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>Це огляд того, що трапиться коли ви почнете процедуру встановлення.</translation>
</message>
@@ -2887,7 +2944,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2895,43 +2952,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>Ваше ім'я задовге.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>Ваше ім'я містить неприпустимі символи. Дозволені тільки малі літери та цифри.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>Ім'я машини занадто коротке.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>Ім'я машини задовге.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>Ім'я машини містить неприпустимі символи. Дозволені тільки літери, цифри та дефіс.</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>Паролі не збігаються!</translation>
</message>
@@ -2939,7 +2996,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>Користувачі</translation>
</message>
diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts
index 5d8265f31f0df0a691f5a62e083c177dd5e50926..163c54a3dcbb3085ab22026dbd80d59ff0742414 100644
--- a/lang/calamares_ur.ts
+++ b/lang/calamares_ur.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -97,7 +97,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation type="unfinished"/>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation type="unfinished"/>
</message>
@@ -180,7 +180,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation type="unfinished"/>
</message>
@@ -595,18 +595,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -918,13 +918,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1242,6 +1242,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1320,27 +1346,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1496,6 +1522,37 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1862,34 +1919,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1962,12 +2019,12 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1975,107 +2032,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2123,17 +2180,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2286,69 +2343,69 @@ Output:
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2450,7 +2507,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2752,7 +2809,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2769,12 +2826,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2885,7 +2942,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2893,43 +2950,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
</message>
@@ -2937,7 +2994,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts
index 269721206013832b4e225d9ba1ec54982867850e..df44284b6bc7c5feb2038000af33cfa13de8bf29 100644
--- a/lang/calamares_uz.ts
+++ b/lang/calamares_uz.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -97,7 +97,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation type="unfinished"/>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation type="unfinished"/>
</message>
@@ -180,7 +180,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation type="unfinished"/>
</message>
@@ -595,18 +595,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation type="unfinished"/>
</message>
@@ -918,13 +918,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1242,6 +1242,32 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1320,27 +1346,27 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1496,6 +1522,37 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1862,34 +1919,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation type="unfinished"/>
</message>
@@ -1962,12 +2019,12 @@ The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
@@ -1975,107 +2032,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2123,17 +2180,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/>
</message>
@@ -2286,69 +2343,69 @@ Output:
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation type="unfinished"/>
</message>
@@ -2450,7 +2507,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2752,7 +2809,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation type="unfinished"/>
</message>
@@ -2769,12 +2826,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation type="unfinished"/>
</message>
@@ -2885,7 +2942,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation type="unfinished"/>
</message>
@@ -2893,43 +2950,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
</message>
@@ -2937,7 +2994,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation type="unfinished"/>
</message>
diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts
index bb13bb0ee688c534f0ca9c522e3feb170b305b7d..192957da092c6947a5257c13c83ac140edbd2083 100644
--- a/lang/calamares_zh_CN.ts
+++ b/lang/calamares_zh_CN.ts
@@ -21,27 +21,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>主引导记录 %1</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>引导分区</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>系统分区</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>不要安装引导程序</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -98,7 +98,7 @@
<translation>工具</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>调试信息</translation>
</message>
@@ -106,7 +106,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>安装</translation>
</message>
@@ -181,7 +181,7 @@
<translation>用于 python 任务 %2 的主脚本文件 %1 不可读。</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>任务“%1”出现 Boost.Python 错误。</translation>
</message>
@@ -597,18 +597,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>无法运行命令</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>该命令在主机环境中运行，且需要知道根路径，但没有定义root挂载点。</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>命令行需要知道用户的名字，但用户名没有被设置</translation>
</message>
@@ -921,13 +921,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation type="unfinished"/>
@@ -1245,6 +1245,32 @@ The installer will quit and all changes will be lost.</source>
<translation>屏幕不能完整显示安装器。</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1323,27 +1349,27 @@ The installer will quit and all changes will be lost.</source>
<translation>表单</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>我同意如上条款。</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>许可协定</h1>此安装程序将会安装受授权条款所限制的专有软件。</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>请仔细上方的最终用户许可协定 (EULA)。<br/>若您不同意上述条款，安装程序将不会继续。</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>许可协定</h1>此安装程序可以安装受授权条款限制的专有软件，以提供额外的功能并增强用户体验。</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>请仔细上方的最终用户许可协定 (EULA)。<br/>若您不同意上述条款，将不会安装专有软件，而会使用其开源替代品。</translation>
</message>
@@ -1499,6 +1525,37 @@ The installer will quit and all changes will be lost.</source>
<translation>软件包选择</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1865,34 +1922,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>空闲空间</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>新建分区</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>名称</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>文件系统</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>挂载点</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>大小</translation>
</message>
@@ -1965,12 +2022,12 @@ The installer will quit and all changes will be lost.</source>
<translation>您是否确定要在 %1 上创建新分区表？</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>无法创建新分区</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>％1上的分区表已经有％2个主分区，并且不能再添加。请删除一个主分区并添加扩展分区。</translation>
</message>
@@ -1978,107 +2035,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>正在收集系统信息...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>分区</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>将 %1 安装在其他操作系统<strong>旁边</strong>。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>抹除</strong>磁盘并安装 %1。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation>以 %1 <strong>替代</strong>一个分区。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>手动</strong>分区</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>将 %1 安装在磁盘 <strong>%2</strong> (%3) 上的另一个操作系统<strong>旁边</strong>。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>抹除</strong> 磁盘 <strong>%2</strong> (%3) 并且安装 %1。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation>以 %1 <strong>替代</strong> 一个在磁盘 <strong>%2</strong> (%3) 上的分区。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>在磁盘 <strong>%1</strong> (%2) 上<strong>手动</strong>分区。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>磁盘 <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>当前：</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>之后：</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>未配置 EFI 系统分区</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>必须有 EFI 系统分区才能启动 %1 。<br/><br/>要配置 EFI 系统分区，后退一步，然后创建或选中一个 FAT32 分区并为之设置 <strong>esp</strong> 标记及挂载点 <strong>%2</strong>。<br/><br/>你可以不创建 EFI 系统分区并继续安装，但是你的系统可能无法启动。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>未设置 EFI 系统分区标记</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>必须有 EFI 系统分区才能启动 %1 。<br/><br/>已有挂载点为 <strong>%2</strong> 的分区，但是未设置 <strong>esp</strong> 标记。<br/>要设置此标记，后退并编辑分区。<br/><br/>你可以不创建 EFI 系统分区并继续安装，但是你的系统可能无法启动。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>引导分区未加密</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>您尝试用单独的引导分区配合已加密的根分区使用，但引导分区未加密。<br/><br/>这种配置方式可能存在安全隐患，因为重要的系统文件存储在了未加密的分区上。<br/>您可以继续保持此配置，但是系统解密将在系统启动时而不是引导时进行。<br/>要加密引导分区，请返回上一步并重新创建此分区，并在分区创建窗口选中 <strong>加密</strong> 选项。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation type="unfinished"/>
</message>
@@ -2126,17 +2183,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>保存文件以供日后使用</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>没有已保存且供日后使用的配置文件。</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>并不是所有配置文件都可以被保留</translation>
</message>
@@ -2292,69 +2349,69 @@ Output:
<translation>表单</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation><b>选择要安装 %1 的地方。</b><br/><font color="red">警告：</font>这将会删除所有已选取的分区上的文件。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>选中项似乎不是有效分区。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>无法在空白空间中安装 %1。请选取一个存在的分区。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>无法在拓展分区上安装 %1。请选取一个存在的主要或逻辑分区。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>无法安装 %1 到此分区。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>数据分区 (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>未知系统分区 (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 系统分区 (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>分区 %1 对 %2 来说太小了。请选取一个容量至少有 %3 GiB 的分区。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>在此系统上找不到任何 EFI 系统分区。请后退到上一步并使用手动分区配置 %1。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>即将安装 %1 到 %2 上。<br/><font color="red">警告： </font>分区 %2 上的所有数据都将丢失。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>将使用 %1 处的 EFI 系统分区启动 %2。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI 系统分区：</translation>
</message>
@@ -2456,7 +2513,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation type="unfinished"/>
</message>
@@ -2758,7 +2815,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>Shell 进程任务</translation>
</message>
@@ -2775,12 +2832,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>这是您开始安装后所会发生的事情的概览。</translation>
</message>
@@ -2891,7 +2948,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>反馈</translation>
</message>
@@ -2899,43 +2956,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>用户名太长。</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>您的用户名含有无效的字符。只能使用小写字母和数字。</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>主机名太短。</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>主机名太长。</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>您的主机名称含有无效的字符。只能使用字母、数字和短横。</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>密码不匹配！</translation>
</message>
@@ -2943,7 +3000,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>用户</translation>
</message>
diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts
index 609eb9121b50a1d083cd375af2e3973147d94ee6..fa0d54f2cd17afda6b55657b14a4ab2173dad265 100644
--- a/lang/calamares_zh_TW.ts
+++ b/lang/calamares_zh_TW.ts
@@ -20,27 +20,27 @@
<context>
<name>BootLoaderModel</name>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="66"/>
<source>Master Boot Record of %1</source>
<translation>%1 的主要開機紀錄 (MBR)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="78"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="95"/>
<source>Boot Partition</source>
<translation>開機磁區</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="83"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="100"/>
<source>System Partition</source>
<translation>系統磁區</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="113"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="130"/>
<source>Do not install a boot loader</source>
<translation>無法安裝開機載入器</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="131"/>
+ <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -97,7 +97,7 @@
<translation>工具</translation>
</message>
<message>
- <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+ <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="189"/>
<source>Debug information</source>
<translation>除錯資訊</translation>
</message>
@@ -105,7 +105,7 @@
<context>
<name>Calamares::ExecutionViewStep</name>
<message>
- <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+ <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="81"/>
<source>Install</source>
<translation>安裝</translation>
</message>
@@ -180,7 +180,7 @@
<translation>Python 行程 %2 的主要腳本檔 %1 無法讀取。</translation>
</message>
<message>
- <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
+ <location filename="../src/libcalamares/PythonJob.cpp" line="377"/>
<source>Boost.Python error in job "%1".</source>
<translation>行程 %1 中 Boost.Python 錯誤。</translation>
</message>
@@ -597,18 +597,18 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CommandList</name>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
<source>Could not run command.</source>
<translation>無法執行指令。</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="129"/>
<source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
<translation>指令執行於主機環境中，且需要知道根路徑，但根掛載點未定義。</translation>
</message>
<message>
- <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
+ <location filename="../src/libcalamares/utils/CommandList.cpp" line="140"/>
<source>The command needs to know the user's name, but no username is defined.</source>
<translation>指令需要知道使用者名稱，但是使用者名稱未定義。</translation>
</message>
@@ -920,13 +920,13 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>DeviceModel</name>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="85"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="92"/>
<source>%1 - %2 (%3)</source>
<extracomment>device[name] - size[number] (device-node[name])</extracomment>
<translation>%1 - %2 (%3)</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/DeviceModel.cpp" line="96"/>
+ <location filename="../src/modules/partition/core/DeviceModel.cpp" line="103"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
<translation>%1 - (%2)</translation>
@@ -1244,6 +1244,32 @@ The installer will quit and all changes will be lost.</source>
<translation>螢幕太小了，沒辦法顯示安裝程式。</translation>
</message>
</context>
+<context>
+ <name>IDJob</name>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="38"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="47"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="67"/>
+ <source>OEM Batch Identifier</source>
+ <translation>OEM 批次識別記號</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="48"/>
+ <source>Could not create directories <code>%1</code>.</source>
+ <translation>無法建立目錄 <code>%1</code>。</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+ <source>Could not open file <code>%1</code>.</source>
+ <translation>無法開啟檔案 <code>%1</code>。</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/IDJob.cpp" line="68"/>
+ <source>Could not write to file <code>%1</code>.</source>
+ <translation>無法寫入至檔案 <code>%1</code>。</translation>
+ </message>
+</context>
<context>
<name>InteractiveTerminalPage</name>
<message>
@@ -1322,27 +1348,27 @@ The installer will quit and all changes will be lost.</source>
<translation>表單</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="122"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="123"/>
<source>I accept the terms and conditions above.</source>
<translation>我接受上述的條款與條件。</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
<source><h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation><h1>授權協定</h1>此安裝程式將會安裝受授權條款所限制的專有軟體。</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="148"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="149"/>
<source>Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation>請仔細上方的最終用戶授權協定 (EULA)。<br/>若您不同意上述條款，安裝程式將不會繼續。</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="154"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source><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.</source>
<translation><h1>授權協定</h1>此安裝程式可以安裝受授權條款限制的專有軟體，以提供額外的功農與增強使用者體驗。</translation>
</message>
<message>
- <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
+ <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
<source>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.</source>
<translation>請仔細上方的最終用戶授權協定 (EULA)。<br/>若您不同意上述條款，將不會安裝專有軟體，而會使用其開放原始螞碼版本作為替代。</translation>
</message>
@@ -1498,6 +1524,37 @@ The installer will quit and all changes will be lost.</source>
<translation>軟體包選擇</translation>
</message>
</context>
+<context>
+ <name>OEMPage</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="28"/>
+ <source>Ba&tch:</source>
+ <translation>批次：(&T)</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
+ <source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
+ <translation><html><head/><body><p>在此輸入批次識別記號。這將會儲存在目標系統中。</p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
+ <source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
+ <translation><html><head/><body><h1>OEM 設定</h1><p>在設定目標系統時，Calamares 將會使用 OEM 設定。</p></body></html></translation>
+ </message>
+</context>
+<context>
+ <name>OEMViewStep</name>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="115"/>
+ <source>OEM Configuration</source>
+ <translation>OEM 設定</translation>
+ </message>
+ <message>
+ <location filename="../src/modules/oemid/OEMViewStep.cpp" line="120"/>
+ <source>Set the OEM Batch Identifier to <code>%1</code>.</source>
+ <translation>設定 OEM 批次識別符號為 <code>%1</code>。</translation>
+ </message>
+</context>
<context>
<name>PWQ</name>
<message>
@@ -1864,34 +1921,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionModel</name>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="144"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="176"/>
<source>Free Space</source>
<translation>剩餘空間</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="148"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="180"/>
<source>New partition</source>
<translation>新分割區</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
<source>Name</source>
<translation>名稱</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="266"/>
<source>File System</source>
<translation>檔案系統</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="268"/>
<source>Mount Point</source>
<translation>掛載點</translation>
</message>
<message>
- <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+ <location filename="../src/modules/partition/core/PartitionModel.cpp" line="270"/>
<source>Size</source>
<translation>大小</translation>
</message>
@@ -1964,12 +2021,12 @@ The installer will quit and all changes will be lost.</source>
<translation>您是否確定要在 %1 上建立一個新的分割區表格？</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="233"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="238"/>
<source>Can not create new partition</source>
<translation>無法建立新分割區</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="234"/>
+ <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="239"/>
<source>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.</source>
<translation>在 %1 上的分割表已有 %2 個主要分割區，無法再新增。請移除一個主要分割區並新增一個延伸分割區。</translation>
</message>
@@ -1977,107 +2034,107 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PartitionViewStep</name>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="76"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="77"/>
<source>Gathering system information...</source>
<translation>蒐集系統資訊中...</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="127"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="129"/>
<source>Partitions</source>
<translation>分割區</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="164"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
<source>Install %1 <strong>alongside</strong> another operating system.</source>
<translation>將 %1 安裝在其他作業系統<strong>旁邊</strong>。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
<source><strong>Erase</strong> disk and install %1.</source>
<translation><strong>抹除</strong>磁碟並安裝 %1。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
<source><strong>Replace</strong> a partition with %1.</source>
<translation>以 %1 <strong>取代</strong>一個分割區。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="177"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="179"/>
<source><strong>Manual</strong> partitioning.</source>
<translation><strong>手動</strong>分割</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="190"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="192"/>
<source>Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).</source>
<translation>將 %1 安裝在磁碟 <strong>%2</strong> (%3) 上的另一個作業系統<strong>旁邊</strong>。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="196"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="198"/>
<source><strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.</source>
<translation><strong>抹除</strong> 磁碟 <strong>%2</strong> (%3) 並且安裝 %1。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="202"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
<source><strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.</source>
<translation>以 %1 <strong>取代</strong> 一個在磁碟 <strong>%2</strong> (%3) 上的分割區。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="209"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
<source><strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).</source>
<translation>在磁碟 <strong>%1</strong> (%2) 上<strong>手動</strong>分割。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="217"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="219"/>
<source>Disk <strong>%1</strong> (%2)</source>
<translation>磁碟 <strong>%1</strong> (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="245"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="247"/>
<source>Current:</source>
<translation>目前：</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="264"/>
<source>After:</source>
<translation>之後：</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="392"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
<source>No EFI system partition configured</source>
<translation>未設定 EFI 系統分割區</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="393"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
<source>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.</source>
<translation>需要一個 EFI 系統分割區以啟動 %1。<br/><br/>要設定 EFI 系統分割區，回到上一步並選取或建立一個包含啟用的 <strong>esp</strong> 旗標以及掛載點 <strong>%2</strong> 的 FAT32 檔案系統。<br/><br/>您也可以不設定 EFI 系統分割區並繼續，但是您的系統可能會啟動失敗。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="406"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="420"/>
<source>EFI system partition flag not set</source>
<translation>EFI 系統分割區旗標未設定</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="407"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="421"/>
<source>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.</source>
<translation>需要一個 EFI 系統分割區以啟動 %1。<br/><br/>有一個掛載點設定為 <strong>%2</strong> 但未設定 <strong>esp</strong> 旗標的分割區。<br/>要設定此旗標，回到上一步並編輯分割區。<br/><br/>您也可以不設定旗標而繼續，但您的系統可能會啟動失敗。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="456"/>
<source>Boot partition not encrypted</source>
<translation>開機分割區未加密</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="443"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="457"/>
<source>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.</source>
<translation>單獨的開機分割區會與加密的根分割區一起設定，但是開機分割區並不會被加密。<br/><br/>這種設定可能會造成安全性問題，因為系統檔案放在未加密的分割區中。<br/>若您想要，您可以繼續，但是檔案系統的解鎖會在系統啟動後才發生。<br/>要加密開機分割區，回到上一頁並重新建立它，在分割區建立視窗中選取<strong>加密</strong>。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="624"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="638"/>
<source>has at least one disk device available.</source>
<translation>有至少一個可用的磁碟裝置。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="625"/>
+ <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="639"/>
<source>There are no partitons to install on.</source>
<translation>沒有要安裝的分割區。</translation>
</message>
@@ -2125,17 +2182,17 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>PreserveFiles</name>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="84"/>
<source>Saving files for later ...</source>
<translation>稍後儲存檔案……</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="122"/>
<source>No files configured to save for later.</source>
<translation>沒有檔案被設定為稍後儲存。</translation>
</message>
<message>
- <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+ <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source>
<translation>並非所有已設定的檔案都可以被保留。</translation>
</message>
@@ -2291,69 +2348,69 @@ Output:
<translation>表單</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="135"/>
<source>Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.</source>
<translation>選取要在哪裡安裝 %1。<br/><font color="red">警告：</font>這將會刪除所有在選定分割區中的檔案。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="161"/>
<source>The selected item does not appear to be a valid partition.</source>
<translation>選定的項目似乎不是一個有效的分割區。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="169"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
<translation>%1 無法在空白的空間中安裝。請選取一個存在的分割區。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="179"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
<translation>%1 無法在延伸分割區上安裝。請選取一個存在的主要或邏輯分割區。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="189"/>
<source>%1 cannot be installed on this partition.</source>
<translation>%1 無法在此分割區上安裝。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="195"/>
<source>Data partition (%1)</source>
<translation>資料分割區 (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="212"/>
<source>Unknown system partition (%1)</source>
<translation>未知的系統分割區 (%1)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="217"/>
<source>%1 system partition (%2)</source>
<translation>%1 系統分割區 (%2)</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="228"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
<translation><strong>%4</strong><br/><br/>分割區 %1 對 %2 來說太小了。請選取一個容量至少有 %3 GiB 的分割區。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation><strong>%2</strong><br/><br/>在這個系統上找不到任何的 EFI 系統分割區。請回到上一步並使用手動分割以設定 %1。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="262"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="279"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="303"/>
<source><strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.</source>
<translation><strong>%3</strong><br/><br/>%1 將會安裝在 %2 上。<br/><font color="red">警告： </font>所有在分割區 %2 上的資料都將會遺失。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="271"/>
<source>The EFI system partition at %1 will be used for starting %2.</source>
<translation>在 %1 的 EFI 系統分割區將會在開始 %2 時使用。</translation>
</message>
<message>
- <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="286"/>
+ <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="287"/>
<source>EFI system partition:</source>
<translation>EFI 系統分割區：</translation>
</message>
@@ -2455,7 +2512,7 @@ Output:
<context>
<name>ResizeVolumeGroupDialog</name>
<message>
- <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="38"/>
+ <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="39"/>
<source>Resize Volume Group</source>
<translation>調整卷冊群組大小</translation>
</message>
@@ -2757,7 +2814,7 @@ Output:
<context>
<name>ShellProcessJob</name>
<message>
- <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+ <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="50"/>
<source>Shell Processes Job</source>
<translation>殼層處理程序工作</translation>
</message>
@@ -2774,12 +2831,12 @@ Output:
<context>
<name>SummaryPage</name>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="57"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
<translation>這是您開始安裝後所會發生的事的概覽。</translation>
</message>
<message>
- <location filename="../src/modules/summary/SummaryPage.cpp" line="58"/>
+ <location filename="../src/modules/summary/SummaryPage.cpp" line="60"/>
<source>This is an overview of what will happen once you start the install procedure.</source>
<translation>這是您開始安裝後所會發生的事的概覽。</translation>
</message>
@@ -2890,7 +2947,7 @@ Output:
<context>
<name>TrackingViewStep</name>
<message>
- <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+ <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="61"/>
<source>Feedback</source>
<translation>回饋</translation>
</message>
@@ -2898,43 +2955,43 @@ Output:
<context>
<name>UsersPage</name>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="120"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
<translation><small>如果將會有多於一人使用這臺電腦，您可以在安裝後設定多個帳號。</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="126"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
<translation><small>如果將會有多於一人使用這臺電腦，您可以在安裝後設定多個帳號。</small></translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="317"/>
<source>Your username is too long.</source>
<translation>您的使用者名稱太長了。</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="318"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="323"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation>您的使用者名稱含有無效的字元。只能使用小寫字母及數字。</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="356"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="361"/>
<source>Your hostname is too short.</source>
<translation>您的主機名稱太短了。</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="362"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="367"/>
<source>Your hostname is too long.</source>
<translation>您的主機名稱太長了。</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="368"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation>您的主機名稱含有無效的字元。只能使用字母、數字及破折號。</translation>
</message>
<message>
- <location filename="../src/modules/users/UsersPage.cpp" line="396"/>
- <location filename="../src/modules/users/UsersPage.cpp" line="440"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="401"/>
+ <location filename="../src/modules/users/UsersPage.cpp" line="445"/>
<source>Your passwords do not match!</source>
<translation>密碼不符！</translation>
</message>
@@ -2942,7 +2999,7 @@ Output:
<context>
<name>UsersViewStep</name>
<message>
- <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+ <location filename="../src/modules/users/UsersViewStep.cpp" line="54"/>
<source>Users</source>
<translation>使用者</translation>
</message>
diff --git a/lang/python.pot b/lang/python.pot
index 712e340df08fd01f8a268782eb1560d90e1e51ef..e1a33466607e628ceeb8e980dbeb236580e00e2f 100644
--- a/lang/python.pot
+++ b/lang/python.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-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"
@@ -26,6 +26,26 @@ msgstr "Configure GRUB."
msgid "Mounting partitions."
msgstr "Mounting partitions."
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr "Configuration Error"
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr "No partitions are defined for <pre>{!s}</pre> to use."
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "Configure systemd services"
@@ -183,10 +203,30 @@ msgstr "Display manager configuration was incomplete"
msgid "Configuring mkinitcpio."
msgstr "Configuring mkinitcpio."
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr "No root mount point is given for <pre>{!s}</pre> to use."
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr "Creating initramfs with mkinitcpio."
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr "Process Failed"
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr "Configuring encrypted swap."
@@ -320,11 +360,11 @@ msgstr "Configuring OpenRC dmcrypt service."
msgid "Configuring LUKS key file."
msgstr "Configuring LUKS key file."
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr "Encrypted rootfs setup error"
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr "Rootfs partition {!s} is LUKS but no passphrase found."
@@ -340,7 +380,7 @@ msgstr "Dummy python job."
msgid "Dummy python step {}"
msgstr "Dummy python step {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr "Configuring locales."
diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po
index 7f3e022eecc392e2c3fdfd6c18ed79739f2a7c57..c87694d549f82537643ba637e832ef58e37c2e4c 100644
--- a/lang/python/ar/LC_MESSAGES/python.po
+++ b/lang/python/ar/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Abubakaragoub Y <Abubakaryagob@gmail.com>, 2018\n"
"Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -179,10 +199,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -317,11 +355,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -337,7 +375,7 @@ msgstr "عملية بايثون دميه"
msgid "Dummy python step {}"
msgstr "عملية دميه خطوه بايثون {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po
index 78e69018515e1509cbc67cb4542219cf4877f0a6..936b835c837a3ee93a92cd83feb5f617d5915b56 100644
--- a/lang/python/ast/LC_MESSAGES/python.po
+++ b/lang/python/ast/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: enolp <enolp@softastur.org>, 2019\n"
"Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -184,10 +204,28 @@ msgstr "La configuración del xestor de pantalles nun se completó"
msgid "Configuring mkinitcpio."
msgstr "Configurando mkinitcpio."
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr "Configurando l'intercambéu cifráu."
@@ -315,11 +353,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -335,7 +373,7 @@ msgstr "Trabayu maniquín en Python."
msgid "Dummy python step {}"
msgstr "Pasu maniquín {} en Python"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr "Configurando locales."
diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po
index d1c3f93693cc907fae32145979bc446fdced74ed..1515b16a1ae4f4443b833728917f5df905c91234 100644
--- a/lang/python/be/LC_MESSAGES/python.po
+++ b/lang/python/be/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Belarusian (https://www.transifex.com/calamares/teams/20061/be/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -309,11 +347,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -329,7 +367,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po
index c96a5564107d91688ea96ded9b79e5429b34f89a..0595c7169a29fa93a1fccd74866296415bffbf6f 100644
--- a/lang/python/bg/LC_MESSAGES/python.po
+++ b/lang/python/bg/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Georgi Georgiev <georgiev_1994@abv.bg>, 2018\n"
"Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -179,10 +199,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -309,11 +347,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -329,7 +367,7 @@ msgstr "Фиктивна задача python."
msgid "Dummy python step {}"
msgstr "Фиктивна стъпка на python {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/ca/LC_MESSAGES/python.mo b/lang/python/ca/LC_MESSAGES/python.mo
index 0f41cd31dd60751d6432309dff544b1d1f1a2924..52cfde3edd139b61f1578f79e803d4359e568e18 100644
Binary files a/lang/python/ca/LC_MESSAGES/python.mo and b/lang/python/ca/LC_MESSAGES/python.mo differ
diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po
index e66945ce31eb502ea07cd798a1f6d5f3fa9dac35..09807ea116992b8927c31ec6d2d8c366984d1b0e 100644
--- a/lang/python/ca/LC_MESSAGES/python.po
+++ b/lang/python/ca/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Davidmp <medipas@gmail.com>, 2019\n"
"Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n"
@@ -29,6 +29,26 @@ msgstr "Configura el GRUB."
msgid "Mounting partitions."
msgstr "Es munten les particions."
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr "Error de configuració"
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr "No s'han definit particions perquè les usi <pre>{!s}</pre>."
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "Configura els serveis de systemd"
@@ -188,10 +208,31 @@ msgstr "La configuració del gestor de pantalla no era completa."
msgid "Configuring mkinitcpio."
msgstr "Es configura mkinitcpio."
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+"No s'ha proporcionat el punt de muntatge perquè l'usi <pre>{!s}</pre>."
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr "Es creen initramfs amb mkinitcpio."
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr "Ha fallat el procés."
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+"El procés <pre>mkinitcpio</pre> ha fallat amb el codi d'error {!s}. L'ordre "
+"era <pre>{!s}</pre>."
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr "Es configura l'intercanvi encriptat."
@@ -326,11 +367,11 @@ msgstr "Es configura el sevei OpenRC dmcrypt."
msgid "Configuring LUKS key file."
msgstr "Es configura el fitxer de clau LUKS."
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr "Error de configuració de rootfs encriptat."
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
"La partició de rootfs {!s} és LUKS però no se n'ha trobat cap contrasenya."
@@ -347,7 +388,7 @@ msgstr "Tasca de python fictícia."
msgid "Dummy python step {}"
msgstr "Pas de python fitctici {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr "Es configuren les llengües."
diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.mo b/lang/python/cs_CZ/LC_MESSAGES/python.mo
index 55e0cf43722bdf7daf317c5322f2b1b77bd4639f..5088700635a4bb263490c655df4c90bfd9088416 100644
Binary files a/lang/python/cs_CZ/LC_MESSAGES/python.mo and b/lang/python/cs_CZ/LC_MESSAGES/python.mo differ
diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po
index 3074e29b33de508899ac77e7fcfec3b23e09b5d3..38bcfb4cbaecfd0b0f9bf57d6c20c4a4eb5e5f70 100644
--- a/lang/python/cs_CZ/LC_MESSAGES/python.po
+++ b/lang/python/cs_CZ/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2019\n"
"Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n"
@@ -30,6 +30,26 @@ msgstr "Nastavování zavaděče GRUB."
msgid "Mounting partitions."
msgstr "Připojování oddílů."
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr "Chyba nastavení"
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr "Pro <pre>{!s}</pre> nejsou zadány žádné oddíly."
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "Nastavit služby systemd"
@@ -187,10 +207,30 @@ msgstr "Nastavení správce displeje nebylo úplné"
msgid "Configuring mkinitcpio."
msgstr "Nastavování mkinitcpio."
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr "Pro <pre>{!s}</pre> není zadán žádný přípojný bod."
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr "Vytváření initramfs pomocí mkinitcpio."
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr "Proces zhavaroval"
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+"Proces <pre>mkinitcpio</pre> zhavaroval kódem chyby {!s}. Příkaz byl "
+"<pre>{!s}</pre>."
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr "Nastavování šifrovaného prostoru pro odkládání stránek paměti."
@@ -330,11 +370,11 @@ msgstr "Nastavování služby OpenRC dmcrypt."
msgid "Configuring LUKS key file."
msgstr "Nastavování souboru s klíčem pro LUKS šifrování."
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr "Chyba nastavení šifrovaného kořenového oddílu"
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr "Kořenový oddíl {!s} je LUKS ale nebyla nalezena žádná heslová fráze."
@@ -350,7 +390,7 @@ msgstr "Testovací úloha python."
msgid "Dummy python step {}"
msgstr "Testovací krok {} python."
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr "Nastavování místních a jazykových nastavení."
diff --git a/lang/python/da/LC_MESSAGES/python.mo b/lang/python/da/LC_MESSAGES/python.mo
index 71730178ba6b902be904a07f3583f85960071d36..7786d48e3151b006728ccc7bd9b7a824c1712958 100644
Binary files a/lang/python/da/LC_MESSAGES/python.mo and b/lang/python/da/LC_MESSAGES/python.mo differ
diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po
index ac9081426e4e5980a4949120462a9a0401232239..dd3326ba6795c4e3f463730fd5bf083a38eaa8a9 100644
--- a/lang/python/da/LC_MESSAGES/python.po
+++ b/lang/python/da/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: scootergrisen, 2019\n"
"Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n"
@@ -24,10 +24,30 @@ msgstr ""
#: src/modules/grubcfg/main.py:37
msgid "Configure GRUB."
-msgstr ""
+msgstr "Konfigurer GRUB."
#: src/modules/mount/main.py:36
msgid "Mounting partitions."
+msgstr "Monterer partitioner."
+
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr "Fejl ved konfiguration"
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
msgstr ""
#: src/modules/services-systemd/main.py:35
@@ -186,15 +206,33 @@ msgstr "Displayhåndtering-konfiguration er ikke komplet"
#: src/modules/initcpiocfg/main.py:36
msgid "Configuring mkinitcpio."
+msgstr "Konfigurerer mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
msgstr ""
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
+msgstr "Opretter initramfs med mkinitcpio."
+
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr "Processen mislykkedes"
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
msgstr ""
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
-msgstr ""
+msgstr "Konfigurerer krypteret swap."
#: src/modules/rawfs/main.py:35
msgid "Installing data."
@@ -282,7 +320,7 @@ msgstr[1] "Fjerner %(num)d pakker."
#: src/modules/bootloader/main.py:48
msgid "Install bootloader."
-msgstr ""
+msgstr "Installér bootloader."
#: src/modules/removeuser/main.py:34
msgid "Remove live user from target system"
@@ -290,51 +328,51 @@ msgstr "Fjern livebruger fra målsystemet"
#: src/modules/initramfs/main.py:35
msgid "Creating initramfs."
-msgstr ""
+msgstr "Opretter initramfs."
#: src/modules/initramfs/main.py:49
msgid "Failed to run update-initramfs on the target"
-msgstr ""
+msgstr "Kunne ikke køre update-initramfs på målet"
#: src/modules/initramfs/main.py:50 src/modules/dracut/main.py:59
msgid "The exit code was {}"
-msgstr ""
+msgstr "Afslutningskoden var {}"
#: src/modules/hwclock/main.py:35
msgid "Setting hardware clock."
-msgstr ""
+msgstr "Indstiller hardwareur."
#: src/modules/dracut/main.py:36
msgid "Creating initramfs with dracut."
-msgstr ""
+msgstr "Opretter initramfs med dracut."
#: src/modules/dracut/main.py:58
msgid "Failed to run dracut on the target"
-msgstr ""
+msgstr "Kunne ikke køre dracut på målet"
#: src/modules/initramfscfg/main.py:41
msgid "Configuring initramfs."
-msgstr ""
+msgstr "Konfigurerer initramfs."
#: src/modules/openrcdmcryptcfg/main.py:34
msgid "Configuring OpenRC dmcrypt service."
-msgstr ""
+msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
#: src/modules/luksbootkeyfile/main.py:35
msgid "Configuring LUKS key file."
-msgstr ""
+msgstr "Konfigurerer LUKS-nøglefil."
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
-msgstr ""
+msgstr "Fejl ved opsætning af krypteret rootfs"
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
#: src/modules/fstab/main.py:38
msgid "Writing fstab."
-msgstr ""
+msgstr "Skriver fstab."
#: src/modules/dummypython/main.py:44
msgid "Dummy python job."
@@ -344,10 +382,10 @@ msgstr "Dummy python-job."
msgid "Dummy python step {}"
msgstr "Dummy python-trin {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
-msgstr ""
+msgstr "Konfigurerer lokaliteter."
#: src/modules/networkcfg/main.py:37
msgid "Saving network configuration."
-msgstr ""
+msgstr "Gemmer netværkskonfiguration."
diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po
index 50517ea4c9a8efeaa0a85fa36b1e2dc12c9b98ce..7116ad3db62db34220f0a9876161037939976270 100644
--- a/lang/python/de/LC_MESSAGES/python.po
+++ b/lang/python/de/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Andreas Eitel <github-aneitel@online.de>, 2019\n"
"Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n"
@@ -31,6 +31,26 @@ msgstr "GRUB konfigurieren."
msgid "Mounting partitions."
msgstr "Partitionen mounten."
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "Konfiguriere systemd Dienste"
@@ -189,10 +209,28 @@ msgstr "Displaymanagerkonfiguration war unvollständig."
msgid "Configuring mkinitcpio."
msgstr "mkinitcpio konfigurieren."
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr "Erstelle initramfs mit mkinitcpio."
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr "Konfiguriere verschlüsseltes swap."
@@ -325,11 +363,11 @@ msgstr "Konfiguration des OpenRC dmcrypt-Dienstes."
msgid "Configuring LUKS key file."
msgstr "LUKS-Schlüsseldatei konfigurieren."
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr "Verschlüsselter Rootfs-Setup-Fehler"
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr "Rootfs-Partition {!s} ist LUKS, aber keine Passphrase gefunden."
@@ -345,7 +383,7 @@ msgstr "Dummy Python-Job"
msgid "Dummy python step {}"
msgstr "Dummy Python-Schritt {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr "Konfiguriere Lokalisierungen."
diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po
index 1e3fabe77d6551a435a74fa1f01433e2dff545a9..655c43294620d4e5b8559291c5503fd1d48d650d 100644
--- a/lang/python/el/LC_MESSAGES/python.po
+++ b/lang/python/el/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>, 2017\n"
"Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -179,10 +199,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -309,11 +347,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -329,7 +367,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po
index efc7bb717c0aa25a3584462b2e2db698e6e3ceef..457cb1c17a1fdb685db2f61441c906014a6a97ca 100644
--- a/lang/python/en_GB/LC_MESSAGES/python.po
+++ b/lang/python/en_GB/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Jason Collins <JasonPCollins@protonmail.com>, 2018\n"
"Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -179,10 +199,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -309,11 +347,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -329,7 +367,7 @@ msgstr "Dummy python job."
msgid "Dummy python step {}"
msgstr "Dummy python step {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/eo/LC_MESSAGES/python.po b/lang/python/eo/LC_MESSAGES/python.po
index b8d4fa44032aec77ef27cadb7e45e0cf1d1be7a4..46ca234b2a6be94e1da69ecac562ccf8a003894e 100644
--- a/lang/python/eo/LC_MESSAGES/python.po
+++ b/lang/python/eo/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Kurt Ankh Phoenix <kurtphoenix@tuta.io>, 2018\n"
"Language-Team: Esperanto (https://www.transifex.com/calamares/teams/20061/eo/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -179,10 +199,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -309,11 +347,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -329,7 +367,7 @@ msgstr "Formala python laboro."
msgid "Dummy python step {}"
msgstr "Formala python paŝo {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po
index 05f607b0fcefd354a8807054781513080ab1a8ce..bf29bf3cca63469627536a47e24a29d593ebf89e 100644
--- a/lang/python/es/LC_MESSAGES/python.po
+++ b/lang/python/es/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Fito JB, 2019\n"
"Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
@@ -32,6 +32,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "Configurar servicios de systemd"
@@ -186,10 +206,28 @@ msgstr "La configuración del gestor de pantalla estaba incompleta"
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -316,11 +354,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -336,7 +374,7 @@ msgstr "Tarea de python ficticia."
msgid "Dummy python step {}"
msgstr "Paso {} de python ficticio"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po
index 6eecfa0dfe6565b05524ec8d248bfbdf74493977..a6cfc9df596e420bbfe5cb74c71275a3c53ba975 100644
--- a/lang/python/es_MX/LC_MESSAGES/python.po
+++ b/lang/python/es_MX/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Logan 8192 <wsses11000@gmail.com>, 2018\n"
"Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n"
@@ -30,6 +30,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -180,10 +200,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -310,11 +348,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -330,7 +368,7 @@ msgstr "Trabajo python ficticio."
msgid "Dummy python step {}"
msgstr "Paso python ficticio {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po
index 33ec84d0c9d01dcd7b9281c8c5188877a9bdc78c..91a6ae3aa37b7ce355fac042d478fd337cd9ce23 100644
--- a/lang/python/es_PR/LC_MESSAGES/python.po
+++ b/lang/python/es_PR/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -305,11 +343,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -325,7 +363,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/et/LC_MESSAGES/python.po b/lang/python/et/LC_MESSAGES/python.po
index bba07a5e9df60bfac007f1ec95faae75b0060989..7d4254f34e4191ee7a6c40f7d3acb4082a7fb4ca 100644
--- a/lang/python/et/LC_MESSAGES/python.po
+++ b/lang/python/et/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Madis, 2019\n"
"Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -179,10 +199,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -309,11 +347,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -329,7 +367,7 @@ msgstr "Testiv python'i töö."
msgid "Dummy python step {}"
msgstr "Testiv python'i aste {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po
index 2d9ff9a2b030281c566c39ee923f6c868f85f5d8..25a67db776e2614d25a8e1b552c5562f8c060517 100644
--- a/lang/python/eu/LC_MESSAGES/python.po
+++ b/lang/python/eu/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Ander Elortondo, 2019\n"
"Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -182,10 +202,28 @@ msgstr "Pantaila kudeatzaile konfigurazioa osotu gabe"
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -312,11 +350,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -332,7 +370,7 @@ msgstr "Dummy python lana."
msgid "Dummy python step {}"
msgstr "Dummy python urratsa {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po
index 04b41793b09b7f423fd8c869eda31b6cc60231d1..950e89372570912ab4e6769cff145d8bb27fa145 100644
--- a/lang/python/fa/LC_MESSAGES/python.po
+++ b/lang/python/fa/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -305,11 +343,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -325,7 +363,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po
index 52f4edccc7ceb33764ab0b31ce6b0289f7b873af..3463447b4526f4c6453aa3e93c9ce09604915f35 100644
--- a/lang/python/fi_FI/LC_MESSAGES/python.po
+++ b/lang/python/fi_FI/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -305,11 +343,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -325,7 +363,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po
index 30d953d751052d740594148e9bb324a4e326c397..685169a7e966305e2830d9751aa17d4e505f08d3 100644
--- a/lang/python/fr/LC_MESSAGES/python.po
+++ b/lang/python/fr/LC_MESSAGES/python.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Florian B <florianb3522@gmail.com>, 2019\n"
"Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n"
@@ -36,6 +36,26 @@ msgstr "Configuration du GRUB."
msgid "Mounting partitions."
msgstr "Montage des partitions."
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "Configurer les services systemd"
@@ -196,10 +216,28 @@ msgstr "La configuration du gestionnaire d'affichage était incomplète"
msgid "Configuring mkinitcpio."
msgstr "Configuration de mkinitcpio."
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr "Création de l'initramfs avec mkinitcpio."
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr "Configuration du swap chiffrée."
@@ -334,11 +372,11 @@ msgstr "Configuration du service OpenRC dmcrypt."
msgid "Configuring LUKS key file."
msgstr "Configuration de la clé de fichier LUKS."
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr "Erreur du chiffrement du setup rootfs"
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -354,7 +392,7 @@ msgstr "Tâche factice python"
msgid "Dummy python step {}"
msgstr "Étape factice python {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr "Configuration des locales."
diff --git a/lang/python/fr_CH/LC_MESSAGES/python.po b/lang/python/fr_CH/LC_MESSAGES/python.po
index 4c0fe4aff65658190d97588001cba87edea4ca11..ea282cff27d52fdf17111c2e01830e5dc44ad326 100644
--- a/lang/python/fr_CH/LC_MESSAGES/python.po
+++ b/lang/python/fr_CH/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: French (Switzerland) (https://www.transifex.com/calamares/teams/20061/fr_CH/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -305,11 +343,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -325,7 +363,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/gl/LC_MESSAGES/python.po b/lang/python/gl/LC_MESSAGES/python.po
index fd32a8b8b4697d2781a42da82a150963480c6393..0e2c02de11a61941f9f4a4b3e32ea3877645fd4f 100644
--- a/lang/python/gl/LC_MESSAGES/python.po
+++ b/lang/python/gl/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Xosé, 2018\n"
"Language-Team: Galician (https://www.transifex.com/calamares/teams/20061/gl/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -182,10 +202,28 @@ msgstr "A configuración do xestor de pantalla foi incompleta"
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -312,11 +350,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -332,7 +370,7 @@ msgstr "Tarefa parva de python."
msgid "Dummy python step {}"
msgstr "Paso parvo de python {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po
index cefa06329b0fc9ce99427320c4f78fbdf095f723..a040f071a4be6e8ae3c829fb9072da2da63a703d 100644
--- a/lang/python/gu/LC_MESSAGES/python.po
+++ b/lang/python/gu/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Gujarati (https://www.transifex.com/calamares/teams/20061/gu/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -305,11 +343,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -325,7 +363,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/he/LC_MESSAGES/python.mo b/lang/python/he/LC_MESSAGES/python.mo
index c5e890235c43190de0cfd2847a996adfd0793008..6028c79209721d82fbd9774c2934b612bd38981d 100644
Binary files a/lang/python/he/LC_MESSAGES/python.mo and b/lang/python/he/LC_MESSAGES/python.mo differ
diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po
index 502861e2c1e4cd7518701009bc33457e9d9c4080..510fa9b09d78bbbdb62952a7900a8c1c375b59c1 100644
--- a/lang/python/he/LC_MESSAGES/python.po
+++ b/lang/python/he/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>, 2019\n"
"Language-Team: Hebrew (https://www.transifex.com/calamares/teams/20061/he/)\n"
@@ -30,6 +30,26 @@ msgstr "הגדרת GRUB."
msgid "Mounting partitions."
msgstr "מחיצות מעוגנות."
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr "שגיאת הגדרות"
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr "לא הוגדרו מחיצות לשימוש של <pre>{!s}</pre>."
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "הגדרת שירותי systemd"
@@ -185,10 +205,30 @@ msgstr "תצורת מנהל התצוגה אינה שלמה"
msgid "Configuring mkinitcpio."
msgstr "mkinitcpio מותקן."
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr "לא סופקה נקודת עגינת שורש לשימוש של <pre>{!s}</pre>."
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr "נוצר initramfs עם mkinitcpio."
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr "התהליך נכשל"
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+"התהליך <pre>mkinitcpio</pre> נכשל עם קוד השגיאה {!s}. הפקודה הייתה "
+"<pre>{!s}</pre>."
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr "מוגדר שטח החלפה מוצפן."
@@ -324,11 +364,11 @@ msgstr "שירות dmcrypt ל־OpenRC מוגדר."
msgid "Configuring LUKS key file."
msgstr "קובץ מפתח ה־LUKS מוגדר."
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr "שגיאת התקנת מחיצת שורש מוצפנת"
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr "מחיצת השורש {!s} היא מסוג LUKS אך לא נמצאה מילת צופן."
@@ -344,7 +384,7 @@ msgstr "משימת דמה של Python."
msgid "Dummy python step {}"
msgstr "צעד דמה של Python {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr "השפות מוגדרות."
diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po
index a45757a7b7ca86461641ba02f335aa91a6158cfd..c1ae66033a0b8630059519a7a282b02d2dc57ca3 100644
--- a/lang/python/hi/LC_MESSAGES/python.po
+++ b/lang/python/hi/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Panwar108 <caspian7pena@gmail.com>, 2018\n"
"Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -179,10 +199,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -309,11 +347,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -329,7 +367,7 @@ msgstr "डमी पाइथन प्रक्रिया ।"
msgid "Dummy python step {}"
msgstr "डमी पाइथन प्रक्रिया की चरण संख्या {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/hr/LC_MESSAGES/python.mo b/lang/python/hr/LC_MESSAGES/python.mo
index 9047d97cf4aa8c80481ba0515066ac12927bfd85..ad429694e17936fbf185b8176961ae0129ad61f8 100644
Binary files a/lang/python/hr/LC_MESSAGES/python.mo and b/lang/python/hr/LC_MESSAGES/python.mo differ
diff --git a/lang/python/hr/LC_MESSAGES/python.po b/lang/python/hr/LC_MESSAGES/python.po
index 77f50ab90bb51e0b7719e7a2bacf90bb4df0f469..8856d16accc2c7c44c1be0533246d84622e05060 100644
--- a/lang/python/hr/LC_MESSAGES/python.po
+++ b/lang/python/hr/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Lovro Kudelić <lovro.kudelic@outlook.com>, 2019\n"
"Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n"
@@ -29,6 +29,26 @@ msgstr "Konfigurirajte GRUB."
msgid "Mounting partitions."
msgstr "Montiranje particija."
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr "Greška konfiguracije"
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr "Nema definiranih particija za <pre>{!s}</pre> korištenje."
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "Konfiguriraj systemd servise"
@@ -187,10 +207,31 @@ msgstr "Konfiguracija upravitelja zaslona nije bila potpuna"
msgid "Configuring mkinitcpio."
msgstr "Konfiguriranje mkinitcpio."
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+"Nijedna root točka montiranja nije definirana za <pre>{!s}</pre> korištenje."
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr "Stvaranje initramfs s mkinitcpio."
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr "Proces nije uspio"
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+"Proces <pre>mkinitcpio</pre> nije uspio s kodom pogreške {!s}. Naredba je "
+"bila <pre>{!s}</pre>."
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr "Konfiguriranje šifriranog swapa."
@@ -326,11 +367,11 @@ msgstr "Konfiguriranje servisa OpenRC dmcrypt."
msgid "Configuring LUKS key file."
msgstr "Konfiguriranje LUKS ključne datoteke."
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr "Pogreška postavljanja šifriranog rootfs-a"
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr "Rootfs particija {!s} je LUKS, ali nije pronađena zaporka."
@@ -346,7 +387,7 @@ msgstr "Testni python posao."
msgid "Dummy python step {}"
msgstr "Testni python korak {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr "Konfiguriranje lokalizacije."
diff --git a/lang/python/hu/LC_MESSAGES/python.po b/lang/python/hu/LC_MESSAGES/python.po
index 2ab8ed354aea333c25d14a30656ae76dd2d66ac5..4b64aa7f279d49aea0ff17afc1c8f10c581ac840 100644
--- a/lang/python/hu/LC_MESSAGES/python.po
+++ b/lang/python/hu/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: miku84, 2019\n"
"Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n"
@@ -31,6 +31,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "systemd szolgáltatások beállítása"
@@ -183,10 +203,28 @@ msgstr "A kijelzőkezelő konfigurációja hiányos volt"
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -313,11 +351,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -333,7 +371,7 @@ msgstr "Hamis Python feladat."
msgid "Dummy python step {}"
msgstr "Hamis {}. Python lépés"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po
index 215c9eebaef4c742cf781ba75c633c3109a5f74d..f74367dcf68a424f5588a3bf7e556d4411b0c36b 100644
--- a/lang/python/id/LC_MESSAGES/python.po
+++ b/lang/python/id/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Wantoyo <wantoyek@gmail.com>, 2018\n"
"Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n"
@@ -31,6 +31,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -183,10 +203,28 @@ msgstr "Konfigurasi display manager belum rampung"
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -311,11 +349,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -331,7 +369,7 @@ msgstr "Tugas dumi python."
msgid "Dummy python step {}"
msgstr "Langkah {} dumi python"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po
index 656941dcccc1d5b5303c9e8bec52531224a25cbf..1fd1b9662e37a6d83aaa4013f006a243008c4047 100644
--- a/lang/python/is/LC_MESSAGES/python.po
+++ b/lang/python/is/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Kristján Magnússon, 2018\n"
"Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -179,10 +199,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -309,11 +347,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -329,7 +367,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po
index 22094a5e0f628fdc6fa0b7d00041c92337789d3a..116ad132e525b2f42efa507c55348746ae68a557 100644
--- a/lang/python/it_IT/LC_MESSAGES/python.po
+++ b/lang/python/it_IT/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Pierfrancesco Passerini <p.passerini@gmail.com>, 2019\n"
"Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n"
@@ -31,6 +31,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "Configura systemd services"
@@ -186,10 +206,28 @@ msgstr "La configurazione del display manager è incompleta"
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -318,11 +356,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -338,7 +376,7 @@ msgstr "Job python fittizio."
msgid "Dummy python step {}"
msgstr "Python step {} fittizio"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po
index 3e6a3e41d547deebc7d58b31b36c6cd7f746b4dc..5cab89942dece5afa4784954def7b3fc1fdf7e88 100644
--- a/lang/python/ja/LC_MESSAGES/python.po
+++ b/lang/python/ja/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Takefumi Nagata, 2019\n"
"Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n"
@@ -31,6 +31,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "systemdサービスを設定"
@@ -181,10 +201,28 @@ msgstr "ディスプレイマネージャの設定が不完全です"
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -309,11 +347,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -329,7 +367,7 @@ msgstr "Dummy python job."
msgid "Dummy python step {}"
msgstr "Dummy python step {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po
index bc415867580261e88186c668e5542631d67885a0..70b473fb800b7b8301e0345f85a3d7dfbce25405 100644
--- a/lang/python/kk/LC_MESSAGES/python.po
+++ b/lang/python/kk/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Kazakh (https://www.transifex.com/calamares/teams/20061/kk/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -305,11 +343,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -325,7 +363,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/kn/LC_MESSAGES/python.po b/lang/python/kn/LC_MESSAGES/python.po
index 8a207f912e7c35fe991efc8039c67fd79687186d..6a4bae1cd5ef09acf8c3165d07a37cc16f33da7b 100644
--- a/lang/python/kn/LC_MESSAGES/python.po
+++ b/lang/python/kn/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Kannada (https://www.transifex.com/calamares/teams/20061/kn/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -305,11 +343,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -325,7 +363,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po
index 487e9547b81269e4e15b65835d11bdf9953e934f..7045ba76bfc3fc976e726a95c9e30f4d7645c255 100644
--- a/lang/python/ko/LC_MESSAGES/python.po
+++ b/lang/python/ko/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: 이정희 <daemul72@gmail.com>, 2019\n"
"Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n"
@@ -30,6 +30,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "systemd 서비스 구성"
@@ -183,10 +203,28 @@ msgstr "디스플레이 관리자 구성이 완료되지 않았습니다."
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -313,11 +351,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -333,7 +371,7 @@ msgstr "더미 파이썬 작업."
msgid "Dummy python step {}"
msgstr "더미 파이썬 단계 {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po
index 1e733e310516e610bc1a391c2a554a6303c8c50b..65999615b76d38c26f9b2dad31c7ade8667b84d0 100644
--- a/lang/python/lo/LC_MESSAGES/python.po
+++ b/lang/python/lo/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Lao (https://www.transifex.com/calamares/teams/20061/lo/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -303,11 +341,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -323,7 +361,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/lt/LC_MESSAGES/python.mo b/lang/python/lt/LC_MESSAGES/python.mo
index 01c75160204f540fa8871c3568a1009038f995ba..e2d60c86f80578dd6c6b9866586422ba5078b18a 100644
Binary files a/lang/python/lt/LC_MESSAGES/python.mo and b/lang/python/lt/LC_MESSAGES/python.mo differ
diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po
index 1b4c9e136da60f88310f313fcbab4c3d4eb91b20..3730c5c07fb31ab30ba67987a2b1deda25d18df7 100644
--- a/lang/python/lt/LC_MESSAGES/python.po
+++ b/lang/python/lt/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Moo, 2019\n"
"Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n"
@@ -29,6 +29,26 @@ msgstr "Konfigūruoti GRUB."
msgid "Mounting partitions."
msgstr "Prijungiami skaidiniai."
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr "Konfigūracijos klaida"
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr "Nėra apibrėžta jokių skaidinių, skirtų <pre>{!s}</pre> naudojimui."
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "Konfigūruoti systemd tarnybas"
@@ -187,10 +207,32 @@ msgstr "Ekranų tvarkytuvės konfigūracija yra nepilna"
msgid "Configuring mkinitcpio."
msgstr "Konfigūruojama mkinitcpio."
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+"Nėra nurodyta jokių šaknies prijungimo taškų, skirtų <pre>{!s}</pre> "
+"naudojimui."
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr "Sukuriama initramfs naudojant mkinitcpio."
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr "Procesas patyrė nesėkmę"
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+"Procesas <pre>mkinitcpio</pre> patyrė nesėkmę su klaidos kodu {!s}. Komanda "
+"buvo <pre>{!s}</pre>."
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr "Konfigūruojamas šifruotas sukeitimų skaidinys."
@@ -328,11 +370,11 @@ msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
msgid "Configuring LUKS key file."
msgstr "Konfigūruojamas LUKS raktų failas."
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr "Šifruoto rootfs sąrankos klaida"
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr "Rootfs skaidinys {!s} yra LUKS, tačiau nerasta jokios slaptafrazės."
@@ -348,7 +390,7 @@ msgstr "Fiktyvi python užduotis."
msgid "Dummy python step {}"
msgstr "Fiktyvus python žingsnis {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr "Konfigūruojamos lokalės."
diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po
index 2f2ca27bb57559cd8879cbe602133a09c70f51b4..7276122c3d389220e5e7da4068558d6219da6c12 100644
--- a/lang/python/mk/LC_MESSAGES/python.po
+++ b/lang/python/mk/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Martin Ristovski <martinristovski@protonmail.com>, 2018\n"
"Language-Team: Macedonian (https://www.transifex.com/calamares/teams/20061/mk/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -179,10 +199,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -309,11 +347,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -329,7 +367,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po
index d857b162f6fd601157f2aefe00ed2d07fc0c98ba..e2579c92842541bf1eb5779edfae2e06e88b591c 100644
--- a/lang/python/mr/LC_MESSAGES/python.po
+++ b/lang/python/mr/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Marathi (https://www.transifex.com/calamares/teams/20061/mr/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -305,11 +343,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -325,7 +363,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/nb/LC_MESSAGES/python.po b/lang/python/nb/LC_MESSAGES/python.po
index 9782a2416d633e7f14810ff994e026fea0ff6375..fe6b946446a2236c571d0eb974989c9dcf38cbc0 100644
--- a/lang/python/nb/LC_MESSAGES/python.po
+++ b/lang/python/nb/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Tyler Moss <inactive+lazerbeta@transifex.com>, 2017\n"
"Language-Team: Norwegian Bokmål (https://www.transifex.com/calamares/teams/20061/nb/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -179,10 +199,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -309,11 +347,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -329,7 +367,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/ne_NP/LC_MESSAGES/python.po b/lang/python/ne_NP/LC_MESSAGES/python.po
index ceffc82ac85fd7ff911118756bcdf042feca6a3b..8508223a00e1190ec078ffbe6ee3783837beb69c 100644
--- a/lang/python/ne_NP/LC_MESSAGES/python.po
+++ b/lang/python/ne_NP/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Nepali (Nepal) (https://www.transifex.com/calamares/teams/20061/ne_NP/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -305,11 +343,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -325,7 +363,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/nl/LC_MESSAGES/python.po b/lang/python/nl/LC_MESSAGES/python.po
index dc898723c612bb71357ffe1ac0b10fcaca4671fd..d0acb569f79c51de18a44a5cca96c528c1aa2238 100644
--- a/lang/python/nl/LC_MESSAGES/python.po
+++ b/lang/python/nl/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Adriaan de Groot <groot@kde.org>, 2019\n"
"Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -181,10 +201,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -311,11 +349,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -331,7 +369,7 @@ msgstr "Voorbeeld Python-taak"
msgid "Dummy python step {}"
msgstr "Voorbeeld Python-stap {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po
index 88ac65eea90ca12808a9c85fc52429ec5e27f30b..ca480c6cd86b8433025580a5440437e692dbb5e0 100644
--- a/lang/python/pl/LC_MESSAGES/python.po
+++ b/lang/python/pl/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2019\n"
"Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n"
@@ -31,6 +31,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -189,10 +209,28 @@ msgstr "Konfiguracja menedzera wyświetlania była niekompletna"
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -323,11 +361,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -343,7 +381,7 @@ msgstr "Zadanie fikcyjne Python."
msgid "Dummy python step {}"
msgstr "Krok fikcyjny Python {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/pt_BR/LC_MESSAGES/python.mo b/lang/python/pt_BR/LC_MESSAGES/python.mo
index 8565d5f075cc4f7a825965e2667ebca03a39ab0f..39de8487c8829d2b6b85d9e4e9fa77b5f331b3f0 100644
Binary files a/lang/python/pt_BR/LC_MESSAGES/python.mo and b/lang/python/pt_BR/LC_MESSAGES/python.mo differ
diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po
index 70dd1addb42203184e4f07b8a2975b38216b469c..a92ff3ca8c7f18058912f77ea44b54a04cff744a 100644
--- a/lang/python/pt_BR/LC_MESSAGES/python.po
+++ b/lang/python/pt_BR/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Guilherme <guimarcalsilva@gmail.com>, 2019\n"
"Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n"
@@ -30,6 +30,26 @@ msgstr "Configurar GRUB."
msgid "Mounting partitions."
msgstr "Montando partições."
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr "Erro de Configuração."
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr "Sem partições definidas para uso por <pre>{!s}</pre>."
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "Configurar serviços do systemd"
@@ -189,10 +209,31 @@ msgstr "A configuração do gerenciador de exibição está incompleta"
msgid "Configuring mkinitcpio."
msgstr "Configurando mkinitcpio."
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+"Nenhum ponto de montagem para o root fornecido para uso por <pre>{!s}</pre>."
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr "Criando initramfs com mkinitcpio."
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr "O Processo Falhou"
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+"O processo <pre>mkinitcpio</pre> falhou com o código de erro {!s}. O comando"
+" foi <pre>{!s}</pre>."
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr "Configurando swap encriptada."
@@ -329,11 +370,11 @@ msgstr "Configurando serviço dmcrypt do OpenRC."
msgid "Configuring LUKS key file."
msgstr "Configurando o arquivo de chave do LUKS."
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr "Erro de configuração de rootfs encriptado"
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr "A partição Rootfs {!s} é LUKS mas nenhuma frase-chave foi encontrada."
@@ -349,7 +390,7 @@ msgstr "Tarefa modelo python."
msgid "Dummy python step {}"
msgstr "Etapa modelo python {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr "Configurando locais."
diff --git a/lang/python/pt_PT/LC_MESSAGES/python.mo b/lang/python/pt_PT/LC_MESSAGES/python.mo
index 85946624e3f90a6ac6cc5145677fd7f08921dd0e..05a5ed7db5ba83e1ea76850ef4de06405c7e4379 100644
Binary files a/lang/python/pt_PT/LC_MESSAGES/python.mo and b/lang/python/pt_PT/LC_MESSAGES/python.mo differ
diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po
index 532597ce1292040e5b19f65f280257b4a08fa115..add684bf157fed5af6be24cb0e108608f44ed199 100644
--- a/lang/python/pt_PT/LC_MESSAGES/python.po
+++ b/lang/python/pt_PT/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>, 2019\n"
"Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n"
@@ -25,10 +25,30 @@ msgstr ""
#: src/modules/grubcfg/main.py:37
msgid "Configure GRUB."
-msgstr ""
+msgstr "Configurar o GRUB."
#: src/modules/mount/main.py:36
msgid "Mounting partitions."
+msgstr "A montar partições."
+
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
msgstr ""
#: src/modules/services-systemd/main.py:35
@@ -190,10 +210,28 @@ msgstr "A configuração do gestor de exibição estava incompleta"
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -329,11 +367,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -349,7 +387,7 @@ msgstr "Tarefa Dummy python."
msgid "Dummy python step {}"
msgstr "Passo Dummy python {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po
index c272b6eca72e9cd983647406ba782dbe46c91c80..581654d16e3934dfd04f41867fbdf1e39c6d1d14 100644
--- a/lang/python/ro/LC_MESSAGES/python.po
+++ b/lang/python/ro/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Sebastian Brici <bricisebastian@gmail.com>, 2018\n"
"Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n"
@@ -30,6 +30,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -180,10 +200,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -312,11 +350,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -332,7 +370,7 @@ msgstr "Job python fictiv."
msgid "Dummy python step {}"
msgstr "Dummy python step {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po
index 361c06131744f4a6d3070b9cf3e813cc06f5a832..1356437a85b5f42ec39a3f53c98951ad4a6c635e 100644
--- a/lang/python/ru/LC_MESSAGES/python.po
+++ b/lang/python/ru/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Aleksey Kabanov <ak099@mail.ru>, 2018\n"
"Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -179,10 +199,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -313,11 +351,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -333,7 +371,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/sk/LC_MESSAGES/python.po b/lang/python/sk/LC_MESSAGES/python.po
index fa1d8b0b463bdb9d5d3594ecccd13b3eec079755..22c891284ad8126dd8d4b8292bdf281c387dd0f1 100644
--- a/lang/python/sk/LC_MESSAGES/python.po
+++ b/lang/python/sk/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Dušan Kazik <prescott66@gmail.com>, 2018\n"
"Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n"
@@ -29,6 +29,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -179,10 +199,28 @@ msgstr "Konfigurácia správcu zobrazenia nebola úplná"
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -313,11 +351,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -333,7 +371,7 @@ msgstr "Fiktívna úloha jazyka python."
msgid "Dummy python step {}"
msgstr "Fiktívny krok {} jazyka python"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po
index a4663934ca2b93223d3f40bc4ae4d2e60548836e..c59499b54286c48c47776f0ebcae689b52754c89 100644
--- a/lang/python/sl/LC_MESSAGES/python.po
+++ b/lang/python/sl/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Slovenian (https://www.transifex.com/calamares/teams/20061/sl/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -309,11 +347,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -329,7 +367,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/sq/LC_MESSAGES/python.mo b/lang/python/sq/LC_MESSAGES/python.mo
index 09ff022bb6d8ee580eed9deae315ded0e930b0b1..64347c01fd699538256981fae15bb298f46f193a 100644
Binary files a/lang/python/sq/LC_MESSAGES/python.mo and b/lang/python/sq/LC_MESSAGES/python.mo differ
diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po
index 812bf623c0fdef7d1da8ffd4e18d1ea3809fa95a..e7748261ca35e96d4155794535c16c9412612308 100644
--- a/lang/python/sq/LC_MESSAGES/python.po
+++ b/lang/python/sq/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Besnik <besnik@programeshqip.org>, 2019\n"
"Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n"
@@ -29,6 +29,26 @@ msgstr "Formësoni GRUB-in."
msgid "Mounting partitions."
msgstr "Po montohen pjesë."
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr "Gabim Formësimi"
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr "S’ka pjesë të përkufizuara për <pre>{!s}</pre> për t’u përdorur."
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "Formësoni shërbime systemd"
@@ -187,10 +207,31 @@ msgstr "Formësimi i përgjegjësit të ekranit s’qe i plotë"
msgid "Configuring mkinitcpio."
msgstr "Po formësohet mkinitcpio."
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+"S’është dhënë pikë montimi rrënjë për <pre>{!s}</pre> për t’u përdorur."
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr "Po krijohet initramfs me mkinitcpio."
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr "Procesi Dështoi"
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+"Procesi <pre>mkinitcpio</pre> dështoi me kod gabimi {!s}. Urdhri qe "
+"<pre>{!s}</pre>."
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr "Po formësohet pjesë swap e fshehtëzuar."
@@ -325,11 +366,11 @@ msgstr "Po formësohet shërbim OpenRC dmcrypt."
msgid "Configuring LUKS key file."
msgstr "Po formësohet kartelë kyçesh LUKS."
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr "Gabim ujdisjeje rootfs të fshehtëzuar"
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr "Pjesa rootfs {!s} është LUKS, por s’u gjet frazëkalim."
@@ -345,7 +386,7 @@ msgstr "Akt python dummy."
msgid "Dummy python step {}"
msgstr "Hap python {} dummy"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr "Po formësohen vendoret."
diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po
index 9fea1b6b34e6dbaecf06dbafd2930dd091332c1c..2bf5222b864594bdd1a45e35f4e206ace437972d 100644
--- a/lang/python/sr/LC_MESSAGES/python.po
+++ b/lang/python/sr/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -307,11 +345,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -327,7 +365,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po
index 67d8e4237b70db2afd446f83530c216bee8c05f3..e6ecd9ae30f2f76479e57afe6902ac1dad320ace 100644
--- a/lang/python/sr@latin/LC_MESSAGES/python.po
+++ b/lang/python/sr@latin/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Serbian (Latin) (https://www.transifex.com/calamares/teams/20061/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -307,11 +345,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -327,7 +365,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po
index a13895a83342083a96fb8fa19b5264861e9840c2..ee893847001a0cc3d8503c94895ae3b548f3b118 100644
--- a/lang/python/sv/LC_MESSAGES/python.po
+++ b/lang/python/sv/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -305,11 +343,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -325,7 +363,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po
index e18ccb1058edd2ff3e60deb38e0d2ecd54882557..d4395ecf41b04e0a0a3bbeb3626d83fa8a11c5f1 100644
--- a/lang/python/th/LC_MESSAGES/python.po
+++ b/lang/python/th/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Thai (https://www.transifex.com/calamares/teams/20061/th/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -303,11 +341,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -323,7 +361,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/tr_TR/LC_MESSAGES/python.mo b/lang/python/tr_TR/LC_MESSAGES/python.mo
index efff75e386b7d354aa5d194d2288cf6e609cb5af..54ff6bebe79412481deebfd430b17ca19dbf1d31 100644
Binary files a/lang/python/tr_TR/LC_MESSAGES/python.mo and b/lang/python/tr_TR/LC_MESSAGES/python.mo differ
diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po
index 50fe62965d19a43b1e8a9c632ae4dbe53b49bea0..b4e4468f701ff8e32c90376d96d6c5a2466fa3d1 100644
--- a/lang/python/tr_TR/LC_MESSAGES/python.po
+++ b/lang/python/tr_TR/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Demiray Muhterem <mdemiray@msn.com>, 2019\n"
"Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n"
@@ -29,6 +29,26 @@ msgstr "GRUB'u yapılandır."
msgid "Mounting partitions."
msgstr "Disk bölümleri bağlanıyor."
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr "Yapılandırma Hatası"
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr "<pre>{!s}</pre> kullanması için hiçbir bölüm tanımlanmadı."
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "Systemd hizmetlerini yapılandır"
@@ -187,10 +207,30 @@ msgstr "Ekran yöneticisi yapılandırma işi tamamlanamadı"
msgid "Configuring mkinitcpio."
msgstr "Mkinitcpio yapılandırılıyor."
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr "<pre>{!s}</pre> kullanması için kök bağlama noktası verilmedi."
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr "Mkinitcpio ile initramfs oluşturuluyor."
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr "İşlem Başarısız"
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+"<pre>Mkinitcpio</pre> işlemi {!s} hata koduyla başarısız oldu. Komut "
+"<pre>{!s}</pre> idi."
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr "Şifreli takas alanı yapılandırılıyor."
@@ -321,11 +361,11 @@ msgstr "OpenRC dmcrypt servisi yapılandırılıyor."
msgid "Configuring LUKS key file."
msgstr "LUKS anahtar dosyası yapılandırılıyor."
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr "Şifrelenmiş rootfs kurulum hatası"
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr "Rootfs disk bölümü {!s} LUKS, fakat parola bulunamadı."
@@ -341,7 +381,7 @@ msgstr "Dummy python job."
msgid "Dummy python step {}"
msgstr "Dummy python step {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr "Sistem yereli yapılandırılıyor."
diff --git a/lang/python/uk/LC_MESSAGES/python.po b/lang/python/uk/LC_MESSAGES/python.po
index f1a6b5856575ad8c1f5389db1fe49de0bf8af0e3..3a31621a1e0dc733804644065a599832736c5841 100644
--- a/lang/python/uk/LC_MESSAGES/python.po
+++ b/lang/python/uk/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Paul S <paul.smbg@gmail.com>, 2019\n"
"Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n"
@@ -30,6 +30,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "Налаштуйте служби systemd"
@@ -186,10 +206,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -320,11 +358,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -340,7 +378,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po
index 71564faf304a48acb914e41223d3b70af777c5cd..6d762ee8a308478db2d3afa1d02a80b3fd1a08d5 100644
--- a/lang/python/ur/LC_MESSAGES/python.po
+++ b/lang/python/ur/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Urdu (https://www.transifex.com/calamares/teams/20061/ur/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -305,11 +343,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -325,7 +363,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/uz/LC_MESSAGES/python.po b/lang/python/uz/LC_MESSAGES/python.po
index c564cbb901c1edee17c190b7e0500425692ae829..44688d59e28db5bba4a73cec472acb244586eafe 100644
--- a/lang/python/uz/LC_MESSAGES/python.po
+++ b/lang/python/uz/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Language-Team: Uzbek (https://www.transifex.com/calamares/teams/20061/uz/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -175,10 +195,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -303,11 +341,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -323,7 +361,7 @@ msgstr ""
msgid "Dummy python step {}"
msgstr ""
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po
index e6dec81503d34637f5184516bfaa05c8d7ceb69f..b927ca5c9db7a2f6e2833d9d297f203aa42e117c 100644
--- a/lang/python/zh_CN/LC_MESSAGES/python.po
+++ b/lang/python/zh_CN/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: leonfeng <chaofeng111@qq.com>, 2018\n"
"Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n"
@@ -31,6 +31,26 @@ msgstr ""
msgid "Mounting partitions."
msgstr ""
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr ""
@@ -181,10 +201,28 @@ msgstr ""
msgid "Configuring mkinitcpio."
msgstr ""
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr ""
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr ""
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr ""
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr ""
@@ -309,11 +347,11 @@ msgstr ""
msgid "Configuring LUKS key file."
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr ""
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr ""
@@ -329,7 +367,7 @@ msgstr "占位 Python 任务。"
msgid "Dummy python step {}"
msgstr "占位 Python 步骤 {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
diff --git a/lang/python/zh_TW/LC_MESSAGES/python.mo b/lang/python/zh_TW/LC_MESSAGES/python.mo
index 9abb697ef5d7d1020e9185f6e1da703ee2e6dc7b..54b7a355585c281bfcaf9bc10458be67288a2633 100644
Binary files a/lang/python/zh_TW/LC_MESSAGES/python.mo and b/lang/python/zh_TW/LC_MESSAGES/python.mo differ
diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po
index e18719a3cc75debe447aaff25777b646f437d356..fee3edc844c1883ec511234c1e9d2efa73336f99 100644
--- a/lang/python/zh_TW/LC_MESSAGES/python.po
+++ b/lang/python/zh_TW/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-24 12:03-0400\n"
+"POT-Creation-Date: 2019-05-02 16:52-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Jeff Huang <s8321414@gmail.com>, 2019\n"
"Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n"
@@ -29,6 +29,26 @@ msgstr "設定 GRUB。"
msgid "Mounting partitions."
msgstr "正在掛載分割區。"
+#: src/modules/mount/main.py:140 src/modules/initcpiocfg/main.py:187
+#: src/modules/initcpiocfg/main.py:191
+#: src/modules/luksopenswaphookcfg/main.py:95
+#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
+#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:82
+#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
+#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/networkcfg/main.py:48
+msgid "Configuration Error"
+msgstr "設定錯誤"
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:188
+#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
+#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
+#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr "沒有分割區被定義為 <pre>{!s}</pre> 以供使用。"
+
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "設定 systemd 服務"
@@ -181,10 +201,28 @@ msgstr "顯示管理器設定不完整"
msgid "Configuring mkinitcpio."
msgstr "正在設定 mkinitcpio。"
+#: src/modules/initcpiocfg/main.py:192
+#: src/modules/luksopenswaphookcfg/main.py:100
+#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr "沒有給定的根掛載點 <pre>{!s}</pre> 以供使用。"
+
#: src/modules/initcpio/main.py:33
msgid "Creating initramfs with mkinitcpio."
msgstr "正在使用 mkinitcpio 建立 initramfs。"
+#: src/modules/initcpio/main.py:47
+msgid "Process Failed"
+msgstr "處理失敗"
+
+#: src/modules/initcpio/main.py:48
+msgid ""
+"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
+"<pre>{!s}</pre>."
+msgstr "處理程序 <pre>mkinitcpio</pre> 帶著錯誤代碼 {!s} 失敗。指令為 <pre>{!s}</pre>。"
+
#: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap."
msgstr "正在設定已加密的 swap。"
@@ -309,11 +347,11 @@ msgstr "正在設定 OpenRC dmcrypt 服務。"
msgid "Configuring LUKS key file."
msgstr "正在設定 LUKS 金鑰檔案。"
-#: src/modules/luksbootkeyfile/main.py:69
+#: src/modules/luksbootkeyfile/main.py:74
msgid "Encrypted rootfs setup error"
msgstr "已加密的 rootfs 設定錯誤"
-#: src/modules/luksbootkeyfile/main.py:70
+#: src/modules/luksbootkeyfile/main.py:75
msgid "Rootfs partition {!s} is LUKS but no passphrase found."
msgstr "Rootfs 分割區 {!s} 是 LUKS 但找不到通關密語。"
@@ -329,7 +367,7 @@ msgstr "假的 python 工作。"
msgid "Dummy python step {}"
msgstr "假的 python step {}"
-#: src/modules/localecfg/main.py:37
+#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr "正在設定語系。"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c29a866d8ca186a00ca214432af859d4b12c1974..b73fecda0b960339884ef2d6cb39307820e6fef0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,15 +3,6 @@ include( CalamaresAddModuleSubdirectory )
include( CalamaresAddLibrary )
include( CalamaresAddBrandingSubdirectory )
-include_directories(
- ${CMAKE_CURRENT_LIST_DIR}
- ${CMAKE_CURRENT_LIST_DIR}/libcalamares
- ${CMAKE_CURRENT_LIST_DIR}/libcalamaresui
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}/libcalamares
- ${CMAKE_CURRENT_BINARY_DIR}/libcalamaresui
-)
-
# library
add_subdirectory( libcalamares )
diff --git a/src/calamares/CalamaresApplication.h b/src/calamares/CalamaresApplication.h
index f9c919aa6123eabf94755ab2e4ce3f835a15d495..9f53726aeda658fbfcdac0be29597681fbd09195 100644
--- a/src/calamares/CalamaresApplication.h
+++ b/src/calamares/CalamaresApplication.h
@@ -1,7 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
- * Copyright 2018, Adriaan de Groot <groot@kde.org>
+ * Copyright 2018-2019, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,12 +20,8 @@
#ifndef CALAMARESAPPLICATION_H
#define CALAMARESAPPLICATION_H
-#include "Typedefs.h"
-
#include <QApplication>
-#define APP CalamaresApplication::instance()
-
class CalamaresWindow;
namespace Calamares
diff --git a/src/calamares/progresstree/ProgressTreeDelegate.cpp b/src/calamares/progresstree/ProgressTreeDelegate.cpp
index 9c6a400f6056ca363c5fdb33b1aa9346fb68e0dd..67dfeebdac5aed0e1d99cdea17744fcefb23655d 100644
--- a/src/calamares/progresstree/ProgressTreeDelegate.cpp
+++ b/src/calamares/progresstree/ProgressTreeDelegate.cpp
@@ -1,7 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
- * Copyright 2017, Adriaan de Groot <groot@kde.org>
+ * Copyright 2017, 2019, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,28 +18,18 @@
*/
#include "ProgressTreeDelegate.h"
+#include "ProgressTreeModel.h"
#include "Branding.h"
#include "CalamaresApplication.h"
#include "CalamaresWindow.h"
-#include "ProgressTreeModel.h"
-#include "ViewManager.h"
-#include "ViewStepItem.h"
#include "utils/CalamaresUtilsGui.h"
-#include <QAbstractItemView>
#include <QPainter>
-#define ITEM_MARGIN 12
-#define VS_FONTSIZE CalamaresUtils::defaultFontSize() + 4
-
-ProgressTreeDelegate::ProgressTreeDelegate( QAbstractItemView* parent )
- : QStyledItemDelegate( parent )
- , m_parent( parent )
-{
-}
-
+static constexpr int const item_margin = 8;
+static inline int item_fontsize() { return CalamaresUtils::defaultFontSize() + 4; }
QSize
ProgressTreeDelegate::sizeHint( const QStyleOptionViewItem& option,
@@ -50,11 +40,11 @@ ProgressTreeDelegate::sizeHint( const QStyleOptionViewItem& option,
QFont font = qApp->font();
- font.setPointSize( VS_FONTSIZE );
+ font.setPointSize( item_fontsize() );
QFontMetrics fm( font );
int height = fm.height();
- height += 2*ITEM_MARGIN; //margin
+ height += 2 * item_margin;
return QSize( option.rect.width(), height );
}
@@ -88,12 +78,9 @@ ProgressTreeDelegate::paintViewStep( QPainter* painter,
const QStyleOptionViewItem& option,
const QModelIndex& index ) const
{
- QRect textRect = option.rect.adjusted( ITEM_MARGIN,
- ITEM_MARGIN,
- ITEM_MARGIN,
- ITEM_MARGIN );
+ QRect textRect = option.rect.adjusted( item_margin, item_margin, -item_margin, -item_margin );
QFont font = qApp->font();
- font.setPointSize( VS_FONTSIZE );
+ font.setPointSize( item_fontsize() );
font.setBold( false );
painter->setFont( font );
@@ -107,11 +94,37 @@ ProgressTreeDelegate::paintViewStep( QPainter* painter,
QString textHighlight = Calamares::Branding::instance()->
styleString( Calamares::Branding::SidebarTextHighlight );
if ( textHighlight.isEmpty() )
- painter->setBrush( APP->mainWindow()->palette().background() );
+ painter->setBrush( CalamaresApplication::instance()->mainWindow()->palette().background() );
else
painter->setBrush( QColor( textHighlight ) );
}
- painter->fillRect( option.rect, painter->brush().color() );
- painter->drawText( textRect, index.data().toString() );
+
+ // Draw the text at least once. If it doesn't fit, then shrink the font
+ // being used by 1 pt on each iteration, up to a maximum of maximumShrink
+ // times. On each loop, we'll have to blank out the rectangle again, so this
+ // is an expensive (in terms of drawing operations) thing to do.
+ //
+ // (The loop uses <= because the counter is incremented at the start).
+ static constexpr int const maximumShrink = 4;
+ int shrinkSteps = 0;
+ do
+ {
+ painter->fillRect( option.rect, painter->brush().color() );
+ shrinkSteps++;
+
+ QRectF boundingBox;
+ painter->drawText( textRect, Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextSingleLine, index.data().toString(), &boundingBox );
+
+ // The extra check here is to avoid the changing-font-size if we're not going to use
+ // it in the next iteration of the loop anyway.
+ if ( ( shrinkSteps <= maximumShrink ) && (boundingBox.width() > textRect.width() ) )
+ {
+ font.setPointSize( item_fontsize() - shrinkSteps );
+ painter->setFont( font );
+ }
+ else
+ break; // It fits
+ }
+ while ( shrinkSteps <= maximumShrink );
}
diff --git a/src/calamares/progresstree/ProgressTreeDelegate.h b/src/calamares/progresstree/ProgressTreeDelegate.h
index 371f5193fe64f6b0018673c4be55286afdbe3860..83b281696584cac1a8e7dd687a9af64d3743b6d1 100644
--- a/src/calamares/progresstree/ProgressTreeDelegate.h
+++ b/src/calamares/progresstree/ProgressTreeDelegate.h
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2019, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,7 +22,6 @@
#include <QStyledItemDelegate>
-
/**
* @brief The ProgressTreeDelegate class customizes the look and feel of the
* ProgressTreeView elements.
@@ -29,9 +29,8 @@
*/
class ProgressTreeDelegate : public QStyledItemDelegate
{
- Q_OBJECT
public:
- explicit ProgressTreeDelegate( QAbstractItemView* parent = nullptr );
+ using QStyledItemDelegate::QStyledItemDelegate;
protected:
QSize sizeHint( const QStyleOptionViewItem& option,
@@ -44,8 +43,6 @@ private:
void paintViewStep( QPainter* painter,
const QStyleOptionViewItem& option,
const QModelIndex& index ) const;
-
- QAbstractItemView* m_parent;
};
#endif // PROGRESSTREEDELEGATE_H
diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 4aa7c44df6678eb0c386a6ab901dc236b0ea1f6d..959b0a9dba17fc291f0eba2285e7d243108ccc04 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -1,3 +1,6 @@
+# libcalamares is the non-GUI part of Calamares, which includes handling
+# translations, configurations, logging, utilities, global storage, and (non-GUI) jobs.
+
add_definitions(
${QT_DEFINITIONS}
-DQT_SHARED
@@ -10,6 +13,9 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresConfig.h.in
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/../calamares/CalamaresVersion.h.in
${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersion.h )
+set( OPTIONAL_PRIVATE_LIBRARIES "" )
+set( OPTIONAL_PUBLIC_LIBRARIES "" )
+
set( libSources
CppJob.cpp
GlobalStorage.cpp
@@ -18,12 +24,24 @@ set( libSources
JobQueue.cpp
ProcessJob.cpp
Settings.cpp
-)
-set( utilsSources
+
+ # GeoIP services
+ geoip/Interface.cpp
+ geoip/GeoIPJSON.cpp
+ geoip/Handler.cpp
+
+ # Locale-data service
+ locale/Label.cpp
+ locale/LabelModel.cpp
+ locale/Lookup.cpp
+
+ # Partition service
+ partition/PartitionSize.cpp
+
+ # Utility service
utils/CalamaresUtilsSystem.cpp
utils/CommandList.cpp
utils/Dirs.cpp
- utils/LocaleLabel.cpp
utils/Logger.cpp
utils/PluginFactory.cpp
utils/Retranslator.cpp
@@ -45,9 +63,11 @@ include_directories(
${YAMLCPP_INCLUDE_DIR}
)
+### OPTIONAL Python support
+#
+#
if( WITH_PYTHON )
- set( libSources
- ${libSources}
+ list( APPEND libSources
PythonHelper.cpp
PythonJob.cpp
PythonJobApi.cpp
@@ -62,14 +82,25 @@ if( WITH_PYTHON )
include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
- set( OPTIONAL_PRIVATE_LIBRARIES
- ${OPTIONAL_PRIVATE_LIBRARIES}
+ list( APPEND OPTIONAL_PRIVATE_LIBRARIES
${PYTHON_LIBRARIES}
${Boost_LIBRARIES}
)
endif()
-add_library( calamares SHARED ${libSources} ${kdsagSources} ${utilsSources} )
+### OPTIONAL GeoIP XML support
+#
+#
+find_package(Qt5 COMPONENTS Xml)
+if( Qt5Xml_FOUND )
+ list( APPEND libSources geoip/GeoIPXML.cpp )
+ list( APPEND OPTIONAL_PUBLIC_LIBRARIES Qt5::Network Qt5::Xml )
+endif()
+
+### LIBRARY
+#
+#
+add_library( calamares SHARED ${libSources} ${kdsagSources} )
set_target_properties( calamares
PROPERTIES
VERSION ${CALAMARES_VERSION_SHORT}
@@ -83,6 +114,7 @@ target_link_libraries( calamares
LINK_PUBLIC
${YAMLCPP_LIBRARY}
Qt5::Core
+ ${OPTIONAL_PUBLIC_LIBRARIES}
)
install( TARGETS calamares
@@ -92,19 +124,6 @@ install( TARGETS calamares
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
-if ( ECM_FOUND AND BUILD_TESTING )
- ecm_add_test(
- Tests.cpp
- TEST_NAME
- libcalamarestest
- LINK_LIBRARIES
- calamares
- Qt5::Core
- Qt5::Test
- )
- calamares_automoc( libcalamarestest )
-endif()
-
# Make symlink lib/calamares/libcalamares.so to lib/libcalamares.so.VERSION so
# lib/calamares can be used as module path for the Python interpreter.
install( CODE "
@@ -121,3 +140,37 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h DESTINATION include
install( FILES ${rootHeaders} DESTINATION include/libcalamares )
install( FILES ${kdsingleapplicationguardHeaders} DESTINATION include/libcalamares/kdsingleapplicationguard )
install( FILES ${utilsHeaders} DESTINATION include/libcalamares/utils )
+
+### TESTING
+#
+#
+if ( ECM_FOUND AND BUILD_TESTING )
+ ecm_add_test(
+ Tests.cpp
+ TEST_NAME
+ libcalamarestest
+ LINK_LIBRARIES
+ calamares
+ Qt5::Core
+ Qt5::Test
+ )
+ calamares_automoc( libcalamarestest )
+
+ ecm_add_test(
+ geoip/GeoIPTests.cpp
+ ${geoip_src}
+ TEST_NAME
+ geoiptest
+ LINK_LIBRARIES
+ calamares
+ Qt5::Test
+ ${YAMLCPP_LIBRARY}
+ )
+ calamares_automoc( geoiptest )
+endif()
+
+if( BUILD_TESTING )
+ add_executable( test_geoip geoip/test_geoip.cpp ${geoip_src} )
+ target_link_libraries( test_geoip calamares Qt5::Network ${YAMLCPP_LIBRARY} )
+ calamares_automoc( test_geoip )
+endif()
diff --git a/src/libcalamares/CppJob.h b/src/libcalamares/CppJob.h
index d2f5c0f79a75a4211845933fa7e95e027b740929..36116b3e7f314f3a4d519b8ba5445ded4fd4739d 100644
--- a/src/libcalamares/CppJob.h
+++ b/src/libcalamares/CppJob.h
@@ -24,7 +24,6 @@
#include <QVariant>
#include "DllMacro.h"
-#include "Typedefs.h"
#include "Job.h"
namespace Calamares
diff --git a/src/libcalamares/Job.h b/src/libcalamares/Job.h
index 14924af35d5c85dd21e17014da5c880bd083a724..f590ef0eeeae1f35218af9c8cef19e9bf05273fe 100644
--- a/src/libcalamares/Job.h
+++ b/src/libcalamares/Job.h
@@ -20,9 +20,10 @@
#define CALAMARES_JOB_H
#include "DllMacro.h"
-#include "Typedefs.h"
+#include <QList>
#include <QObject>
+#include <QSharedPointer>
namespace Calamares {
@@ -97,6 +98,9 @@ private:
bool m_emergency = false;
};
+using job_ptr = QSharedPointer< Job >;
+using JobList = QList< job_ptr >;
+
} // namespace Calamares
#endif // CALAMARES_JOB_H
diff --git a/src/libcalamares/JobQueue.h b/src/libcalamares/JobQueue.h
index 5273e00430d00d1c54f813837f196f38c8af762a..4e5dffe8a3d20747a3c0c98370334dcc5becef35 100644
--- a/src/libcalamares/JobQueue.h
+++ b/src/libcalamares/JobQueue.h
@@ -20,7 +20,7 @@
#define CALAMARES_JOBQUEUE_H
#include "DllMacro.h"
-#include "Typedefs.h"
+#include "Job.h"
#include <QObject>
diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp
index 0b12d87fb650f5cfa22c30515594b8714d7d1c99..0089b2ef2fd605e79ad4cffc16b2c23ddca6fcd7 100644
--- a/src/libcalamares/Settings.cpp
+++ b/src/libcalamares/Settings.cpp
@@ -21,7 +21,6 @@
#include "Settings.h"
-// #include "utils/CalamaresUtils.h"
#include "utils/Dirs.h"
#include "utils/Logger.h"
#include "utils/Yaml.h"
diff --git a/src/libcalamares/Settings.h b/src/libcalamares/Settings.h
index da3f469216983535cb007675be27e7b8160cb3c1..ca77859c31ae5eed8de102450e2bdb4539d97318 100644
--- a/src/libcalamares/Settings.h
+++ b/src/libcalamares/Settings.h
@@ -22,8 +22,8 @@
#ifndef SETTINGS_H
#define SETTINGS_H
-#include "UiDllMacro.h"
-#include "Typedefs.h"
+#include "DllMacro.h"
+#include "modulesystem/Actions.h"
#include <QObject>
#include <QStringList>
@@ -32,7 +32,7 @@
namespace Calamares
{
-class UIDLLEXPORT Settings : public QObject
+class DLLEXPORT Settings : public QObject
{
Q_OBJECT
public:
@@ -41,7 +41,6 @@ public:
QObject* parent = nullptr );
static Settings* instance();
- //TODO: load from YAML then emit ready
QStringList modulesSearchPaths() const;
@@ -63,9 +62,6 @@ public:
*
* This influences user-visible strings, for instance using the
* word "setup" instead of "install" where relevant.
- *
- * NOTE: it's a synonym for !doChroot() for now, but may become
- * an independent setting.
*/
bool isSetupMode() const { return m_isSetupMode; }
diff --git a/src/modules/locale/GeoIPJSON.cpp b/src/libcalamares/geoip/GeoIPJSON.cpp
similarity index 77%
rename from src/modules/locale/GeoIPJSON.cpp
rename to src/libcalamares/geoip/GeoIPJSON.cpp
index 8e5cc2e5ce2a297550ef184b45ebc6c50b29c6e3..61b9fd8d6206ca0b4259ba5e918082562451e5f9 100644
--- a/src/modules/locale/GeoIPJSON.cpp
+++ b/src/libcalamares/geoip/GeoIPJSON.cpp
@@ -25,11 +25,20 @@
#include <QByteArray>
+namespace CalamaresUtils::GeoIP
+{
+
GeoIPJSON::GeoIPJSON(const QString& attribute)
- : GeoIP( attribute.isEmpty() ? QStringLiteral( "time_zone" ) : attribute )
+ : Interface( attribute.isEmpty() ? QStringLiteral( "time_zone" ) : attribute )
{
}
+/** @brief Indexes into a map @m by selectors @p l
+ *
+ * Each element of @p l is an index into map @m or a sub-map thereof,
+ * so that "foo.bar.baz" looks up "baz" in the sub-map "bar" of sub-map
+ * "foo" of @p m, like a regular JSON lookup would.
+ */
static QString
selectMap( const QVariantMap& m, const QStringList& l, int index)
{
@@ -48,8 +57,8 @@ selectMap( const QVariantMap& m, const QStringList& l, int index)
}
}
-GeoIP::RegionZonePair
-GeoIPJSON::processReply( const QByteArray& data )
+QString
+GeoIPJSON::rawReply( const QByteArray& data )
{
try
{
@@ -60,7 +69,7 @@ GeoIPJSON::processReply( const QByteArray& data )
var.isValid() &&
var.type() == QVariant::Map )
{
- return splitTZString( selectMap( var.toMap(), m_element.split('.'), 0 ) );
+ return selectMap( var.toMap(), m_element.split('.'), 0 );
}
else
cWarning() << "Invalid YAML data for GeoIPJSON";
@@ -70,5 +79,15 @@ GeoIPJSON::processReply( const QByteArray& data )
CalamaresUtils::explainYamlException( e, data, "GeoIP data");
}
- return qMakePair( QString(), QString() );
+ return QString();
+}
+
+GeoIP::RegionZonePair
+GeoIPJSON::processReply( const QByteArray& data )
+{
+ return splitTZString( rawReply( data ) );
}
+
+
+
+} // namespace
diff --git a/src/modules/locale/GeoIPJSON.h b/src/libcalamares/geoip/GeoIPJSON.h
similarity index 75%
rename from src/modules/locale/GeoIPJSON.h
rename to src/libcalamares/geoip/GeoIPJSON.h
index 3c08f577ba6ae6a5284dc6dd7b8f645e24f31a16..584825d70642c76d6f4b4edb8de2f20c2c95ea7c 100644
--- a/src/modules/locale/GeoIPJSON.h
+++ b/src/libcalamares/geoip/GeoIPJSON.h
@@ -1,6 +1,6 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
- * Copyright 2018, Adriaan de Groot <groot@kde.org>
+ * Copyright 2018-2019, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,19 +16,23 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GEOIPJSON_H
-#define GEOIPJSON_H
+#ifndef GEOIP_GEOIPJSON_H
+#define GEOIP_GEOIPJSON_H
-#include "GeoIP.h"
+#include "Interface.h"
+namespace CalamaresUtils::GeoIP
+{
/** @brief GeoIP lookup for services that return JSON.
*
* This is the original implementation of GeoIP lookup,
* (e.g. using the FreeGeoIP.net service), or similar.
*
* The data is assumed to be in JSON format with a time_zone attribute.
+ *
+ * @note This class is an implementation detail.
*/
-class GeoIPJSON : public GeoIP
+class GeoIPJSON : public Interface
{
public:
/** @brief Configure the attribute name which is selected.
@@ -38,7 +42,9 @@ public:
*/
explicit GeoIPJSON( const QString& attribute = QString() );
- virtual RegionZonePair processReply( const QByteArray& );
+ virtual RegionZonePair processReply( const QByteArray& ) override;
+ virtual QString rawReply(const QByteArray & ) override;
} ;
+} // namespace
#endif
diff --git a/src/modules/locale/GeoIPTests.cpp b/src/libcalamares/geoip/GeoIPTests.cpp
similarity index 89%
rename from src/modules/locale/GeoIPTests.cpp
rename to src/libcalamares/geoip/GeoIPTests.cpp
index af114611ec2f425e13b7a3598a5d4ebfb2b36ad8..ec7511370270848f2c409e14f59d99c8863061bf 100644
--- a/src/modules/locale/GeoIPTests.cpp
+++ b/src/libcalamares/geoip/GeoIPTests.cpp
@@ -19,9 +19,10 @@
#include "GeoIPTests.h"
#include "GeoIPJSON.h"
-#ifdef HAVE_XML
+#ifdef QT_XML_LIB
#include "GeoIPXML.h"
#endif
+#include "Handler.h"
#include <QNetworkAccessManager>
#include <QNetworkReply>
@@ -31,6 +32,8 @@
QTEST_GUILESS_MAIN( GeoIPTests )
+using namespace CalamaresUtils::GeoIP;
+
GeoIPTests::GeoIPTests()
{
}
@@ -118,7 +121,7 @@ static const char xml_data_ubiquity[] =
void
GeoIPTests::testXML()
{
-#ifdef HAVE_XML
+#ifdef QT_XML_LIB
GeoIPXML handler;
auto tz = handler.processReply( xml_data_ubiquity );
@@ -133,7 +136,7 @@ GeoIPTests::testXML2()
static const char data[] =
"<Response><TimeZone>America/North Dakota/Beulah</TimeZone></Response>"; // With a space!
-#ifdef HAVE_XML
+#ifdef QT_XML_LIB
GeoIPXML handler;
auto tz = handler.processReply( data );
@@ -145,7 +148,7 @@ GeoIPTests::testXML2()
void GeoIPTests::testXMLalt()
{
-#ifdef HAVE_XML
+#ifdef QT_XML_LIB
GeoIPXML handler( "ZT" );
auto tz = handler.processReply( "<A><B/><C><ZT>Moon/Dark_side</ZT></C></A>" );
@@ -157,7 +160,7 @@ void GeoIPTests::testXMLalt()
void
GeoIPTests::testXMLbad()
{
-#ifdef HAVE_XML
+#ifdef QT_XML_LIB
GeoIPXML handler;
auto tz = handler.processReply( "{time_zone: \"Europe/Paris\"}" );
QCOMPARE( tz.first, QString() );
@@ -172,24 +175,25 @@ GeoIPTests::testXMLbad()
void GeoIPTests::testSplitTZ()
{
- auto tz = GeoIP::splitTZString( QStringLiteral("Moon/Dark_side") );
+ using namespace CalamaresUtils::GeoIP;
+ auto tz = splitTZString( QStringLiteral("Moon/Dark_side") );
QCOMPARE( tz.first, QStringLiteral("Moon") );
QCOMPARE( tz.second, QStringLiteral("Dark_side") );
// Some providers return weirdly escaped data
- tz = GeoIP::splitTZString( QStringLiteral("America\\/NewYork") );
+ tz = splitTZString( QStringLiteral("America\\/NewYork") );
QCOMPARE( tz.first, QStringLiteral("America") );
QCOMPARE( tz.second, QStringLiteral("NewYork") ); // That's not actually the zone name
// Check that bogus data fails
- tz = GeoIP::splitTZString( QString() );
+ tz = splitTZString( QString() );
QCOMPARE( tz.first, QString() );
- tz = GeoIP::splitTZString( QStringLiteral("America.NewYork") );
+ tz = splitTZString( QStringLiteral("America.NewYork") );
QCOMPARE( tz.first, QString() );
// Check that three-level is split properly and space is replaced
- tz = GeoIP::splitTZString( QStringLiteral("America/North Dakota/Beulah") );
+ tz = splitTZString( QStringLiteral("America/North Dakota/Beulah") );
QCOMPARE( tz.first, QStringLiteral("America") );
QCOMPARE( tz.second, QStringLiteral("North_Dakota/Beulah") );
}
@@ -216,14 +220,18 @@ synchronous_get( const char* urlstring )
#define CHECK_GET(t, selector, url) \
{ \
auto tz = GeoIP##t( selector ).processReply( synchronous_get( url ) ); \
+ qDebug() << tz; \
QCOMPARE( default_tz, tz ); \
+ auto tz2 = CalamaresUtils::GeoIP::Handler( ""#t, url, selector ).get(); \
+ qDebug() << tz2; \
+ QCOMPARE( default_tz, tz2 ); \
}
void GeoIPTests::testGet()
{
if ( !QProcessEnvironment::systemEnvironment().contains( QStringLiteral("TEST_HTTP_GET") ) )
{
- qDebug() << "Skipping HTTP GET tests";
+ qDebug() << "Skipping HTTP GET tests, set TEST_HTTP_GET environment variable to enable";
return;
}
@@ -241,15 +249,12 @@ void GeoIPTests::testGet()
// the TZ data is the same as the default_tz; this is fragile if the
// services don't agree on the location of where the test is run.
CHECK_GET( JSON, QString(), "https://geoip.kde.org/v1/calamares" ) // Check it's consistent
- CHECK_GET( JSON, QString(), "http://freegeoip.net/json/" ) // Original FreeGeoIP service
CHECK_GET( JSON, QStringLiteral("timezone"), "https://ipapi.co/json" ) // Different JSON
CHECK_GET( JSON, QStringLiteral("timezone"), "http://ip-api.com/json" )
- CHECK_GET( JSON, QStringLiteral("location.time_zone"), "http://geoip.nekudo.com/api/" ) // 2-level JSON
-
CHECK_GET( JSON, QStringLiteral("Location.TimeZone"), "https://geoip.kde.org/debug" ) // 2-level JSON
-#ifdef HAVE_XML
+#ifdef QT_XML_LIB
CHECK_GET( XML, QString(), "http://geoip.ubuntu.com/lookup" ) // Ubiquity's XML format
CHECK_GET( XML, QString(), "https://geoip.kde.org/v1/ubiquity" ) // Temporary KDE service
#endif
diff --git a/src/modules/locale/GeoIPTests.h b/src/libcalamares/geoip/GeoIPTests.h
similarity index 100%
rename from src/modules/locale/GeoIPTests.h
rename to src/libcalamares/geoip/GeoIPTests.h
diff --git a/src/modules/locale/GeoIPXML.cpp b/src/libcalamares/geoip/GeoIPXML.cpp
similarity index 61%
rename from src/modules/locale/GeoIPXML.cpp
rename to src/libcalamares/geoip/GeoIPXML.cpp
index bd675c2ef7cfc58cc82cf7ff578b754ed5c11c90..a4b9bb14618b09370772234330817090785f6a6d 100644
--- a/src/modules/locale/GeoIPXML.cpp
+++ b/src/libcalamares/geoip/GeoIPXML.cpp
@@ -23,38 +23,68 @@
#include <QNetworkReply>
#include <QtXml/QDomDocument>
+namespace CalamaresUtils::GeoIP
+{
+
GeoIPXML::GeoIPXML( const QString& element )
- : GeoIP( element.isEmpty() ? QStringLiteral( "TimeZone" ) : element )
+ : Interface( element.isEmpty() ? QStringLiteral( "TimeZone" ) : element )
{
}
-GeoIP::RegionZonePair
-GeoIPXML::processReply( const QByteArray& data )
+static QStringList
+getElementTexts( const QByteArray& data, const QString& tag )
{
+ QStringList elements;
+
QString domError;
int errorLine, errorColumn;
QDomDocument doc;
if ( doc.setContent( data, false, &domError, &errorLine, &errorColumn ) )
{
- const auto tzElements = doc.elementsByTagName( m_element );
+ const auto tzElements = doc.elementsByTagName( tag );
cDebug() << "GeoIP found" << tzElements.length() << "elements";
for ( int it = 0; it < tzElements.length(); ++it )
{
auto e = tzElements.at(it).toElement();
- auto tz = splitTZString( e.text() );
- if ( !tz.first.isEmpty() )
- return tz;
+ auto e_text = e.text();
+ if ( !e_text.isEmpty() )
+ elements.append( e_text );
}
-
- // None of them valid
- cWarning() << "GeopIP XML had no recognizable timezone";
- return qMakePair( QString(), QString() );
}
else
{
cWarning() << "GeoIP XML data error:" << domError << "(line" << errorLine << errorColumn << ')';
}
- return qMakePair( QString(), QString() );
+ if ( elements.count() < 1 )
+ cWarning() << "GeopIP XML had no non-empty elements" << tag;
+
+ return elements;
}
+
+
+QString
+GeoIPXML::rawReply( const QByteArray& data )
+{
+ for ( const auto& e : getElementTexts( data, m_element ) )
+ if ( !e.isEmpty() )
+ return e;
+
+ return QString();
+}
+
+GeoIP::RegionZonePair
+GeoIPXML::processReply( const QByteArray& data )
+{
+ for ( const auto& e : getElementTexts( data, m_element ) )
+ {
+ auto tz = splitTZString( e );
+ if ( !tz.first.isEmpty() )
+ return tz;
+ }
+
+ return RegionZonePair();
+}
+
+} // namespace
diff --git a/src/modules/locale/GeoIPXML.h b/src/libcalamares/geoip/GeoIPXML.h
similarity index 76%
rename from src/modules/locale/GeoIPXML.h
rename to src/libcalamares/geoip/GeoIPXML.h
index bc3f23becedc0fd59965b8723d70701a1eeef042..7dee2ecbe325e335dca5bce27398ff86109ff6fe 100644
--- a/src/modules/locale/GeoIPXML.h
+++ b/src/libcalamares/geoip/GeoIPXML.h
@@ -1,6 +1,6 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
- * Copyright 2018, Adriaan de Groot <groot@kde.org>
+ * Copyright 2018-2019, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,19 +16,23 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GEOIPXML_H
-#define GEOIPXML_H
+#ifndef GEOIP_GEOIPXML_H
+#define GEOIP_GEOIPXML_H
-#include "GeoIP.h"
+#include "Interface.h"
+namespace CalamaresUtils::GeoIP
+{
/** @brief GeoIP lookup with XML data
*
* The data is assumed to be in XML format with a
* <Response><TimeZone></TimeZone></Response>
* element, which contains the text (string) for the region/zone. This
* format is expected by, e.g. the Ubiquity installer.
+ *
+ * @note This class is an implementation detail.
*/
-class GeoIPXML : public GeoIP
+class GeoIPXML : public Interface
{
public:
/** @brief Configure the element tag which is selected.
@@ -38,7 +42,9 @@ public:
*/
explicit GeoIPXML( const QString& element = QString() );
- virtual RegionZonePair processReply( const QByteArray& );
+ virtual RegionZonePair processReply( const QByteArray& ) override;
+ virtual QString rawReply(const QByteArray & ) override;
} ;
+} // namespace
#endif
diff --git a/src/libcalamares/geoip/Handler.cpp b/src/libcalamares/geoip/Handler.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..1e8b03b261c08cfb1f8d371c8f9130321ee29776
--- /dev/null
+++ b/src/libcalamares/geoip/Handler.cpp
@@ -0,0 +1,183 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ * Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ * Calamares is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Calamares is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Handler.h"
+
+#include "GeoIPJSON.h"
+#if defined(QT_XML_LIB)
+#include "GeoIPXML.h"
+#endif
+
+#include "utils/Logger.h"
+#include "utils/NamedEnum.h"
+#include "utils/Variant.h"
+
+#include <QEventLoop>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+
+#include <memory>
+
+static const NamedEnumTable< CalamaresUtils::GeoIP::Handler::Type >&
+handlerTypes()
+{
+ using Type = CalamaresUtils::GeoIP::Handler::Type;
+
+ static const NamedEnumTable<Type> names{
+ { QStringLiteral( "none" ), Type::None},
+ { QStringLiteral( "json" ), Type::JSON},
+ { QStringLiteral( "xml" ), Type::XML}
+ };
+
+ return names;
+}
+
+namespace CalamaresUtils::GeoIP
+{
+
+Handler::Handler()
+ : m_type( Type::None )
+{
+}
+
+Handler::Handler( const QString& implementation, const QString& url, const QString& selector )
+ : m_type( Type::None )
+ , m_url( url )
+ , m_selector( selector )
+{
+ bool ok = false;
+ m_type = handlerTypes().find( implementation, ok );
+#if !defined(QT_XML_LIB)
+ if ( m_type == Type::XML )
+ {
+ m_type = Type::None;
+ cWarning() << "GeoIP style XML is not supported in this version of Calamares.";
+ }
+#endif
+ if ( !ok )
+ {
+ cWarning() << "GeoIP Style" << implementation << "is not recognized.";
+ }
+}
+
+Handler::~Handler()
+{
+}
+
+static QByteArray
+synchronous_get( const QString& urlstring )
+{
+ QUrl url( urlstring );
+ QNetworkAccessManager manager;
+ QEventLoop loop;
+
+ QObject::connect( &manager, &QNetworkAccessManager::finished, &loop, &QEventLoop::quit );
+
+ QNetworkRequest request( url );
+ QNetworkReply* reply = manager.get( request );
+ loop.exec();
+ reply->deleteLater();
+ return reply->readAll();
+}
+
+static std::unique_ptr< Interface >
+create_interface( Handler::Type t, const QString& selector )
+{
+ switch( t )
+ {
+ case Handler::Type::None:
+ return nullptr;
+ case Handler::Type::JSON:
+ return std::make_unique< GeoIPJSON >( selector );
+ case Handler::Type::XML:
+#if defined(QT_XML_LIB)
+ return std::make_unique< GeoIPXML >( selector );
+#else
+ return nullptr;
+#endif
+ default: // there are no others
+ return nullptr;
+ }
+}
+
+static RegionZonePair
+do_query( Handler::Type type, const QString& url, const QString& selector )
+{
+ const auto interface = create_interface( type, selector );
+ if ( !interface )
+ return RegionZonePair();
+
+ return interface->processReply( synchronous_get( url ) );
+}
+
+static QString
+do_raw_query( Handler::Type type, const QString& url, const QString& selector )
+{
+ const auto interface = create_interface( type, selector );
+ if ( !interface )
+ return QString();
+
+ return interface->rawReply( synchronous_get( url ) );
+}
+
+RegionZonePair
+Handler::get() const
+{
+ if ( !isValid() )
+ return RegionZonePair();
+ return do_query( m_type, m_url, m_selector );
+}
+
+
+QFuture< RegionZonePair >
+Handler::query() const
+{
+ Handler::Type type = m_type;
+ QString url = m_url;
+ QString selector = m_selector;
+
+ return QtConcurrent::run( [=]
+ {
+ return do_query( type, url, selector );
+ } );
+}
+
+QString
+Handler::getRaw() const
+{
+ if ( !isValid() )
+ return QString();
+ return do_raw_query( m_type, m_url, m_selector );
+}
+
+
+QFuture< QString >
+Handler::queryRaw() const
+{
+ Handler::Type type = m_type;
+ QString url = m_url;
+ QString selector = m_selector;
+
+ return QtConcurrent::run( [=]
+ {
+ return do_raw_query( type, url, selector );
+ } );
+}
+
+
+} // namespace
diff --git a/src/libcalamares/geoip/Handler.h b/src/libcalamares/geoip/Handler.h
new file mode 100644
index 0000000000000000000000000000000000000000..92e5f326e8387f035c0130462d90a59268bba338
--- /dev/null
+++ b/src/libcalamares/geoip/Handler.h
@@ -0,0 +1,91 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ * Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ * Calamares is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Calamares is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GEOIP_HANDLER_H
+#define GEOIP_HANDLER_H
+
+#include "Interface.h"
+
+#include <QtConcurrent/QtConcurrentRun>
+#include <QString>
+#include <QVariantMap>
+
+namespace CalamaresUtils {}
+namespace CalamaresUtils::GeoIP
+{
+
+/** @brief Handle one complete GeoIP lookup.
+ *
+ * This class handles one complete GeoIP lookup. Create it with
+ * suitable configuration values, then call get(). This is a
+ * synchronous API and will return an invalid zone pair on
+ * error or if the configuration is not understood. For an
+ * async API, use query().
+ */
+class DLLEXPORT Handler
+{
+public:
+ enum class Type
+ {
+ None,
+ JSON,
+ XML
+ } ;
+
+ /** @brief An unconfigured handler; this always returns errors. */
+ Handler();
+ /** @brief A handler for a specific GeoIP source.
+ *
+ * The @p implementation name selects an implementation; currently JSON and XML
+ * are supported. The @p url is retrieved by query() and then the @p selector
+ * is used to select something from the data returned by the @url.
+ */
+ Handler( const QString& implementation, const QString& url, const QString& selector );
+
+ ~Handler();
+
+ /** @brief Synchronously get the GeoIP result.
+ *
+ * If the Handler is valid, then do the actual fetching and interpretation
+ * of data and return the result. An invalid Handler will return an
+ * invalid (empty) result.
+ */
+ RegionZonePair get() const;
+ /// @brief Like get, but don't interpret the contents
+ QString getRaw() const;
+
+ /** @brief Asynchronously get the GeoIP result.
+ *
+ * See get() for the return value.
+ */
+ QFuture< RegionZonePair > query() const;
+ /// @brief Like query, but don't interpret the contents
+ QFuture< QString > queryRaw() const;
+
+ bool isValid() const { return m_type != Type::None; }
+ Type type() const { return m_type; }
+
+private:
+ Type m_type;
+ const QString m_url;
+ const QString m_selector;
+};
+
+} // namespace
+#endif
+
diff --git a/src/modules/locale/GeoIP.cpp b/src/libcalamares/geoip/Interface.cpp
similarity index 81%
rename from src/modules/locale/GeoIP.cpp
rename to src/libcalamares/geoip/Interface.cpp
index 4c031f2860a69f563786d05bcf69461c29d3ad1e..50aa04683107d0c5135e9882d4d89bffa3fe8929 100644
--- a/src/modules/locale/GeoIP.cpp
+++ b/src/libcalamares/geoip/Interface.cpp
@@ -16,21 +16,24 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "GeoIP.h"
+#include "Interface.h"
#include "utils/Logger.h"
-GeoIP::GeoIP(const QString& e)
+namespace CalamaresUtils::GeoIP
+{
+
+Interface::Interface(const QString& e)
: m_element( e )
{
}
-GeoIP::~GeoIP()
+Interface::~Interface()
{
}
-GeoIP::RegionZonePair
-GeoIP::splitTZString( const QString& tz )
+RegionZonePair
+splitTZString( const QString& tz )
{
QString timezoneString( tz );
timezoneString.remove( '\\' );
@@ -42,8 +45,10 @@ GeoIP::splitTZString( const QString& tz )
cDebug() << "GeoIP reporting" << timezoneString;
QString region = tzParts.takeFirst();
QString zone = tzParts.join( '/' );
- return qMakePair( region, zone );
+ return RegionZonePair( region, zone );
}
- return qMakePair( QString(), QString() );
+ return RegionZonePair( QString(), QString() );
}
+
+} // namespace
diff --git a/src/libcalamares/geoip/Interface.h b/src/libcalamares/geoip/Interface.h
new file mode 100644
index 0000000000000000000000000000000000000000..4b2ff3a5a76f4c508d83ac3467f98a7dc9e52f7a
--- /dev/null
+++ b/src/libcalamares/geoip/Interface.h
@@ -0,0 +1,98 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ * Copyright 2018-2019, Adriaan de Groot <groot@kde.org>
+ *
+ * Calamares is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Calamares is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GEOIP_INTERFACE_H
+#define GEOIP_INTERFACE_H
+
+#include "DllMacro.h"
+
+#include <QPair>
+#include <QString>
+#include <QUrl>
+
+class QByteArray;
+
+namespace CalamaresUtils {}
+namespace CalamaresUtils::GeoIP
+{
+/** @brief A Region, Zone pair of strings
+ *
+ * A GeoIP lookup returns a timezone, which is represented as a Region,
+ * Zone pair of strings (e.g. "Europe" and "Amsterdam"). Generally,
+ * pasting the strings back together with a "/" is the right thing to
+ * do. The Zone **may** contain a "/" (e.g. "Kentucky/Monticello").
+ */
+class DLLEXPORT RegionZonePair : public QPair<QString, QString>
+{
+public:
+ /** @brief Construct from an existing pair. */
+ explicit RegionZonePair( const QPair& p ) : QPair(p) { }
+ /** @brief Construct from two strings, like qMakePair(). */
+ RegionZonePair( const QString& region, const QString& zone ) : QPair( region, zone ) { }
+ /** @brief An invalid zone pair (empty strings). */
+ RegionZonePair() : QPair( QString(), QString() ) { }
+
+ bool isValid() const { return !first.isEmpty(); }
+} ;
+
+/** @brief Splits a region/zone string into a pair.
+ *
+ * Cleans up the string by removing backslashes (\\)
+ * since some providers return silly-escaped names. Replaces
+ * spaces with _ since some providers return human-readable names.
+ * Splits on the first / in the resulting string, or returns a
+ * pair of empty QStrings if it can't. (e.g. America/North Dakota/Beulah
+ * will return "America", "North_Dakota/Beulah").
+ */
+DLLEXPORT RegionZonePair
+splitTZString( const QString& s );
+
+/**
+ * @brief Interface for GeoIP retrievers.
+ *
+ * A GeoIP retriever takes a configured URL (from the config file)
+ * and can handle the data returned from its interpretation of that
+ * configured URL, returning a region and zone.
+ */
+class DLLEXPORT Interface
+{
+public:
+ virtual ~Interface();
+
+ /** @brief Handle a (successful) request by interpreting the data.
+ *
+ * Should return a ( <zone>, <region> ) pair, e.g.
+ * ( "Europe", "Amsterdam" ). This is called **only** if the
+ * request to the fullUrl was successful; the handler
+ * is free to read as much, or as little, data as it
+ * likes. On error, returns a RegionZonePair with empty
+ * strings (e.g. ( "", "" ) ).
+ */
+ virtual RegionZonePair processReply( const QByteArray& ) = 0;
+
+ /** @brief Get the raw reply data. */
+ virtual QString rawReply( const QByteArray& ) = 0;
+
+protected:
+ Interface( const QString& e = QString() );
+
+ QString m_element; // string for selecting from data
+} ;
+
+} // namespace
+#endif
diff --git a/src/modules/locale/test_geoip.cpp b/src/libcalamares/geoip/test_geoip.cpp
similarity index 94%
rename from src/modules/locale/test_geoip.cpp
rename to src/libcalamares/geoip/test_geoip.cpp
index 89c1b6030ae7b95b932edbe89dbc4aabcd9c273c..5f7ab935cc5ed569bb9d62ecdf5135095fce6a11 100644
--- a/src/modules/locale/test_geoip.cpp
+++ b/src/libcalamares/geoip/test_geoip.cpp
@@ -23,11 +23,12 @@
#include <iostream>
#include "GeoIPJSON.h"
-#ifdef HAVE_XML
+#ifdef QT_XML_LIB
#include "GeoIPXML.h"
#endif
using std::cerr;
+using namespace CalamaresUtils::GeoIP;
int main(int argc, char** argv)
{
@@ -37,10 +38,10 @@ int main(int argc, char** argv)
return 1;
}
- GeoIP* handler = nullptr;
+ Interface* handler = nullptr;
if ( QStringLiteral( "json" ) == argv[1] )
handler = new GeoIPJSON;
-#ifdef HAVE_XML
+#ifdef QT_XML_LIB
else if ( QStringLiteral( "xml" ) == argv[1] )
handler = new GeoIPXML;
#endif
diff --git a/src/libcalamares/locale/CountryData_p.cpp b/src/libcalamares/locale/CountryData_p.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a6e9b3a956a599c6cac2b00243703bcb1e371c3b
--- /dev/null
+++ b/src/libcalamares/locale/CountryData_p.cpp
@@ -0,0 +1,235 @@
+/* GENERATED FILE DO NOT EDIT
+*
+* === This file is part of Calamares - <https://github.com/calamares> ===
+*
+* This file is derived from CLDR data from Unicode, Inc. Applicable terms:
+*
+* A. Unicode Copyright
+* 1. Copyright © 1991-2019 Unicode, Inc. All rights reserved.
+* B. Definitions
+* Unicode Data Files ("DATA FILES") include all data files under the directories:
+* https://www.unicode.org/Public/
+* C. Terms of Use
+* 2. Any person is hereby authorized, without fee, to view, use, reproduce,
+* and distribute all documents and files, subject to the Terms and
+* Conditions herein.
+*/
+
+// BEGIN Generated from CLDR data
+
+
+struct CountryData
+{
+ QLocale::Language l;
+ QLocale::Country c;
+ char cc1;
+ char cc2;
+};
+
+static constexpr int const country_data_size = 198;
+
+static const CountryData country_data_table[] = {
+{ QLocale::Language::Catalan, QLocale::Country::Andorra, 'A', 'D' },
+{ QLocale::Language::Arabic, QLocale::Country::UnitedArabEmirates, 'A', 'E' },
+{ QLocale::Language::Persian, QLocale::Country::Afghanistan, 'A', 'F' },
+{ QLocale::Language::Albanian, QLocale::Country::Albania, 'A', 'L' },
+{ QLocale::Language::Armenian, QLocale::Country::Armenia, 'A', 'M' },
+{ QLocale::Language::Portuguese, QLocale::Country::Angola, 'A', 'O' },
+{ QLocale::Language::AnyLanguage, QLocale::Country::Antarctica, 'A', 'Q' },
+{ QLocale::Language::Spanish, QLocale::Country::Argentina, 'A', 'R' },
+{ QLocale::Language::Samoan, QLocale::Country::AmericanSamoa, 'A', 'S' },
+{ QLocale::Language::German, QLocale::Country::Austria, 'A', 'T' },
+{ QLocale::Language::Dutch, QLocale::Country::Aruba, 'A', 'W' },
+{ QLocale::Language::Swedish, QLocale::Country::AlandIslands, 'A', 'X' },
+{ QLocale::Language::Azerbaijani, QLocale::Country::Azerbaijan, 'A', 'Z' },
+{ QLocale::Language::Bosnian, QLocale::Country::BosniaAndHerzegowina, 'B', 'A' },
+{ QLocale::Language::Bengali, QLocale::Country::Bangladesh, 'B', 'D' },
+{ QLocale::Language::Dutch, QLocale::Country::Belgium, 'B', 'E' },
+{ QLocale::Language::French, QLocale::Country::BurkinaFaso, 'B', 'F' },
+{ QLocale::Language::Bulgarian, QLocale::Country::Bulgaria, 'B', 'G' },
+{ QLocale::Language::Arabic, QLocale::Country::Bahrain, 'B', 'H' },
+{ QLocale::Language::Rundi, QLocale::Country::Burundi, 'B', 'I' },
+{ QLocale::Language::French, QLocale::Country::Benin, 'B', 'J' },
+{ QLocale::Language::French, QLocale::Country::SaintBarthelemy, 'B', 'L' },
+{ QLocale::Language::Malay, QLocale::Country::Brunei, 'B', 'N' },
+{ QLocale::Language::Spanish, QLocale::Country::Bolivia, 'B', 'O' },
+{ QLocale::Language::Papiamento, QLocale::Country::Bonaire, 'B', 'Q' },
+{ QLocale::Language::Portuguese, QLocale::Country::Brazil, 'B', 'R' },
+{ QLocale::Language::Dzongkha, QLocale::Country::Bhutan, 'B', 'T' },
+{ QLocale::Language::AnyLanguage, QLocale::Country::BouvetIsland, 'B', 'V' },
+{ QLocale::Language::Belarusian, QLocale::Country::Belarus, 'B', 'Y' },
+{ QLocale::Language::Swahili, QLocale::Country::CongoKinshasa, 'C', 'D' },
+{ QLocale::Language::French, QLocale::Country::CentralAfricanRepublic, 'C', 'F' },
+{ QLocale::Language::French, QLocale::Country::CongoBrazzaville, 'C', 'G' },
+{ QLocale::Language::German, QLocale::Country::Switzerland, 'C', 'H' },
+{ QLocale::Language::French, QLocale::Country::IvoryCoast, 'C', 'I' },
+{ QLocale::Language::Spanish, QLocale::Country::Chile, 'C', 'L' },
+{ QLocale::Language::French, QLocale::Country::Cameroon, 'C', 'M' },
+{ QLocale::Language::Chinese, QLocale::Country::China, 'C', 'N' },
+{ QLocale::Language::Spanish, QLocale::Country::Colombia, 'C', 'O' },
+{ QLocale::Language::AnyLanguage, QLocale::Country::ClippertonIsland, 'C', 'P' },
+{ QLocale::Language::Spanish, QLocale::Country::CostaRica, 'C', 'R' },
+{ QLocale::Language::Spanish, QLocale::Country::Cuba, 'C', 'U' },
+{ QLocale::Language::Portuguese, QLocale::Country::CapeVerde, 'C', 'V' },
+{ QLocale::Language::Papiamento, QLocale::Country::CuraSao, 'C', 'W' },
+{ QLocale::Language::Greek, QLocale::Country::Cyprus, 'C', 'Y' },
+{ QLocale::Language::Czech, QLocale::Country::CzechRepublic, 'C', 'Z' },
+{ QLocale::Language::German, QLocale::Country::Germany, 'D', 'E' },
+{ QLocale::Language::Afar, QLocale::Country::Djibouti, 'D', 'J' },
+{ QLocale::Language::Danish, QLocale::Country::Denmark, 'D', 'K' },
+{ QLocale::Language::Spanish, QLocale::Country::DominicanRepublic, 'D', 'O' },
+{ QLocale::Language::Arabic, QLocale::Country::Algeria, 'D', 'Z' },
+{ QLocale::Language::Spanish, QLocale::Country::CeutaAndMelilla, 'E', 'A' },
+{ QLocale::Language::Spanish, QLocale::Country::Ecuador, 'E', 'C' },
+{ QLocale::Language::Estonian, QLocale::Country::Estonia, 'E', 'E' },
+{ QLocale::Language::Arabic, QLocale::Country::Egypt, 'E', 'G' },
+{ QLocale::Language::Arabic, QLocale::Country::WesternSahara, 'E', 'H' },
+{ QLocale::Language::Tigrinya, QLocale::Country::Eritrea, 'E', 'R' },
+{ QLocale::Language::Spanish, QLocale::Country::Spain, 'E', 'S' },
+{ QLocale::Language::Amharic, QLocale::Country::Ethiopia, 'E', 'T' },
+{ QLocale::Language::English, QLocale::Country::EuropeanUnion, 'E', 'U' },
+{ QLocale::Language::German, QLocale::Country::AnyCountry, 'E', 'Z' },
+{ QLocale::Language::Finnish, QLocale::Country::Finland, 'F', 'I' },
+{ QLocale::Language::Faroese, QLocale::Country::FaroeIslands, 'F', 'O' },
+{ QLocale::Language::French, QLocale::Country::France, 'F', 'R' },
+{ QLocale::Language::French, QLocale::Country::Gabon, 'G', 'A' },
+{ QLocale::Language::Georgian, QLocale::Country::Georgia, 'G', 'E' },
+{ QLocale::Language::French, QLocale::Country::FrenchGuiana, 'G', 'F' },
+{ QLocale::Language::Akan, QLocale::Country::Ghana, 'G', 'H' },
+{ QLocale::Language::Greenlandic, QLocale::Country::Greenland, 'G', 'L' },
+{ QLocale::Language::French, QLocale::Country::Guinea, 'G', 'N' },
+{ QLocale::Language::French, QLocale::Country::Guadeloupe, 'G', 'P' },
+{ QLocale::Language::Spanish, QLocale::Country::EquatorialGuinea, 'G', 'Q' },
+{ QLocale::Language::Greek, QLocale::Country::Greece, 'G', 'R' },
+{ QLocale::Language::AnyLanguage, QLocale::Country::SouthGeorgiaAndTheSouthSandwichIslands, 'G', 'S' },
+{ QLocale::Language::Spanish, QLocale::Country::Guatemala, 'G', 'T' },
+{ QLocale::Language::Portuguese, QLocale::Country::GuineaBissau, 'G', 'W' },
+{ QLocale::Language::Chinese, QLocale::Country::HongKong, 'H', 'K' },
+{ QLocale::Language::AnyLanguage, QLocale::Country::HeardAndMcDonaldIslands, 'H', 'M' },
+{ QLocale::Language::Spanish, QLocale::Country::Honduras, 'H', 'N' },
+{ QLocale::Language::Croatian, QLocale::Country::Croatia, 'H', 'R' },
+{ QLocale::Language::Haitian, QLocale::Country::Haiti, 'H', 'T' },
+{ QLocale::Language::Hungarian, QLocale::Country::Hungary, 'H', 'U' },
+{ QLocale::Language::Spanish, QLocale::Country::CanaryIslands, 'I', 'C' },
+{ QLocale::Language::Indonesian, QLocale::Country::Indonesia, 'I', 'D' },
+{ QLocale::Language::Hebrew, QLocale::Country::Israel, 'I', 'L' },
+{ QLocale::Language::Hindi, QLocale::Country::India, 'I', 'N' },
+{ QLocale::Language::Arabic, QLocale::Country::Iraq, 'I', 'Q' },
+{ QLocale::Language::Persian, QLocale::Country::Iran, 'I', 'R' },
+{ QLocale::Language::Icelandic, QLocale::Country::Iceland, 'I', 'S' },
+{ QLocale::Language::Italian, QLocale::Country::Italy, 'I', 'T' },
+{ QLocale::Language::Arabic, QLocale::Country::Jordan, 'J', 'O' },
+{ QLocale::Language::Japanese, QLocale::Country::Japan, 'J', 'P' },
+{ QLocale::Language::Swahili, QLocale::Country::Kenya, 'K', 'E' },
+{ QLocale::Language::Kirghiz, QLocale::Country::Kyrgyzstan, 'K', 'G' },
+{ QLocale::Language::Khmer, QLocale::Country::Cambodia, 'K', 'H' },
+{ QLocale::Language::Arabic, QLocale::Country::Comoros, 'K', 'M' },
+{ QLocale::Language::Korean, QLocale::Country::NorthKorea, 'K', 'P' },
+{ QLocale::Language::Korean, QLocale::Country::SouthKorea, 'K', 'R' },
+{ QLocale::Language::Arabic, QLocale::Country::Kuwait, 'K', 'W' },
+{ QLocale::Language::Russian, QLocale::Country::Kazakhstan, 'K', 'Z' },
+{ QLocale::Language::Lao, QLocale::Country::Laos, 'L', 'A' },
+{ QLocale::Language::Arabic, QLocale::Country::Lebanon, 'L', 'B' },
+{ QLocale::Language::German, QLocale::Country::Liechtenstein, 'L', 'I' },
+{ QLocale::Language::Sinhala, QLocale::Country::SriLanka, 'L', 'K' },
+{ QLocale::Language::SouthernSotho, QLocale::Country::Lesotho, 'L', 'S' },
+{ QLocale::Language::Lithuanian, QLocale::Country::Lithuania, 'L', 'T' },
+{ QLocale::Language::French, QLocale::Country::Luxembourg, 'L', 'U' },
+{ QLocale::Language::Latvian, QLocale::Country::Latvia, 'L', 'V' },
+{ QLocale::Language::Arabic, QLocale::Country::Libya, 'L', 'Y' },
+{ QLocale::Language::Arabic, QLocale::Country::Morocco, 'M', 'A' },
+{ QLocale::Language::French, QLocale::Country::Monaco, 'M', 'C' },
+{ QLocale::Language::Romanian, QLocale::Country::Moldova, 'M', 'D' },
+{ QLocale::Language::Serbian, QLocale::Country::Montenegro, 'M', 'E' },
+{ QLocale::Language::French, QLocale::Country::SaintMartin, 'M', 'F' },
+{ QLocale::Language::Malagasy, QLocale::Country::Madagascar, 'M', 'G' },
+{ QLocale::Language::Macedonian, QLocale::Country::Macedonia, 'M', 'K' },
+{ QLocale::Language::Bambara, QLocale::Country::Mali, 'M', 'L' },
+{ QLocale::Language::Burmese, QLocale::Country::Myanmar, 'M', 'M' },
+{ QLocale::Language::Mongolian, QLocale::Country::Mongolia, 'M', 'N' },
+{ QLocale::Language::Chinese, QLocale::Country::Macau, 'M', 'O' },
+{ QLocale::Language::French, QLocale::Country::Martinique, 'M', 'Q' },
+{ QLocale::Language::Arabic, QLocale::Country::Mauritania, 'M', 'R' },
+{ QLocale::Language::Maltese, QLocale::Country::Malta, 'M', 'T' },
+{ QLocale::Language::Morisyen, QLocale::Country::Mauritius, 'M', 'U' },
+{ QLocale::Language::Divehi, QLocale::Country::Maldives, 'M', 'V' },
+{ QLocale::Language::Spanish, QLocale::Country::Mexico, 'M', 'X' },
+{ QLocale::Language::Malay, QLocale::Country::Malaysia, 'M', 'Y' },
+{ QLocale::Language::Portuguese, QLocale::Country::Mozambique, 'M', 'Z' },
+{ QLocale::Language::Afrikaans, QLocale::Country::Namibia, 'N', 'A' },
+{ QLocale::Language::French, QLocale::Country::NewCaledonia, 'N', 'C' },
+{ QLocale::Language::Hausa, QLocale::Country::Niger, 'N', 'E' },
+{ QLocale::Language::Spanish, QLocale::Country::Nicaragua, 'N', 'I' },
+{ QLocale::Language::Dutch, QLocale::Country::Netherlands, 'N', 'L' },
+{ QLocale::Language::NorwegianBokmal, QLocale::Country::Norway, 'N', 'O' },
+{ QLocale::Language::Nepali, QLocale::Country::Nepal, 'N', 'P' },
+{ QLocale::Language::Arabic, QLocale::Country::Oman, 'O', 'M' },
+{ QLocale::Language::Spanish, QLocale::Country::Panama, 'P', 'A' },
+{ QLocale::Language::Spanish, QLocale::Country::Peru, 'P', 'E' },
+{ QLocale::Language::French, QLocale::Country::FrenchPolynesia, 'P', 'F' },
+{ QLocale::Language::TokPisin, QLocale::Country::PapuaNewGuinea, 'P', 'G' },
+{ QLocale::Language::Filipino, QLocale::Country::Philippines, 'P', 'H' },
+{ QLocale::Language::Urdu, QLocale::Country::Pakistan, 'P', 'K' },
+{ QLocale::Language::Polish, QLocale::Country::Poland, 'P', 'L' },
+{ QLocale::Language::French, QLocale::Country::SaintPierreAndMiquelon, 'P', 'M' },
+{ QLocale::Language::Spanish, QLocale::Country::PuertoRico, 'P', 'R' },
+{ QLocale::Language::Arabic, QLocale::Country::PalestinianTerritories, 'P', 'S' },
+{ QLocale::Language::Portuguese, QLocale::Country::Portugal, 'P', 'T' },
+{ QLocale::Language::Palauan, QLocale::Country::Palau, 'P', 'W' },
+{ QLocale::Language::Guarani, QLocale::Country::Paraguay, 'P', 'Y' },
+{ QLocale::Language::Arabic, QLocale::Country::Qatar, 'Q', 'A' },
+{ QLocale::Language::English, QLocale::Country::OutlyingOceania, 'Q', 'O' },
+{ QLocale::Language::French, QLocale::Country::Reunion, 'R', 'E' },
+{ QLocale::Language::Romanian, QLocale::Country::Romania, 'R', 'O' },
+{ QLocale::Language::Serbian, QLocale::Country::Serbia, 'R', 'S' },
+{ QLocale::Language::Russian, QLocale::Country::Russia, 'R', 'U' },
+{ QLocale::Language::Kinyarwanda, QLocale::Country::Rwanda, 'R', 'W' },
+{ QLocale::Language::Arabic, QLocale::Country::SaudiArabia, 'S', 'A' },
+{ QLocale::Language::French, QLocale::Country::Seychelles, 'S', 'C' },
+{ QLocale::Language::Arabic, QLocale::Country::Sudan, 'S', 'D' },
+{ QLocale::Language::Swedish, QLocale::Country::Sweden, 'S', 'E' },
+{ QLocale::Language::Slovenian, QLocale::Country::Slovenia, 'S', 'I' },
+{ QLocale::Language::NorwegianBokmal, QLocale::Country::SvalbardAndJanMayenIslands, 'S', 'J' },
+{ QLocale::Language::Slovak, QLocale::Country::Slovakia, 'S', 'K' },
+{ QLocale::Language::Italian, QLocale::Country::SanMarino, 'S', 'M' },
+{ QLocale::Language::French, QLocale::Country::Senegal, 'S', 'N' },
+{ QLocale::Language::Somali, QLocale::Country::Somalia, 'S', 'O' },
+{ QLocale::Language::Dutch, QLocale::Country::Suriname, 'S', 'R' },
+{ QLocale::Language::Portuguese, QLocale::Country::SaoTomeAndPrincipe, 'S', 'T' },
+{ QLocale::Language::Spanish, QLocale::Country::ElSalvador, 'S', 'V' },
+{ QLocale::Language::Arabic, QLocale::Country::Syria, 'S', 'Y' },
+{ QLocale::Language::French, QLocale::Country::Chad, 'T', 'D' },
+{ QLocale::Language::French, QLocale::Country::FrenchSouthernTerritories, 'T', 'F' },
+{ QLocale::Language::French, QLocale::Country::Togo, 'T', 'G' },
+{ QLocale::Language::Thai, QLocale::Country::Thailand, 'T', 'H' },
+{ QLocale::Language::Tajik, QLocale::Country::Tajikistan, 'T', 'J' },
+{ QLocale::Language::TokelauLanguage, QLocale::Country::Tokelau, 'T', 'K' },
+{ QLocale::Language::Portuguese, QLocale::Country::EastTimor, 'T', 'L' },
+{ QLocale::Language::Turkmen, QLocale::Country::Turkmenistan, 'T', 'M' },
+{ QLocale::Language::Arabic, QLocale::Country::Tunisia, 'T', 'N' },
+{ QLocale::Language::Tongan, QLocale::Country::Tonga, 'T', 'O' },
+{ QLocale::Language::Turkish, QLocale::Country::Turkey, 'T', 'R' },
+{ QLocale::Language::TuvaluLanguage, QLocale::Country::Tuvalu, 'T', 'V' },
+{ QLocale::Language::Chinese, QLocale::Country::Taiwan, 'T', 'W' },
+{ QLocale::Language::Swahili, QLocale::Country::Tanzania, 'T', 'Z' },
+{ QLocale::Language::Ukrainian, QLocale::Country::Ukraine, 'U', 'A' },
+{ QLocale::Language::Swahili, QLocale::Country::Uganda, 'U', 'G' },
+{ QLocale::Language::Spanish, QLocale::Country::Uruguay, 'U', 'Y' },
+{ QLocale::Language::Uzbek, QLocale::Country::Uzbekistan, 'U', 'Z' },
+{ QLocale::Language::Italian, QLocale::Country::VaticanCityState, 'V', 'A' },
+{ QLocale::Language::Spanish, QLocale::Country::Venezuela, 'V', 'E' },
+{ QLocale::Language::Vietnamese, QLocale::Country::Vietnam, 'V', 'N' },
+{ QLocale::Language::Bislama, QLocale::Country::Vanuatu, 'V', 'U' },
+{ QLocale::Language::French, QLocale::Country::WallisAndFutunaIslands, 'W', 'F' },
+{ QLocale::Language::Samoan, QLocale::Country::Samoa, 'W', 'S' },
+{ QLocale::Language::Albanian, QLocale::Country::Kosovo, 'X', 'K' },
+{ QLocale::Language::Arabic, QLocale::Country::Yemen, 'Y', 'E' },
+{ QLocale::Language::French, QLocale::Country::Mayotte, 'Y', 'T' },
+{ QLocale::Language::Shona, QLocale::Country::Zimbabwe, 'Z', 'W' },
+{ QLocale::Language::AnyLanguage, QLocale::Country::AnyCountry, 0, 0 },
+};
+
+static_assert( (sizeof(country_data_table) / sizeof(CountryData)) == country_data_size, "Table size mismatch for CountryData" );
+
+
+// END Generated from CLDR data
diff --git a/src/libcalamares/utils/LocaleLabel.cpp b/src/libcalamares/locale/Label.cpp
similarity index 84%
rename from src/libcalamares/utils/LocaleLabel.cpp
rename to src/libcalamares/locale/Label.cpp
index 26480ef142d9dbbae392f1b8e98d2dcc06e09bb4..ca528dc75bfc3106dc3ad35196fbd56676b04bfc 100644
--- a/src/libcalamares/utils/LocaleLabel.cpp
+++ b/src/libcalamares/locale/Label.cpp
@@ -1,7 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
- * Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
+ * Copyright 2017-2019, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,12 +17,12 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "LocaleLabel.h"
+#include "Label.h"
-namespace CalamaresUtils
+namespace CalamaresUtils::Locale
{
-LocaleLabel::LocaleLabel()
+Label::Label()
: m_locale( QLocale() )
{
m_localeId = m_locale.name();
@@ -30,15 +30,15 @@ LocaleLabel::LocaleLabel()
setLabels( QString(), LabelFormat::IfNeededWithCountry );
}
-LocaleLabel::LocaleLabel( const QString& locale, LabelFormat format )
- : m_locale( LocaleLabel::getLocale( locale ) )
+Label::Label( const QString& locale, LabelFormat format )
+ : m_locale( Label::getLocale( locale ) )
, m_localeId( locale )
{
setLabels( locale, format );
}
void
-LocaleLabel::setLabels( const QString& locale, LabelFormat format )
+Label::setLabels( const QString& locale, LabelFormat format )
{
//: language[name] (country[name])
QString longFormat = QObject::tr( "%1 (%2)" );
@@ -59,7 +59,7 @@ LocaleLabel::setLabels( const QString& locale, LabelFormat format )
m_englishLabel = needsCountryName ? longFormat.arg( englishName, QLocale::countryToString( m_locale.country() ) ) : englishName;
}
-QLocale LocaleLabel::getLocale( const QString& localeName )
+QLocale Label::getLocale( const QString& localeName )
{
if ( localeName.contains( "@latin" ) )
{
diff --git a/src/libcalamares/utils/LocaleLabel.h b/src/libcalamares/locale/Label.h
similarity index 82%
rename from src/libcalamares/utils/LocaleLabel.h
rename to src/libcalamares/locale/Label.h
index b56b29f33ffc6c0f84a7c90303c99f417b090f06..65befc6b47d4633b3247b772d27e676673e05471 100644
--- a/src/libcalamares/utils/LocaleLabel.h
+++ b/src/libcalamares/locale/Label.h
@@ -1,7 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
- * Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
+ * Copyright 2017-2019, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,13 +17,14 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef UTILS_LOCALELABEL_H
-#define UTILS_LOCALELABEL_H
+#ifndef LOCALE_LABEL_H
+#define LOCALE_LABEL_H
#include <QLocale>
#include <QString>
-namespace CalamaresUtils
+namespace CalamaresUtils {}
+namespace CalamaresUtils::Locale
{
/**
@@ -33,14 +34,14 @@ namespace CalamaresUtils
* translation system) into QLocales, and also into consistent
* human-readable text labels.
*/
-class LocaleLabel
+class Label
{
public:
/** @brief Formatting option for label -- add (country) to label. */
enum class LabelFormat { AlwaysWithCountry, IfNeededWithCountry } ;
/** @brief Empty locale. This uses the system-default locale. */
- LocaleLabel();
+ Label();
/** @brief Construct from a locale name.
*
@@ -48,13 +49,13 @@ public:
* The @p format determines whether the country name is always present
* in the label (human-readable form) or only if needed for disambiguation.
*/
- LocaleLabel( const QString& localeName, LabelFormat format = LabelFormat::IfNeededWithCountry );
+ Label( const QString& localeName, LabelFormat format = LabelFormat::IfNeededWithCountry );
/** @brief Define a sorting order.
*
* English (@see isEnglish() -- it means en_US) is sorted at the top.
*/
- bool operator <( const LocaleLabel& other ) const
+ bool operator <( const Label& other ) const
{
return m_localeId < other.m_localeId;
}
@@ -91,6 +92,18 @@ public:
return m_locale.name();
}
+ /// @brief Convenience accessor to the language part of the locale
+ QLocale::Language language() const
+ {
+ return m_locale.language();
+ }
+
+ /// @brief Convenience accessor to the country part (if any) of the locale
+ QLocale::Country country() const
+ {
+ return m_locale.country();
+ }
+
/** @brief Get a Qt locale for the given @p localeName
*
* This special-cases `sr@latin`, which is used as a translation
diff --git a/src/modules/welcome/LocaleModel.cpp b/src/libcalamares/locale/LabelModel.cpp
similarity index 60%
rename from src/modules/welcome/LocaleModel.cpp
rename to src/libcalamares/locale/LabelModel.cpp
index 0ecf0fd1ce0d47db3089c64d5a3bbd7e17ada7d5..543417212fa2531da26b5bf5903405037b1f386c 100644
--- a/src/modules/welcome/LocaleModel.cpp
+++ b/src/libcalamares/locale/LabelModel.cpp
@@ -16,30 +16,37 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "LocaleModel.h"
+#include "LabelModel.h"
-LocaleModel::LocaleModel( const QStringList& locales, QObject* parent )
+#include "Lookup.h"
+
+#include "CalamaresVersion.h" // For the list of translations
+
+namespace CalamaresUtils::Locale
+{
+
+LabelModel::LabelModel( const QStringList& locales, QObject* parent )
: QAbstractListModel( parent )
{
Q_ASSERT( locales.count() > 0 );
m_locales.reserve( locales.count() );
for ( const auto& l : locales )
- m_locales.push_back( CalamaresUtils::LocaleLabel( l ) );
+ m_locales.push_back( Label( l ) );
}
-LocaleModel::~LocaleModel()
+LabelModel::~LabelModel()
{
}
int
-LocaleModel::rowCount( const QModelIndex& ) const
+LabelModel::rowCount( const QModelIndex& ) const
{
return m_locales.count();
}
QVariant
-LocaleModel::data( const QModelIndex& index, int role ) const
+LabelModel::data( const QModelIndex& index, int role ) const
{
if ( ( role != LabelRole ) && ( role != EnglishLabelRole ) )
return QVariant();
@@ -59,8 +66,8 @@ LocaleModel::data( const QModelIndex& index, int role ) const
}
}
-const CalamaresUtils::LocaleLabel&
-LocaleModel::locale( int row )
+const Label&
+LabelModel::locale( int row ) const
{
if ( ( row < 0 ) || ( row >= m_locales.count() ) )
{
@@ -73,7 +80,7 @@ LocaleModel::locale( int row )
}
int
-LocaleModel::find( std::function<bool ( const LocaleLabel& )> predicate ) const
+LabelModel::find( std::function<bool ( const Label& )> predicate ) const
{
for ( int row = 0; row < m_locales.count() ; ++row )
{
@@ -84,26 +91,40 @@ LocaleModel::find( std::function<bool ( const LocaleLabel& )> predicate ) const
}
int
-LocaleModel::find( std::function<bool ( const QLocale& )> predicate ) const
+LabelModel::find( std::function<bool ( const QLocale& )> predicate ) const
{
- return find( [&]( const LocaleLabel& l )
+ return find( [&]( const Label& l )
{
return predicate( l.locale() );
} );
}
int
-LocaleModel::find( const QLocale& locale ) const
+LabelModel::find( const QLocale& locale ) const
{
- return find( [&]( const LocaleLabel& l )
+ return find( [&]( const Label& l )
{
return locale == l.locale();
} );
}
-void
-LocaleTwoColumnDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+int
+LabelModel::find( const QString& countryCode ) const
+{
+ if ( countryCode.length() != 2 )
+ return -1;
+
+ auto c_l = countryData( countryCode );
+ int r = find( [&]( const Label& l ){ return ( l.language() == c_l.second ) && ( l.country() == c_l.first ); } );
+ if ( r >= 0 )
+ return r;
+ return find( [&]( const Label& l ){ return l.language() == c_l.second; } );
+}
+
+LabelModel* const availableTranslations()
{
- QStyledItemDelegate::paint( painter, option, index );
- option.widget->style()->drawItemText( painter, option.rect, Qt::AlignRight | Qt::AlignVCenter, option.palette, false, index.data( LocaleModel::EnglishLabelRole ).toString() );
+ static LabelModel model( QString( CALAMARES_TRANSLATION_LANGUAGES ).split( ';') );
+ return &model;
}
+
+} // namespace
diff --git a/src/modules/welcome/LocaleModel.h b/src/libcalamares/locale/LabelModel.h
similarity index 59%
rename from src/modules/welcome/LocaleModel.h
rename to src/libcalamares/locale/LabelModel.h
index b1566d336f52bd48f530f6c4e8409c2567f0d6e0..178f7634318a0af9e1b2c7b2842b1a0b7ead6dfa 100644
--- a/src/modules/welcome/LocaleModel.h
+++ b/src/libcalamares/locale/LabelModel.h
@@ -16,28 +16,31 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef WELCOME_LOCALEMODEL_H
-#define WELCOME_LOCALEMODEL_H
+#ifndef LOCALE_LABELMODEL_H
+#define LOCALE_LABELMODEL_H
+
+#include "DllMacro.h"
+#include "Label.h"
#include <QAbstractListModel>
-#include <QStyledItemDelegate>
#include <QVector>
-#include "utils/LocaleLabel.h"
-class LocaleModel : public QAbstractListModel
+namespace CalamaresUtils {}
+namespace CalamaresUtils::Locale
{
-public:
- using LocaleLabel = CalamaresUtils::LocaleLabel;
+class DLLEXPORT LabelModel : public QAbstractListModel
+{
+public:
enum
{
LabelRole = Qt::DisplayRole,
EnglishLabelRole = Qt::UserRole + 1
};
- LocaleModel( const QStringList& locales, QObject* parent = nullptr );
- virtual ~LocaleModel() override;
+ LabelModel( const QStringList& locales, QObject* parent = nullptr );
+ virtual ~LabelModel() override;
int rowCount( const QModelIndex& parent ) const override;
@@ -48,26 +51,34 @@ public:
* This is the backing data for the model; if @p row is out-of-range,
* returns a reference to en_US.
*/
- const LocaleLabel& locale( int row );
+ const Label& locale( int row ) const;
/** @brief Searches for an item that matches @p predicate
*
* Returns the row number of the first match, or -1 if there isn't one.
*/
int find( std::function<bool( const QLocale& )> predicate ) const;
- int find( std::function<bool( const LocaleLabel& )> predicate ) const;
+ int find( std::function<bool( const Label& )> predicate ) const;
+ /// @brief Looks for an item using the same locale, -1 if there isn't one
int find( const QLocale& ) const;
+ /// @brief Looks for an item that best matches the 2-letter country code
+ int find( const QString& countryCode ) const;
private:
- QVector< LocaleLabel > m_locales;
+ QVector< Label > m_locales;
} ;
-class LocaleTwoColumnDelegate : public QStyledItemDelegate
-{
-public:
- using QStyledItemDelegate::QStyledItemDelegate;
-
- void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const override;
-} ;
+/** @brief Returns a model with all available translations.
+ *
+ * The translations are set when Calamares is compiled; the list
+ * is provided by CMake via the CALAMARES_TRANSLATION_LANGUAGES
+ * #define.
+ *
+ * This model is a singleton and can be shared.
+ *
+ * NOTE: While the model is not typed const, it should be. Do not modify.
+ */
+DLLEXPORT LabelModel* const availableTranslations();
+} // namespace
#endif
diff --git a/src/libcalamares/locale/Lookup.cpp b/src/libcalamares/locale/Lookup.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a096bc67980edd3d230d920ab9b0d9f3af5f1b4f
--- /dev/null
+++ b/src/libcalamares/locale/Lookup.cpp
@@ -0,0 +1,90 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ * Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ * Calamares is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Calamares is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Lookup.h"
+
+#include "CountryData_p.cpp"
+
+namespace CalamaresUtils::Locale
+{
+
+struct TwoChar
+{
+ TwoChar( const QString& code )
+ : cc1(0)
+ , cc2(0)
+ {
+ if ( code.length() == 2 )
+ {
+ cc1 = code[0].toLatin1();
+ cc2 = code[1].toLatin1();
+ }
+ }
+
+ char cc1;
+ char cc2;
+};
+
+static const CountryData* lookup( TwoChar c )
+{
+ if ( !c.cc1 )
+ return nullptr;
+
+ const CountryData* p = std::find_if(country_data_table, country_data_table + country_data_size,
+ [c=c]( const CountryData& d ){ return (d.cc1 == c.cc1) && (d.cc2 == c.cc2); }
+ );
+ if ( p == country_data_table + country_data_size )
+ return nullptr;
+ return p;
+}
+
+QLocale::Country countryForCode(const QString& code)
+{
+ const CountryData* p = lookup( TwoChar( code ) );
+ return p ? p->c : QLocale::Country::AnyCountry;
+}
+
+QLocale::Language languageForCountry(const QString& code)
+{
+ const CountryData* p = lookup( TwoChar( code ) );
+ return p ? p->l : QLocale::Language::AnyLanguage;
+}
+
+QPair<QLocale::Country, QLocale::Language> countryData(const QString& code)
+{
+ const CountryData* p = lookup( TwoChar( code ) );
+ return p ? qMakePair( p->c, p->l ) : qMakePair( QLocale::Country::AnyCountry, QLocale::Language::AnyLanguage );
+}
+
+QLocale countryLocale(const QString& code)
+{
+ auto p = countryData( code );
+ return QLocale( p.second, p.first );
+}
+
+QLocale::Language languageForCountry(QLocale::Country country)
+{
+ const CountryData* p = std::find_if(country_data_table, country_data_table + country_data_size,
+ [c=country]( const CountryData& d ){ return d.c == c; }
+ );
+ if ( p == country_data_table + country_data_size )
+ return QLocale::Language::AnyLanguage;
+ return p->l;
+}
+
+} // namespace
diff --git a/src/libcalamares/locale/Lookup.h b/src/libcalamares/locale/Lookup.h
new file mode 100644
index 0000000000000000000000000000000000000000..5712a11208b52d2376f535c66400c512f31be03d
--- /dev/null
+++ b/src/libcalamares/locale/Lookup.h
@@ -0,0 +1,53 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ * Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ * Calamares is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Calamares is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LOCALE_LOOKUP_H
+#define LOCALE_LOOKUP_H
+
+#include "DllMacro.h"
+
+#include <QLocale>
+#include <QPair>
+
+namespace CalamaresUtils {}
+namespace CalamaresUtils::Locale
+{
+ /* All the functions in this file do lookups of locale data
+ * based on CLDR tables; these are lookups that you can't (easily)
+ * do with just QLocale (e.g. from 2-letter country code to a likely
+ * locale).
+ */
+
+ /// @brief Map a 2-letter code to a Country, or AnyCountry if not found
+ DLLEXPORT QLocale::Country countryForCode( const QString& code );
+ /** @brief Map a Country to a Language, or AnyLanguage if not found
+ *
+ * This is a *likely* language for the given country, based on the
+ * CLDR tables. For instance, this maps Belgium to Dutch.
+ */
+ DLLEXPORT QLocale::Language languageForCountry( QLocale::Country country );
+ /// @brief Map a 2-letter code to a Language, or AnyLanguage if not found
+ DLLEXPORT QLocale::Language languageForCountry( const QString& code );
+
+ /// @brief Get both Country and Language for a 2-letter code
+ DLLEXPORT QPair< QLocale::Country, QLocale::Language > countryData( const QString& code );
+ /// @brief Get a likely locale for a 2-letter country code
+ DLLEXPORT QLocale countryLocale( const QString& code );
+} // namespace
+
+#endif
diff --git a/src/libcalamares/locale/cldr-extractor.py b/src/libcalamares/locale/cldr-extractor.py
new file mode 100644
index 0000000000000000000000000000000000000000..4e279337bd9b71f117b92be69aac998920456227
--- /dev/null
+++ b/src/libcalamares/locale/cldr-extractor.py
@@ -0,0 +1,287 @@
+#! /usr/bin/env python3
+#
+# === This file is part of Calamares - <https://github.com/calamares> ===
+#
+# Python3 script to scrape some data out of ICU CLDR supplemental data.
+#
+### BEGIN LICENSES
+#
+# Copyright 2019 Adriaan de Groot <groot@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+### END LICENSES
+
+### BEGIN USAGE
+#
+"""
+Python3 script to scrape some data out of ICU CLDR supplemental data.
+
+To use this script, you must have downloaded the CLDR data, e.g.
+http://unicode.org/Public/cldr/35.1/, and extracted the zip file.
+Run the script from **inside** the common/ durectory that is created
+(or fix the hard-coded path).
+
+The script tries to print C++ code that compiles; if there are encoding
+problems, it will print some kind of representation of the problematic
+lines.
+
+To avoid having to cross-reference multiple XML files, the script
+cheats: it reads the comments as well to get names. So it looks for
+pairs of lines like this:
+
+ <likelySubtag from="und_BQ" to="pap_Latn_BQ"/>
+ <!--{ ?; ?; Caribbean Netherlands } => { Papiamento; Latin; Caribbean Netherlands }-->
+
+It extracts the 2-character country code "BQ" from the sub-tag, and
+parses the comment to get a language and country name (instead of looking up
+"pap" and "BQ" in other tables). This may be considered a hack.
+
+A large collection of exceptions can be found in the two *_mapper tables,
+which massage the CLDR names to Qt enum values.
+"""
+#
+### END USAGE
+
+import sys
+
+# These are languages listed in CLDR that don't match
+# the enum-values in QLocale::Language.
+language_mapper = {
+ "?" : "AnyLanguage",
+ "Bangla" : "Bengali",
+ "Kalaallisut" : "Greenlandic",
+ "Haitian Creole" : "Haitian",
+ "Kyrgyz" : "Kirghiz",
+ "Norwegian Bokmål" : "NorwegianBokmal",
+ "Tokelau" : "TokelauLanguage",
+ "Tuvalu" : "TuvaluLanguage",
+ }
+
+country_mapper = {
+ "Åland Islands" : "AlandIslands",
+ "St. Barthélemy" : "SaintBarthelemy",
+ "Côte d’Ivoire" : "IvoryCoast",
+ "Curaçao" : "CuraSao",
+ "Réunion" : "Reunion",
+ "São Tomé & Príncipe" : "SaoTomeAndPrincipe",
+ "Bosnia & Herzegovina" : "BosniaAndHerzegowina",
+ "Czechia" : "CzechRepublic",
+ "St. Pierre & Miquelon" : "SaintPierreAndMiquelon",
+ "Vatican City" : "VaticanCityState",
+ "South Georgia & South Sandwich Islands" : "SouthGeorgiaAndTheSouthSandwichIslands",
+ "Timor-Leste" : "EastTimor",
+ "Wallis & Futuna" : "WallisAndFutunaIslands",
+ "Myanmar (Burma)" : "Myanmar",
+ "Svalbard & Jan Mayen" : "SvalbardAndJanMayenIslands",
+ "St. Martin" : "SaintMartin",
+ "North Macedonia" : "Macedonia",
+ "Hong Kong SAR China" : "HongKong",
+ "Macao SAR China" : "Macau",
+ "Eurozone" : "AnyCountry", # Not likely for GeoIP
+ "Caribbean Netherlands" : "Bonaire", # Bonaire, Saba, St.Eustatius
+ }
+
+class CountryData:
+ def __init__(self, country_code, language_name, country_name):
+ """
+ Takes a 2-letter country name, and enum names from
+ QLocale::Language and QLocale::Country. An empty
+ @p country code is acceptable, for the terminating
+ entry in the data array (and yields a 0,0 code).
+ """
+ if country_code:
+ assert len(country_code) == 2
+ self.country_code = country_code
+ self.language_enum = language_name
+ self.country_enum = country_name
+ else:
+ self.country_code = ""
+ self.language_enum = "AnyLanguage"
+ self.country_enum = "AnyCountry"
+
+ def __str__(self):
+ if self.country_code:
+ char0 = "'{!s}'".format(self.country_code[0])
+ char1 = "'{!s}'".format(self.country_code[1])
+ else:
+ char0 = "0"
+ char1 = "0"
+
+ return "{!s} QLocale::Language::{!s}, QLocale::Country::{!s}, {!s}, {!s} {!s},".format(
+ "{",
+ self.language_enum,
+ self.country_enum,
+ char0,
+ char1,
+ "}")
+
+ # Must match type name below
+ cpp_classname = "CountryData"
+
+ # Must match the output format of __str__ above
+ cpp_declaration = """
+struct CountryData
+{
+ QLocale::Language l;
+ QLocale::Country c;
+ char cc1;
+ char cc2;
+};
+"""
+
+
+def extricate_subtags(l1, l2):
+ """
+ Given two lines @p l1 and @p l2 which are the <likelySubtag> element-line
+ and the comment-line underneath it, return a CountryData for them,
+ or None if the two lines are not relevant (e.g. not the right subtag from,
+ or 3-letter country codes.
+ """
+ if 'from="und_' not in l1:
+ return
+ if '{ ?; ?;' not in l2:
+ return
+
+ # This is extremely crude "parsing" which chops up the string
+ # by delimiter and then extracts some substring.
+ l1_parts = l1.split("und_")
+ l2_parts = l2.split(";")
+
+ l1_first_quote = l1_parts[1].find('"')
+ l1_code = l1_parts[1][:l1_first_quote]
+ if len(l1_code) != 2:
+ return
+
+ l2_brace = l2_parts[2].find("{")
+ l2_language = l2_parts[2][l2_brace+1:].strip()
+ l2_brace = l2_parts[2].find("}")
+ l2_country = l2_parts[2][:l2_brace-1].strip()
+
+ # Handle mapped cases
+ l2_language = language_mapper.get(l2_language, l2_language)
+ l2_language = l2_language.replace(" ", "")
+
+ # Handle mapped cases and then do a bunch of standard replacements.
+ l2_country = country_mapper.get(l2_country, l2_country)
+ l2_country = l2_country.replace(" ", "").replace("-", "").replace(".","").replace("&","And")
+
+ return CountryData(l1_code, l2_language, l2_country)
+
+
+def read_subtags_file():
+ """
+ Returns a list of CountryData objects from the likelySubtags file.
+ """
+ data = []
+
+ with open("supplemental/likelySubtags.xml", "rt", encoding="UTF-8") as f:
+ l1 = "a line"
+ while l1:
+ l1 = f.readline()
+ if '<likelySubtag from="und_' not in l1:
+ continue
+ l2 = f.readline()
+
+ if l1:
+ assert "likelySubtag" in l1, l1;
+ assert "<!--" in l2, l2;
+
+ data.append(extricate_subtags(l1, l2))
+
+ data.append(CountryData("", None, None))
+ return [c for c in data if c is not None]
+
+
+cpp_header_comment = """/* GENERATED FILE DO NOT EDIT
+*
+* === This file is part of Calamares - <https://github.com/calamares> ===
+*
+* This file is derived from CLDR data from Unicode, Inc. Applicable terms:
+*
+* A. Unicode Copyright
+* 1. Copyright © 1991-2019 Unicode, Inc. All rights reserved.
+* B. Definitions
+* Unicode Data Files ("DATA FILES") include all data files under the directories:
+* https://www.unicode.org/Public/
+* C. Terms of Use
+* 2. Any person is hereby authorized, without fee, to view, use, reproduce,
+* and distribute all documents and files, subject to the Terms and
+* Conditions herein.
+*/
+
+// BEGIN Generated from CLDR data
+
+"""
+
+cpp_footer_comment = """
+// END Generated from CLDR data
+"""
+
+
+def make_identifier(classname):
+ """
+ Given a class name (e.g. CountryData) return an identifer
+ for the data-table for that class.
+ """
+ identifier = [ classname[0].lower() ]
+ for c in classname[1:]:
+ if c.isupper():
+ identifier.extend(["_", c.lower()])
+ else:
+ identifier.append(c)
+
+ return "".join(identifier)
+
+
+def export_class(cls, data):
+ """
+ Given a @p cls and a list of @p data objects from that class,
+ print (to stdout) a C++ file for that data.
+ """
+ identifier = make_identifier(cls.cpp_classname)
+
+ with open("{!s}_p.cpp".format(cls.cpp_classname), "wt", encoding="UTF-8") as f:
+ f.write(cpp_header_comment)
+ f.write(cls.cpp_declaration)
+ f.write("\nstatic constexpr int const {!s}_size = {!s};\n".format(
+ identifier,
+ len(data)))
+ f.write("\nstatic const {!s} {!s}_table[] = {!s}\n".format(
+ cls.cpp_classname,
+ identifier,
+ "{"))
+ for d in data:
+ f.write(str(d))
+ f.write("\n")
+ f.write("};\n\n");
+ f.write("static_assert( (sizeof({!s}_table) / sizeof({!s})) == {!s}_size, \"Table size mismatch for {!s}\" );\n\n".format(
+ identifier,
+ cls.cpp_classname,
+ identifier,
+ cls.cpp_classname))
+ f.write(cpp_footer_comment)
+
+
+if __name__ == "__main__":
+ export_class(CountryData, read_subtags_file())
diff --git a/src/libcalamares/Typedefs.h b/src/libcalamares/modulesystem/Actions.h
similarity index 75%
rename from src/libcalamares/Typedefs.h
rename to src/libcalamares/modulesystem/Actions.h
index 324f2b155f8c79114f3660cce5b5c0f270a17d46..0699372358a9034d965c0b3b2c4b9696eebdf539 100644
--- a/src/libcalamares/Typedefs.h
+++ b/src/libcalamares/modulesystem/Actions.h
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2019, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,28 +17,18 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TYPEDEFS_H
-#define TYPEDEFS_H
-
-#include <QList>
-#include <QSharedPointer>
+#ifndef MODULESYSTEM_ACTIONS_H
+#define MODULESYSTEM_ACTIONS_H
namespace Calamares
{
-class Job;
-
-typedef QSharedPointer< Job > job_ptr;
-using JobList = QList< job_ptr >;
-enum ModuleAction : char
+enum class ModuleAction : char
{
Show,
Exec
};
-class ViewStep;
-typedef QList< ViewStep* > ViewStepList;
-
-} //ns
+} // namespace
-#endif // TYPEDEFS_H
+#endif
diff --git a/src/libcalamares/partition/PartitionSize.cpp b/src/libcalamares/partition/PartitionSize.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..edff0fe1e46646947fb65ae4c28348228fc144aa
--- /dev/null
+++ b/src/libcalamares/partition/PartitionSize.cpp
@@ -0,0 +1,238 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ * Copyright 2019, Collabora Ltd <arnaud.ferraris@collabora.com>
+ *
+ * Calamares is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Calamares is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "partition/PartitionSize.h"
+#include "utils/Logger.h"
+#include "utils/Units.h"
+
+namespace Calamares
+{
+
+static const NamedEnumTable<SizeUnit>&
+unitSuffixes()
+{
+ static const NamedEnumTable<SizeUnit> names{
+ { QStringLiteral( "%" ), SizeUnit::Percent },
+ { QStringLiteral( "K" ), SizeUnit::KiB },
+ { QStringLiteral( "KiB" ), SizeUnit::KiB },
+ { QStringLiteral( "M" ), SizeUnit::MiB },
+ { QStringLiteral( "MiB" ), SizeUnit::MiB },
+ { QStringLiteral( "G" ), SizeUnit::GiB },
+ { QStringLiteral( "GiB" ), SizeUnit::GiB }
+ };
+
+ return names;
+}
+
+PartitionSize::PartitionSize( const QString& s )
+ : NamedSuffix( unitSuffixes(), s )
+{
+ if ( ( unit() == unit_t::Percent ) && ( value() > 100 || value() < 0 ) )
+ {
+ cDebug() << "Percent value" << value() << "is not valid.";
+ m_value = 0;
+ }
+
+ if ( m_unit == unit_t::None )
+ {
+ m_value = s.toInt();
+ if ( m_value > 0 )
+ m_unit = unit_t::Byte;
+ }
+
+ if ( m_value <= 0 )
+ {
+ m_value = 0;
+ m_unit = unit_t::None;
+ }
+}
+
+qint64
+PartitionSize::toSectors( qint64 totalSectors, qint64 sectorSize ) const
+{
+ if ( !isValid() )
+ return -1;
+ if ( totalSectors < 1 || sectorSize < 1 )
+ return -1;
+
+ switch ( m_unit )
+ {
+ case unit_t::None:
+ return -1;
+ case unit_t::Percent:
+ if ( value() == 100 )
+ return totalSectors; // Common-case, avoid futzing around
+ else
+ return totalSectors * value() / 100;
+ case unit_t::Byte:
+ case unit_t::KiB:
+ case unit_t::MiB:
+ case unit_t::GiB:
+ return CalamaresUtils::bytesToSectors ( toBytes(), sectorSize );
+ }
+
+ return -1;
+}
+
+qint64
+PartitionSize::toBytes( qint64 totalSectors, qint64 sectorSize ) const
+{
+ if ( !isValid() )
+ return -1;
+
+ switch ( m_unit )
+ {
+ case unit_t::None:
+ return -1;
+ case unit_t::Percent:
+ if ( totalSectors < 1 || sectorSize < 1 )
+ return -1;
+ if ( value() == 100 )
+ return totalSectors * sectorSize; // Common-case, avoid futzing around
+ else
+ return totalSectors * value() / 100;
+ case unit_t::Byte:
+ case unit_t::KiB:
+ case unit_t::MiB:
+ case unit_t::GiB:
+ return toBytes();
+ }
+
+ // notreached
+ return -1;
+}
+
+qint64
+PartitionSize::toBytes( qint64 totalBytes ) const
+{
+ if ( !isValid() )
+ return -1;
+
+ switch ( m_unit )
+ {
+ case unit_t::None:
+ return -1;
+ case unit_t::Percent:
+ if ( totalBytes < 1 )
+ return -1;
+ if ( value() == 100 )
+ return totalBytes; // Common-case, avoid futzing around
+ else
+ return totalBytes * value() / 100;
+ case unit_t::Byte:
+ case unit_t::KiB:
+ case unit_t::MiB:
+ case unit_t::GiB:
+ return toBytes();
+ }
+
+ // notreached
+ return -1;
+}
+
+qint64
+PartitionSize::toBytes() const
+{
+ if ( !isValid() )
+ return -1;
+
+ switch ( m_unit )
+ {
+ case unit_t::Byte:
+ return value();
+ case unit_t::KiB:
+ return CalamaresUtils::KiBtoBytes( static_cast<unsigned long long>( value() ) );
+ case unit_t::MiB:
+ return CalamaresUtils::MiBtoBytes( static_cast<unsigned long long>( value() ) );
+ case unit_t::GiB:
+ return CalamaresUtils::GiBtoBytes( static_cast<unsigned long long>( value() ) );
+ default:
+ break;
+ }
+
+ // Reached only when unit is Percent or None
+ return -1;
+}
+
+bool
+PartitionSize::operator< ( const PartitionSize& other ) const
+{
+ if ( ( m_unit == unit_t::None || other.m_unit == unit_t::None ) ||
+ ( m_unit == unit_t::Percent && other.m_unit != unit_t::Percent ) ||
+ ( m_unit != unit_t::Percent && other.m_unit == unit_t::Percent ) )
+ return false;
+
+ switch ( m_unit )
+ {
+ case unit_t::Percent:
+ return ( m_value < other.m_value );
+ case unit_t::Byte:
+ case unit_t::KiB:
+ case unit_t::MiB:
+ case unit_t::GiB:
+ return ( toBytes() < other.toBytes () );
+ }
+
+ return false;
+}
+
+bool
+PartitionSize::operator> ( const PartitionSize& other ) const
+{
+ if ( ( m_unit == unit_t::None || other.m_unit == unit_t::None ) ||
+ ( m_unit == unit_t::Percent && other.m_unit != unit_t::Percent ) ||
+ ( m_unit != unit_t::Percent && other.m_unit == unit_t::Percent ) )
+ return false;
+
+ switch ( m_unit )
+ {
+ case unit_t::Percent:
+ return ( m_value > other.m_value );
+ case unit_t::Byte:
+ case unit_t::KiB:
+ case unit_t::MiB:
+ case unit_t::GiB:
+ return ( toBytes() > other.toBytes () );
+ }
+
+ return false;
+}
+
+bool
+PartitionSize::operator== ( const PartitionSize& other ) const
+{
+ if ( ( m_unit == unit_t::None || other.m_unit == unit_t::None ) ||
+ ( m_unit == unit_t::Percent && other.m_unit != unit_t::Percent ) ||
+ ( m_unit != unit_t::Percent && other.m_unit == unit_t::Percent ) )
+ return false;
+
+ switch ( m_unit )
+ {
+ case unit_t::Percent:
+ return ( m_value == other.m_value );
+ case unit_t::Byte:
+ case unit_t::KiB:
+ case unit_t::MiB:
+ case unit_t::GiB:
+ return ( toBytes() == other.toBytes () );
+ }
+
+ return false;
+}
+
+} // namespace Calamares
diff --git a/src/libcalamares/partition/PartitionSize.h b/src/libcalamares/partition/PartitionSize.h
new file mode 100644
index 0000000000000000000000000000000000000000..13ffa5c70e5d6a5fe0430b14f3ee1cf5f7283dc0
--- /dev/null
+++ b/src/libcalamares/partition/PartitionSize.h
@@ -0,0 +1,103 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ * Copyright 2019, Collabora Ltd <arnaud.ferraris@collabora.com>
+ *
+ * Calamares is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Calamares is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PARTITION_PARTITIONSIZE_H
+#define PARTITION_PARTITIONSIZE_H
+
+#include "utils/Units.h"
+#include "utils/NamedSuffix.h"
+
+// Qt
+#include <QString>
+
+namespace Calamares
+{
+
+enum class SizeUnit
+{
+ None,
+ Percent,
+ Byte,
+ KiB,
+ MiB,
+ GiB
+};
+
+/** @brief Partition size expressions
+ *
+ * Sizes can be specified in bytes, KiB, MiB, GiB or percent (of
+ * the available drive space are on). This class handles parsing
+ * of such strings from the config file.
+ */
+class PartitionSize : public NamedSuffix<SizeUnit, SizeUnit::None>
+{
+public:
+ PartitionSize() : NamedSuffix() { }
+ PartitionSize( int v, unit_t u ) : NamedSuffix( v, u ) { }
+ PartitionSize( const QString& );
+
+ bool isValid() const
+ {
+ return ( unit() != SizeUnit::None ) && ( value() > 0 );
+ }
+
+ bool operator< ( const PartitionSize& other ) const;
+ bool operator> ( const PartitionSize& other ) const;
+ bool operator== ( const PartitionSize& other ) const;
+
+ /** @brief Convert the size to the number of sectors @p totalSectors .
+ *
+ * Each sector has size @p sectorSize, for converting sizes in Bytes,
+ * KiB, MiB or GiB to sector counts.
+ *
+ * @return the number of sectors needed, or -1 for invalid sizes.
+ */
+ qint64 toSectors( qint64 totalSectors, qint64 sectorSize ) const;
+
+ /** @brief Convert the size to bytes.
+ *
+ * The device's sectors count @p totalSectors and sector size
+ * @p sectoreSize are used to calculated the total size, which
+ * is then used to calculate the size when using Percent.
+ *
+ * @return the size in bytes, or -1 for invalid sizes.
+ */
+ qint64 toBytes( qint64 totalSectors, qint64 sectorSize ) const;
+
+ /** @brief Convert the size to bytes.
+ *
+ * Total size @p totalBytes is needed for sizes in Percent. This
+ * parameter is unused in any other case.
+ *
+ * @return the size in bytes, or -1 for invalid sizes.
+ */
+ qint64 toBytes( qint64 totalBytes ) const;
+
+ /** @brief Convert the size to bytes.
+ *
+ * This method is only valid for sizes in Bytes, KiB, MiB or GiB.
+ * It will return -1 in any other case.
+ *
+ * @return the size in bytes, or -1 if it cannot be calculated.
+ */
+ qint64 toBytes() const;
+};
+
+} // namespace Calamares
+
+#endif // PARTITION_PARTITIONSIZE_H
diff --git a/src/libcalamares/utils/Units.h b/src/libcalamares/utils/Units.h
index 74c809362bc683a9a3ba3287a3f780f577878135..e6d46aaed1ee3ee8364d46fa70371282cbc149e7 100644
--- a/src/libcalamares/utils/Units.h
+++ b/src/libcalamares/utils/Units.h
@@ -78,5 +78,19 @@ constexpr int BytesToMiB( qint64 b )
return int( b / 1024 / 1024 );
}
+constexpr qint64 alignBytesToBlockSize( qint64 bytes, qint64 blocksize )
+{
+ qint64 blocks = bytes / blocksize;
+
+ if ( blocks * blocksize != bytes )
+ ++blocks;
+ return blocks * blocksize;
+}
+
+constexpr qint64 bytesToSectors( qint64 bytes, qint64 blocksize )
+{
+ return alignBytesToBlockSize( alignBytesToBlockSize( bytes, blocksize), MiBtoBytes(1ULL) ) / blocksize;
+}
+
} // namespace
#endif
diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h
index 572cd3682f0062838428708631c59caca61f6ed6..29a39f1035cf8563ab5cf11a57d93434497c1112 100644
--- a/src/libcalamaresui/Branding.h
+++ b/src/libcalamaresui/Branding.h
@@ -22,7 +22,6 @@
#define BRANDING_H
#include "UiDllMacro.h"
-#include "Typedefs.h"
#include "utils/NamedSuffix.h"
diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index 80220da64805e853497dfaa27dffe27dbd204ef9..aaa383fde2c900d9f8b3b0515c17394e29352392 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -1,3 +1,9 @@
+# libcalamaresui is the GUI part of Calamares, which includes handling
+# view modules, view steps, widgets, and branding.
+
+# The UI libs use the non-UI library
+include_directories( ${CMAKE_SOURCE_DIR}/src/libcalamares ${CMAKE_BINARY_DIR}/src/libcalamares )
+
set( calamaresui_SOURCES
modulesystem/CppJobModule.cpp
modulesystem/Module.cpp
diff --git a/src/libcalamaresui/ExecutionViewStep.cpp b/src/libcalamaresui/ExecutionViewStep.cpp
index 2010bf1201f393376edd74f5aed495946f9bceb5..a65ab3a1c52afa3871c74c5004dcf313fadace75 100644
--- a/src/libcalamaresui/ExecutionViewStep.cpp
+++ b/src/libcalamaresui/ExecutionViewStep.cpp
@@ -78,7 +78,9 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent )
QString
ExecutionViewStep::prettyName() const
{
- return tr( "Install" );
+ return Calamares::Settings::instance()->isSetupMode()
+ ? tr( "Set up" )
+ : tr( "Install" );
}
diff --git a/src/libcalamaresui/ViewManager.h b/src/libcalamaresui/ViewManager.h
index ee199f725d30da3c45ba81204da1fa312cf93242..65d787e444add95e7f1be663ff3211284dda0fcb 100644
--- a/src/libcalamaresui/ViewManager.h
+++ b/src/libcalamaresui/ViewManager.h
@@ -21,19 +21,14 @@
#define VIEWMANAGER_H
#include "UiDllMacro.h"
-#include "Typedefs.h"
+#include "viewpages/ViewStep.h"
#include <QList>
#include <QPushButton>
#include <QStackedWidget>
-
namespace Calamares
{
-
-class ViewStep;
-class ExecutionViewStep;
-
/**
* @brief The ViewManager class handles progression through view pages.
* @note Singleton object, only use through ViewManager::instance().
diff --git a/src/libcalamaresui/modulesystem/CppJobModule.cpp b/src/libcalamaresui/modulesystem/CppJobModule.cpp
index 3a48e29f2f80b31904baaa9587b267168fb5e5d2..22d9a0524a5ae2522789a61b877fd75ae5780b9b 100644
--- a/src/libcalamaresui/modulesystem/CppJobModule.cpp
+++ b/src/libcalamaresui/modulesystem/CppJobModule.cpp
@@ -33,14 +33,14 @@ namespace Calamares
Module::Type
CppJobModule::type() const
{
- return Job;
+ return Module::Type::Job;
}
Module::Interface
CppJobModule::interface() const
{
- return QtPluginInterface;
+ return Module::Interface::QtPlugin;
}
diff --git a/src/libcalamaresui/modulesystem/Module.cpp b/src/libcalamaresui/modulesystem/Module.cpp
index 133ee5438029cc7139b0457febdf008ac1de5688..d05245384fa90116ad7e4d785c4779d6f5a6ce40 100644
--- a/src/libcalamaresui/modulesystem/Module.cpp
+++ b/src/libcalamaresui/modulesystem/Module.cpp
@@ -235,9 +235,9 @@ Module::typeString() const
{
switch ( type() )
{
- case Job:
+ case Type::Job:
return "Job Module";
- case View:
+ case Type::View:
return "View Module";
}
return QString();
@@ -249,13 +249,13 @@ Module::interfaceString() const
{
switch ( interface() )
{
- case ProcessInterface:
+ case Interface::Process:
return "External process";
- case PythonInterface:
+ case Interface::Python:
return "Python (Boost.Python)";
- case PythonQtInterface:
+ case Interface::PythonQt:
return "Python (experimental)";
- case QtPluginInterface:
+ case Interface::QtPlugin:
return "Qt Plugin";
}
return QString();
diff --git a/src/libcalamaresui/modulesystem/Module.h b/src/libcalamaresui/modulesystem/Module.h
index 218270825e1231a0e38a8a7edd58e09b5288932c..6da9c0ce4305aa4b3ae40004ec68168b8042424e 100644
--- a/src/libcalamaresui/modulesystem/Module.h
+++ b/src/libcalamaresui/modulesystem/Module.h
@@ -20,11 +20,10 @@
#ifndef CALAMARES_MODULE_H
#define CALAMARES_MODULE_H
+#include "Job.h"
#include "Requirement.h"
#include "UiDllMacro.h"
-#include <Typedefs.h>
-
#include <QStringList>
#include <QVariant>
@@ -54,7 +53,7 @@ public:
* A job module is a single Calamares job.
* A view module has a UI (one or more view pages) and zero-to-many jobs.
*/
- enum Type
+ enum class Type
{
Job,
View
@@ -65,12 +64,12 @@ public:
* talks to Calamares.
* Not all Type-Interface associations are valid.
*/
- enum Interface
+ enum class Interface
{
- QtPluginInterface,
- PythonInterface,
- ProcessInterface,
- PythonQtInterface
+ QtPlugin, // Jobs or Views
+ Python, // Jobs only
+ Process, // Deprecated interface
+ PythonQt // Views only, available as enum even if PythonQt isn't used
};
/**
diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp
index 32fe090338193d30e3c44c7bbebf0fc8aee1a47b..852f41445d692fafb43dfe42ab00c7d2564f242b 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.cpp
+++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp
@@ -277,7 +277,7 @@ ModuleManager::loadModules()
// At this point we most certainly have a pointer to a loaded module in
// thisModule. We now need to enqueue jobs info into an EVS.
- if ( currentAction == Calamares::Exec )
+ if ( currentAction == ModuleAction::Exec )
{
ExecutionViewStep* evs =
qobject_cast< ExecutionViewStep* >(
diff --git a/src/libcalamaresui/modulesystem/ModuleManager.h b/src/libcalamaresui/modulesystem/ModuleManager.h
index 689d61a7762cfec002f7c3d6fd006fda09992081..64db75b6a3cb414a4e6e7a685a7995ee2bb256f1 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.h
+++ b/src/libcalamaresui/modulesystem/ModuleManager.h
@@ -21,7 +21,6 @@
#define MODULELOADER_H
#include "Requirement.h"
-#include "Typedefs.h"
#include <QObject>
#include <QStringList>
diff --git a/src/libcalamaresui/modulesystem/ProcessJobModule.cpp b/src/libcalamaresui/modulesystem/ProcessJobModule.cpp
index 9037d85a62b09bf3ffd6b843401062b793a957b0..85bdfa4de83ede1c2297f69a6aba15689cb8dd3c 100644
--- a/src/libcalamaresui/modulesystem/ProcessJobModule.cpp
+++ b/src/libcalamaresui/modulesystem/ProcessJobModule.cpp
@@ -29,14 +29,14 @@ namespace Calamares
Module::Type
ProcessJobModule::type() const
{
- return Job;
+ return Module::Type::Job;
}
Module::Interface
ProcessJobModule::interface() const
{
- return ProcessInterface;
+ return Module::Interface::Process;
}
diff --git a/src/libcalamaresui/modulesystem/PythonJobModule.cpp b/src/libcalamaresui/modulesystem/PythonJobModule.cpp
index 7099a3f7288e92ca68815dfc44cedc4cde42c5a0..e910a4c809fa9a4c7ca25885869041816ca7bedf 100644
--- a/src/libcalamaresui/modulesystem/PythonJobModule.cpp
+++ b/src/libcalamaresui/modulesystem/PythonJobModule.cpp
@@ -30,14 +30,14 @@ namespace Calamares
Module::Type
PythonJobModule::type() const
{
- return Job;
+ return Module::Type::Job;
}
Module::Interface
PythonJobModule::interface() const
{
- return PythonInterface;
+ return Module::Interface::Python;
}
diff --git a/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp b/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp
index 2af6d81e784aef5b81317a979f62807c0a8f4001..ec9f3c8059c256704be69e8bc2e615b0b880e478 100644
--- a/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp
+++ b/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp
@@ -46,14 +46,14 @@ namespace Calamares
Module::Type
PythonQtViewModule::type() const
{
- return View;
+ return Module::Type::View;
}
Module::Interface
PythonQtViewModule::interface() const
{
- return PythonQtInterface;
+ return Module::Interface::PythonQt;
}
diff --git a/src/libcalamaresui/modulesystem/ViewModule.cpp b/src/libcalamaresui/modulesystem/ViewModule.cpp
index e24014621f6ee567b0d7d83cf9f13ee4862e7313..2789dcfe30a779bef44b9adb5fe175e2958df4b3 100644
--- a/src/libcalamaresui/modulesystem/ViewModule.cpp
+++ b/src/libcalamaresui/modulesystem/ViewModule.cpp
@@ -34,14 +34,14 @@ namespace Calamares
Module::Type
ViewModule::type() const
{
- return View;
+ return Module::Type::View;
}
Module::Interface
ViewModule::interface() const
{
- return QtPluginInterface;
+ return Module::Interface::QtPlugin;
}
@@ -65,9 +65,6 @@ ViewModule::loadSelf()
}
}
- // TODO: allow internal view steps to be created here; they would
- // have to be linked into the main application somehow.
-
// If any method created the view step, use it now.
if ( m_viewStep )
{
diff --git a/src/libcalamaresui/utils/DebugWindow.cpp b/src/libcalamaresui/utils/DebugWindow.cpp
index 22986014efcbaea8f8a2dbba3fc3ea56f8fd9a26..164da02d97c47a614202d11a0d962d245c024c36 100644
--- a/src/libcalamaresui/utils/DebugWindow.cpp
+++ b/src/libcalamaresui/utils/DebugWindow.cpp
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2019, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,6 +18,8 @@
*/
#include "DebugWindow.h"
+#include "ui_DebugWindow.h"
+
#include "utils/Retranslator.h"
#include "utils/qjsonmodel.h"
#include "JobQueue.h"
@@ -51,26 +54,27 @@ namespace Calamares {
DebugWindow::DebugWindow()
: QWidget( nullptr )
+ , m_ui( new Ui::DebugWindow )
{
- setupUi( this );
+ m_ui->setupUi( this );
// GlobalStorage page
QJsonModel* jsonModel = new QJsonModel( this );
- globalStorageView->setModel( jsonModel );
+ m_ui->globalStorageView->setModel( jsonModel );
GlobalStorage* gs = JobQueue::instance()->globalStorage();
connect( gs, &GlobalStorage::changed,
this, [ = ]
{
jsonModel->loadJson( QJsonDocument::fromVariant( gs->m ).toJson() );
- globalStorageView->expandAll();
+ m_ui->globalStorageView->expandAll();
} );
jsonModel->loadJson( QJsonDocument::fromVariant( gs->m ).toJson() );
- globalStorageView->expandAll();
+ m_ui->globalStorageView->expandAll();
// JobQueue page
- jobQueueText->setReadOnly( true );
+ m_ui->jobQueueText->setReadOnly( true );
connect( JobQueue::instance(), &JobQueue::queueChanged,
this, [ this ]( const JobList& jobs )
{
@@ -80,30 +84,30 @@ DebugWindow::DebugWindow()
text.append( job->prettyName() );
}
- jobQueueText->setText( text.join( '\n' ) );
+ m_ui->jobQueueText->setText( text.join( '\n' ) );
} );
// Modules page
QStringListModel* modulesModel = new QStringListModel( ModuleManager::instance()->loadedInstanceKeys() );
- modulesListView->setModel( modulesModel );
- modulesListView->setSelectionMode( QAbstractItemView::SingleSelection );
+ m_ui->modulesListView->setModel( modulesModel );
+ m_ui->modulesListView->setSelectionMode( QAbstractItemView::SingleSelection );
QJsonModel* moduleConfigModel = new QJsonModel( this );
- moduleConfigView->setModel( moduleConfigModel );
+ m_ui->moduleConfigView->setModel( moduleConfigModel );
#ifdef WITH_PYTHONQT
QPushButton* pythonConsoleButton = new QPushButton;
pythonConsoleButton->setText( "Attach Python console" );
- modulesVerticalLayout->insertWidget( 1, pythonConsoleButton );
+ m_ui->modulesVerticalLayout->insertWidget( 1, pythonConsoleButton );
pythonConsoleButton->hide();
QObject::connect( pythonConsoleButton, &QPushButton::clicked,
this, [ this, moduleConfigModel ]
{
- QString moduleName = modulesListView->currentIndex().data().toString();
+ QString moduleName = m_ui->modulesListView->currentIndex().data().toString();
Module* module = ModuleManager::instance()->moduleInstance( moduleName );
- if ( module->interface() != Module::PythonQtInterface ||
- module->type() != Module::View )
+ if ( module->interface() != Module::Interface::PythonQt ||
+ module->type() != Module::Type::View )
return;
for ( ViewStep* step : ViewManager::instance()->viewSteps() )
@@ -159,33 +163,33 @@ DebugWindow::DebugWindow()
#endif
- connect( modulesListView->selectionModel(), &QItemSelectionModel::selectionChanged,
+ connect( m_ui->modulesListView->selectionModel(), &QItemSelectionModel::selectionChanged,
this, [ this, moduleConfigModel
#ifdef WITH_PYTHONQT
, pythonConsoleButton
#endif
]
{
- QString moduleName = modulesListView->currentIndex().data().toString();
+ QString moduleName = m_ui->modulesListView->currentIndex().data().toString();
Module* module = ModuleManager::instance()->moduleInstance( moduleName );
if ( module )
{
moduleConfigModel->loadJson( QJsonDocument::fromVariant( module->configurationMap() ).toJson() );
- moduleConfigView->expandAll();
- moduleTypeLabel->setText( module->typeString() );
- moduleInterfaceLabel->setText( module->interfaceString() );
+ m_ui->moduleConfigView->expandAll();
+ m_ui->moduleTypeLabel->setText( module->typeString() );
+ m_ui->moduleInterfaceLabel->setText( module->interfaceString() );
#ifdef WITH_PYTHONQT
pythonConsoleButton->setVisible(
- module->interface() == Module::PythonQtInterface &&
- module->type() == Module::View );
+ module->interface() == Module::Interface::PythonQt &&
+ module->type() == Module::Type::View );
#endif
}
} );
- connect( crashButton, &QPushButton::clicked, this, [] { ::crash(); } );
+ connect( m_ui->crashButton, &QPushButton::clicked, this, [] { ::crash(); } );
CALAMARES_RETRANSLATE(
- retranslateUi( this );
+ m_ui->retranslateUi( this );
setWindowTitle( tr( "Debug information" ) );
)
}
diff --git a/src/libcalamaresui/utils/DebugWindow.h b/src/libcalamaresui/utils/DebugWindow.h
index 444fe6231376ba4001150906215aa890a1b3a5fc..e97f5727b786064b8b802345f2cd6446ef44a9ac 100644
--- a/src/libcalamaresui/utils/DebugWindow.h
+++ b/src/libcalamaresui/utils/DebugWindow.h
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2015, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2019, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,13 +20,18 @@
#ifndef CALAMARES_DEBUGWINDOW_H
#define CALAMARES_DEBUGWINDOW_H
-#include "ui_DebugWindow.h"
-
#include <QWidget>
+
namespace Calamares {
-class DebugWindow : public QWidget, private Ui::DebugWindow
+// From the .ui file
+namespace Ui
+{
+ class DebugWindow;
+}
+
+class DebugWindow : public QWidget
{
Q_OBJECT
@@ -38,8 +44,10 @@ signals:
protected:
void closeEvent( QCloseEvent* e ) override;
+private:
+ Ui::DebugWindow *m_ui;
};
-} // namespace Calamares
-#endif // CALAMARES_DEBUGWINDOW_H
+} // namespace
+#endif
diff --git a/src/libcalamaresui/viewpages/ViewStep.h b/src/libcalamaresui/viewpages/ViewStep.h
index 631c413140293cb0e1b4e738b8c19e45904c0f1e..e3d5a021e1807f51ff3c6b9c12f2fb2c704be874 100644
--- a/src/libcalamaresui/viewpages/ViewStep.h
+++ b/src/libcalamaresui/viewpages/ViewStep.h
@@ -20,10 +20,11 @@
#ifndef VIEWSTEP_H
#define VIEWSTEP_H
+#include <QList>
#include <QObject>
#include <QSize>
-#include "Typedefs.h"
+#include "Job.h"
#include "UiDllMacro.h"
#include "modulesystem/Requirement.h"
@@ -159,6 +160,7 @@ protected:
QString m_instanceKey;
};
+using ViewStepList = QList< ViewStep* >;
}
#endif // VIEWSTEP_H
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 0a8d1db70eccc752fdce8bf3668a9632c0a9b49b..9e9621106c72921560830ef4ebb2178ae370f3d4 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -4,6 +4,12 @@
# in this list.
set( LIST_SKIPPED_MODULES "" )
+include_directories(
+ ${CMAKE_SOURCE_DIR}/src/libcalamares
+ ${CMAKE_BINARY_DIR}/src/libcalamares
+ ${CMAKE_SOURCE_DIR}/src/libcalamaresui
+)
+
if( BUILD_TESTING )
add_executable( test_conf test_conf.cpp )
target_link_libraries( test_conf ${YAMLCPP_LIBRARY} Qt5::Core )
diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index 4a0bef326bb673839e369356e1bf116904183828..40e9f1613e6dead76cd2bdd6c95b760eae524fb6 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -43,6 +43,9 @@ _ = gettext.translation("calamares-python",
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
+# This is the sanitizer used all over to tidy up filenames
+# to make identifiers (or to clean up names to make filenames).
+file_name_sanitizer = str.maketrans(" /()", "_-__")
def pretty_name():
return _("Install bootloader.")
@@ -211,7 +214,6 @@ def efi_label():
branding = libcalamares.globalstorage.value("branding")
efi_bootloader_id = branding["bootloaderEntryName"]
- file_name_sanitizer = str.maketrans(" /", "_-")
return efi_bootloader_id.translate(file_name_sanitizer)
@@ -238,7 +240,6 @@ def install_systemd_boot(efi_directory):
install_efi_directory = install_path + efi_directory
uuid = get_uuid()
distribution = get_bootloader_entry_name()
- file_name_sanitizer = str.maketrans(" /", "_-")
distribution_translated = distribution.translate(file_name_sanitizer)
loader_path = os.path.join(install_efi_directory,
"loader",
@@ -365,24 +366,24 @@ def install_secureboot(efi_directory):
# of that tuple.
efi_drive = subprocess.check_output([
libcalamares.job.configuration["grubProbe"],
- "-t", "drive", "--device-map=", install_efi_directory])
+ "-t", "drive", "--device-map=", install_efi_directory]).decode("ascii")
efi_disk = subprocess.check_output([
libcalamares.job.configuration["grubProbe"],
- "-t", "disk", "--device-map=", install_efi_directory])
+ "-t", "disk", "--device-map=", install_efi_directory]).decode("ascii")
efi_drive_partition = efi_drive.replace("(","").replace(")","").split(",")[1]
# Get the first run of digits from the partition
- efi_partititon_number = None
+ efi_partition_number = None
c = 0
start = None
while c < len(efi_drive_partition):
if efi_drive_partition[c].isdigit() and start is None:
start = c
if not efi_drive_partition[c].isdigit() and start is not None:
- efi_drive_number = efi_drive_partition[start:c]
+ efi_partition_number = efi_drive_partition[start:c]
break
c += 1
- if efi_partititon_number is None:
+ if efi_partition_number is None:
raise ValueError("No partition number found for %s" % install_efi_directory)
subprocess.call([
@@ -391,7 +392,7 @@ def install_secureboot(efi_directory):
"-w",
"-L", efi_bootloader_id,
"-d", efi_disk,
- "-p", efi_partititon_number,
+ "-p", efi_partition_number,
"-l", install_efi_directory + "/" + install_efi_bin])
diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp
index 1bc935d0d544cc9381e84533897b4433e53157b3..c49bb953857c156bc8252263dfeb0740c0fc9e8e 100644
--- a/src/modules/finished/FinishedPage.cpp
+++ b/src/modules/finished/FinishedPage.cpp
@@ -79,16 +79,13 @@ FinishedPage::FinishedPage( QWidget* parent )
void
-FinishedPage::setRestartNowEnabled( bool enabled )
+FinishedPage::setRestart( FinishedViewStep::RestartMode mode )
{
- ui->restartCheckBox->setVisible( enabled );
-}
-
+ using Mode = FinishedViewStep::RestartMode;
-void
-FinishedPage::setRestartNowChecked( bool checked )
-{
- ui->restartCheckBox->setChecked( checked );
+ ui->restartCheckBox->setVisible( mode != Mode::Never );
+ ui->restartCheckBox->setEnabled( mode != Mode::Always );
+ ui->restartCheckBox->setChecked( ( mode == Mode::Always ) || ( mode == Mode::UserChecked ) );
}
@@ -138,5 +135,5 @@ FinishedPage::onInstallationFailed( const QString& message, const QString& detai
"The error message was: %2." )
.arg( *Calamares::Branding::VersionedName )
.arg( message ) );
- setRestartNowEnabled( false );
+ setRestart( FinishedViewStep::RestartMode::Never );
}
diff --git a/src/modules/finished/FinishedPage.h b/src/modules/finished/FinishedPage.h
index 493c29f3495701a814008c0e2615404232531ed4..9954e6fa0512135899925a2bcf2261e8fa574468 100644
--- a/src/modules/finished/FinishedPage.h
+++ b/src/modules/finished/FinishedPage.h
@@ -22,6 +22,8 @@
#include <QWidget>
+#include "FinishedViewStep.h"
+
namespace Ui
{
class FinishedPage;
@@ -33,8 +35,7 @@ class FinishedPage : public QWidget
public:
explicit FinishedPage( QWidget* parent = nullptr );
- void setRestartNowEnabled( bool enabled );
- void setRestartNowChecked( bool checked );
+ void setRestart( FinishedViewStep::RestartMode mode );
void setRestartNowCommand( const QString& command );
void setUpRestart();
diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp
index d01a99ce9b7d0f1f75492b9faa057cfd7f1c613c..d5c3c3f697fa0f5a4340bafbefbe2302cc980c19 100644
--- a/src/modules/finished/FinishedViewStep.cpp
+++ b/src/modules/finished/FinishedViewStep.cpp
@@ -1,7 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
- * Copyright 2017, Adriaan de Groot <groot@kde.org>
+ * Copyright 2017, 2019, Adriaan de Groot <groot@kde.org>
* Copyright 2019, Collabora Ltd <arnaud.ferraris@collabora.com>
*
* Calamares is free software: you can redistribute it and/or modify
@@ -20,17 +20,34 @@
#include "FinishedViewStep.h"
#include "FinishedPage.h"
+
+#include "Branding.h"
#include "JobQueue.h"
+#include "Settings.h"
#include "utils/Logger.h"
+#include "utils/NamedEnum.h"
+#include "utils/Variant.h"
#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusReply>
#include <QVariantMap>
-#include "Branding.h"
-#include "Settings.h"
+static const NamedEnumTable< FinishedViewStep::RestartMode >&
+modeNames()
+{
+ using Mode = FinishedViewStep::RestartMode;
+
+ static const NamedEnumTable< Mode > names{
+ { QStringLiteral( "never" ), Mode::Never },
+ { QStringLiteral( "user-unchecked" ), Mode::UserUnchecked },
+ { QStringLiteral( "user-checked" ), Mode::UserChecked },
+ { QStringLiteral( "always" ), Mode::Always }
+ } ;
+
+ return names;
+}
FinishedViewStep::FinishedViewStep( QObject* parent )
: Calamares::ViewStep( parent )
@@ -122,10 +139,10 @@ FinishedViewStep::sendNotification()
QVariant( 0 )
);
if ( !r.isValid() )
- cDebug() << "Could not call notify for end of installation." << r.error();
+ cWarning() << "Could not call org.freedesktop.Notifications.Notify at end of installation." << r.error();
}
else
- cDebug() << "Could not get dbus interface for notifications." << notify.lastError();
+ cWarning() << "Could not get dbus interface for notifications at end of installation." << notify.lastError();
}
@@ -156,28 +173,41 @@ FinishedViewStep::onInstallationFailed( const QString& message, const QString& d
void
FinishedViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{
- if ( configurationMap.contains( "restartNowEnabled" ) &&
- configurationMap.value( "restartNowEnabled" ).type() == QVariant::Bool )
+ RestartMode mode = RestartMode::Never;
+
+ QString restartMode = CalamaresUtils::getString( configurationMap, "restartNowMode" );
+ if ( restartMode.isEmpty() )
{
- bool restartNowEnabled = configurationMap.value( "restartNowEnabled" ).toBool();
-
- m_widget->setRestartNowEnabled( restartNowEnabled );
- if ( restartNowEnabled )
- {
- if ( configurationMap.contains( "restartNowChecked" ) &&
- configurationMap.value( "restartNowChecked" ).type() == QVariant::Bool )
- m_widget->setRestartNowChecked( configurationMap.value( "restartNowChecked" ).toBool() );
-
- if ( configurationMap.contains( "restartNowCommand" ) &&
- configurationMap.value( "restartNowCommand" ).type() == QVariant::String )
- m_widget->setRestartNowCommand( configurationMap.value( "restartNowCommand" ).toString() );
- else
- m_widget->setRestartNowCommand( "shutdown -r now" );
- }
+ if ( configurationMap.contains( "restartNowEnabled" ) )
+ cWarning() << "Configuring the finished module with deprecated restartNowEnabled settings";
+
+ bool restartNowEnabled = CalamaresUtils::getBool( configurationMap, "restartNowEnabled", false );
+ bool restartNowChecked = CalamaresUtils::getBool( configurationMap, "restartNowChecked", false );
+
+ if ( !restartNowEnabled )
+ mode = RestartMode::Never;
+ else
+ mode = restartNowChecked ? RestartMode::UserChecked : RestartMode::UserUnchecked;
+ }
+ else
+ {
+ bool ok = false;
+ mode = modeNames().find( restartMode, ok );
+ if ( !ok )
+ cWarning() << "Configuring the finished module with bad restartNowMode" << restartMode;
}
- if ( configurationMap.contains( "notifyOnFinished" ) &&
- configurationMap.value( "notifyOnFinished" ).type() == QVariant::Bool )
- m_notifyOnFinished = configurationMap.value( "notifyOnFinished" ).toBool();
+
+ m_widget->setRestart( mode );
+
+ if ( mode != RestartMode::Never )
+ {
+ QString restartNowCommand = CalamaresUtils::getString( configurationMap, "restartNowCommand" );
+ if ( restartNowCommand.isEmpty() )
+ restartNowCommand = QStringLiteral( "shutdown -r now" );
+ m_widget->setRestartNowCommand( restartNowCommand );
+ }
+
+ m_notifyOnFinished = CalamaresUtils::getBool( configurationMap, "notifyOnFinished", false );
}
CALAMARES_PLUGIN_FACTORY_DEFINITION( FinishedViewStepFactory, registerPlugin<FinishedViewStep>(); )
diff --git a/src/modules/finished/FinishedViewStep.h b/src/modules/finished/FinishedViewStep.h
index b1af598c73b34d651a0d4b6c73f992725363893c..314f6acc6501d1fe5c0c70399698be78966b4c1d 100644
--- a/src/modules/finished/FinishedViewStep.h
+++ b/src/modules/finished/FinishedViewStep.h
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ * Copyright 2019, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,15 +17,15 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef FINISHEDPAGEPLUGIN_H
-#define FINISHEDPAGEPLUGIN_H
+#ifndef FINISHEDVIEWSTEP_H
+#define FINISHEDVIEWSTEP_H
#include <QObject>
-#include <utils/PluginFactory.h>
-#include <viewpages/ViewStep.h>
+#include "utils/PluginFactory.h"
+#include "viewpages/ViewStep.h"
-#include <PluginDllMacro.h>
+#include "PluginDllMacro.h"
class FinishedPage;
@@ -33,6 +34,14 @@ class PLUGINDLLEXPORT FinishedViewStep : public Calamares::ViewStep
Q_OBJECT
public:
+ enum class RestartMode
+ {
+ Never=0, ///< @brief Don't show button, just exit
+ UserUnchecked, ///< @brief Show button, starts unchecked
+ UserChecked, ///< @brief Show button, starts checked
+ Always ///< @brief Show button, can't change, checked
+ };
+
explicit FinishedViewStep( QObject* parent = nullptr );
virtual ~FinishedViewStep() override;
@@ -70,4 +79,4 @@ private:
CALAMARES_PLUGIN_FACTORY_DECLARATION( FinishedViewStepFactory )
-#endif // FINISHEDPAGEPLUGIN_H
+#endif
diff --git a/src/modules/finished/finished.conf b/src/modules/finished/finished.conf
index 29e5e49b4587ebd0a0bf3a901b2ad17c51dfe0d1..3b6dd9dd12d1ee5acbc1156cceb50b6ab363b05f 100644
--- a/src/modules/finished/finished.conf
+++ b/src/modules/finished/finished.conf
@@ -1,14 +1,37 @@
# Configuration for the "finished" page, which is usually shown only at
# the end of the installation (successful or not).
---
+# DEPRECATED
+#
# The finished page can hold a "restart system now" checkbox.
# If this is false, no checkbox is shown and the system is not restarted
# when Calamares exits.
-restartNowEnabled: true
+# restartNowEnabled: true
+# DEPRECATED
+#
# Initial state of the checkbox "restart now". Only relevant when the
# checkbox is shown by restartNowEnabled.
-restartNowChecked: false
+# restartNowChecked: false
+
+# Behavior of the "restart system now" button.
+#
+# There are four usable values:
+# - never
+# Does not show the button and does not restart.
+# This matches the old behavior with restartNowEnabled=false.
+# - user-unchecked
+# Shows the button, defaults to unchecked, restarts if it is checked.
+# This matches the old behavior with restartNowEnabled=true and restartNowChecked=false.
+# - user-checked
+# Shows the button, defaults to checked, restarts if it is checked.
+# This matches the old behavior with restartNowEnabled=true and restartNowChecked=true.
+# - always
+# Shows the button, checked, but the user cannot change it.
+# This is new behavior.
+#
+# The three combinations of legacy values are still supported.
+restartNowMode: user-unchecked
# If the checkbox is shown, and the checkbox is checked, then when
# Calamares exits from the finished-page it will run this command.
diff --git a/src/modules/fsresizer/CMakeLists.txt b/src/modules/fsresizer/CMakeLists.txt
index 9c1da386bb28ee55ff73b08ea368eee0ddfa9fa3..ba9c81f4cc92a14d368bc19484dedc6fe3ac90be 100644
--- a/src/modules/fsresizer/CMakeLists.txt
+++ b/src/modules/fsresizer/CMakeLists.txt
@@ -6,8 +6,7 @@ if ( KPMcore_FOUND )
find_package( Qt5 REQUIRED DBus ) # Needed for KPMCore
find_package( KF5 REQUIRED I18n WidgetsAddons ) # Needed for KPMCore
- include_directories( ${KPMCORE_INCLUDE_DIR} )
- include_directories( ${PROJECT_BINARY_DIR}/src/libcalamares )
+ include_directories( ${KPMCORE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src/modules/partition )
if ( KPMcore_VERSION VERSION_GREATER "3.3.0")
list( APPEND _partition_defs WITH_KPMCORE331API) # kpmcore > 3.3.0 with deprecations
diff --git a/src/modules/fsresizer/ResizeFSJob.cpp b/src/modules/fsresizer/ResizeFSJob.cpp
index c8224a4c4c25541f2800aeb68003b0c60662db00..0ab583367e9264f13d96b473e660c25bdf1e37be 100644
--- a/src/modules/fsresizer/ResizeFSJob.cpp
+++ b/src/modules/fsresizer/ResizeFSJob.cpp
@@ -37,67 +37,10 @@
#include "utils/Units.h"
#include "utils/Variant.h"
-#include "modules/partition/core/PartitionIterator.h"
+// From partition module
+#include "core/PartitionIterator.h"
-static const NamedEnumTable<ResizeFSJob::RelativeUnit>&
-unitSuffixes()
-{
- using Unit = ResizeFSJob::RelativeUnit;
-
- static const NamedEnumTable<Unit> names{
- { QStringLiteral( "%" ), Unit::Percent },
- { QStringLiteral( "MiB" ), Unit::Absolute }
- };
-
- return names;
-}
-
-ResizeFSJob::RelativeSize::RelativeSize( const QString& s )
- : NamedSuffix( unitSuffixes(), s )
-{
- if ( ( unit() == RelativeUnit::Percent ) && ( value() > 100 ) )
- {
- cDebug() << "Percent value" << value() << "is not valid.";
- m_value = 0;
- m_unit = RelativeUnit::None;
- }
-
- if ( !m_value )
- m_unit = RelativeUnit::None;
-}
-
-qint64
-ResizeFSJob::RelativeSize::apply( qint64 totalSectors, qint64 sectorSize )
-{
- if ( !isValid() )
- return -1;
- if ( sectorSize < 1 )
- return -1;
-
- switch ( m_unit )
- {
- case unit_t::None:
- return -1;
- case unit_t::Absolute:
- return CalamaresUtils::MiBtoBytes( static_cast<unsigned long long>( value() ) ) / sectorSize;
- case unit_t::Percent:
- if ( value() == 100 )
- return totalSectors; // Common-case, avoid futzing around
- else
- return totalSectors * value() / 100;
- }
-
- // notreached
- return -1;
-}
-
-qint64
-ResizeFSJob::RelativeSize::apply( Device* d )
-{
- return apply( d->totalLogical(), d->logicalSize() );
-}
-
ResizeFSJob::ResizeFSJob( QObject* parent )
: Calamares::CppJob( parent )
, m_required( false )
@@ -202,7 +145,7 @@ ResizeFSJob::findGrownEnd( ResizeFSJob::PartitionMatch m )
qint64 expand = last_available - last_currently; // number of sectors
if ( m_atleast.isValid() )
{
- qint64 required = m_atleast.apply( m.first );
+ qint64 required = m_atleast.toSectors( m.first->totalLogical(), m.first->logicalSize() );
if ( expand < required )
{
cDebug() << Logger::SubEntry << "need to expand by" << required << "but only" << expand << "is available.";
@@ -210,7 +153,7 @@ ResizeFSJob::findGrownEnd( ResizeFSJob::PartitionMatch m )
}
}
- qint64 wanted = m_size.apply( expand, m.first->logicalSize() );
+ qint64 wanted = m_size.toSectors( expand, m.first->logicalSize() );
if ( wanted < expand )
{
cDebug() << Logger::SubEntry << "only growing by" << wanted << "instead of full" << expand;
@@ -329,8 +272,8 @@ ResizeFSJob::setConfigurationMap( const QVariantMap& configurationMap )
return;
}
- m_size = RelativeSize( configurationMap["size"].toString() );
- m_atleast = RelativeSize( configurationMap["atleast"].toString() );
+ m_size = Calamares::PartitionSize( configurationMap["size"].toString() );
+ m_atleast = Calamares::PartitionSize( configurationMap["atleast"].toString() );
m_required = CalamaresUtils::getBool( configurationMap, "required", false );
}
diff --git a/src/modules/fsresizer/ResizeFSJob.h b/src/modules/fsresizer/ResizeFSJob.h
index d575f18a9a18b172c6754b3f4044c3743b53bfb6..97696e40b72790df25d9178287bcf087cb5b2599 100644
--- a/src/modules/fsresizer/ResizeFSJob.h
+++ b/src/modules/fsresizer/ResizeFSJob.h
@@ -24,7 +24,7 @@
#include <CppJob.h>
-#include "utils/NamedSuffix.h"
+#include "partition/PartitionSize.h"
#include "utils/PluginFactory.h"
#include <PluginDllMacro.h>
@@ -38,48 +38,6 @@ class PLUGINDLLEXPORT ResizeFSJob : public Calamares::CppJob
Q_OBJECT
public:
- enum class RelativeUnit
- {
- None,
- Percent,
- Absolute
- };
-
- /** @brief Size expressions
- *
- * Sizes can be specified in MiB or percent (of the device they
- * are on). This class handles parsing of such strings from the
- * config file.
- */
- class RelativeSize : public NamedSuffix<RelativeUnit, RelativeUnit::None>
- {
- public:
- RelativeSize() : NamedSuffix() { };
- RelativeSize( const QString& );
-
- bool isValid() const
- {
- return ( unit() != RelativeUnit::None ) && ( value() > 0 );
- }
-
- /** @brief Apply this size to the number of sectors @p totalSectors .
- *
- * Each sector has size @p sectorSize , for converting absolute
- * sizes in MiB to sector counts.
- *
- * For invalid sizes, returns -1.
- * For absolute sizes, returns the number of sectors needed.
- * For percent sizes, returns that percent of the number of sectors.
- */
- qint64 apply( qint64 totalSectors, qint64 sectorSize );
-
- /** @brief Apply this size to the given device.
- *
- * Equivalent to apply( d->totalLogical(), d->logicalSize() )
- */
- qint64 apply( Device* d );
- } ;
-
explicit ResizeFSJob( QObject* parent = nullptr );
virtual ~ResizeFSJob() override;
@@ -97,8 +55,8 @@ public:
}
private:
- RelativeSize m_size;
- RelativeSize m_atleast;
+ Calamares::PartitionSize m_size;
+ Calamares::PartitionSize m_atleast;
QString m_fsname; // Either this, or devicename, is set, not both
QString m_devicename;
bool m_required;
diff --git a/src/modules/fsresizer/Tests.cpp b/src/modules/fsresizer/Tests.cpp
index 190a1d27978097894d4a6e51b0e33b3e793c9a43..5e645a95f5b66ba111bbdc7e95c4e3f92dd2ee13 100644
--- a/src/modules/fsresizer/Tests.cpp
+++ b/src/modules/fsresizer/Tests.cpp
@@ -57,8 +57,8 @@ void FSResizerTests::testConfigurationRobust()
j.setConfigurationMap( QVariantMap() );
QVERIFY( j.m_fsname.isEmpty() );
QVERIFY( j.m_devicename.isEmpty() );
- QCOMPARE( j.m_size.unit(), ResizeFSJob::RelativeUnit::None );
- QCOMPARE( j.m_atleast.unit(), ResizeFSJob::RelativeUnit::None );
+ QCOMPARE( j.m_size.unit(), Calamares::SizeUnit::None );
+ QCOMPARE( j.m_atleast.unit(), Calamares::SizeUnit::None );
// Config is missing fs and dev, so it isn't valid
YAML::Node doc0 = YAML::Load( R"(---
@@ -68,8 +68,8 @@ atleast: 600MiB
j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() );
QVERIFY( j.m_fsname.isEmpty() );
QVERIFY( j.m_devicename.isEmpty() );
- QCOMPARE( j.m_size.unit(), ResizeFSJob::RelativeUnit::None );
- QCOMPARE( j.m_atleast.unit(), ResizeFSJob::RelativeUnit::None );
+ QCOMPARE( j.m_size.unit(), Calamares::SizeUnit::None );
+ QCOMPARE( j.m_atleast.unit(), Calamares::SizeUnit::None );
QCOMPARE( j.m_size.value(), 0 );
QCOMPARE( j.m_atleast.value(), 0 );
}
@@ -87,8 +87,8 @@ atleast: 600MiB
j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() );
QVERIFY( !j.m_fsname.isEmpty() );
QVERIFY( j.m_devicename.isEmpty() );
- QCOMPARE( j.m_size.unit(), ResizeFSJob::RelativeUnit::Percent );
- QCOMPARE( j.m_atleast.unit(), ResizeFSJob::RelativeUnit::Absolute );
+ QCOMPARE( j.m_size.unit(), Calamares::SizeUnit::Percent );
+ QCOMPARE( j.m_atleast.unit(), Calamares::SizeUnit::MiB );
QCOMPARE( j.m_size.value(), 100 );
QCOMPARE( j.m_atleast.value(), 600 );
@@ -102,8 +102,8 @@ atleast: 127 %
j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() );
QVERIFY( !j.m_fsname.isEmpty() );
QVERIFY( !j.m_devicename.isEmpty() );
- QCOMPARE( j.m_size.unit(), ResizeFSJob::RelativeUnit::Absolute );
- QCOMPARE( j.m_atleast.unit(), ResizeFSJob::RelativeUnit::None );
+ QCOMPARE( j.m_size.unit(), Calamares::SizeUnit::MiB );
+ QCOMPARE( j.m_atleast.unit(), Calamares::SizeUnit::None );
QCOMPARE( j.m_size.value(), 72 );
QCOMPARE( j.m_atleast.value(), 0 );
@@ -117,8 +117,8 @@ size: 71MiB
j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() );
QVERIFY( !j.m_fsname.isEmpty() );
QVERIFY( j.m_devicename.isEmpty() );
- QCOMPARE( j.m_size.unit(), ResizeFSJob::RelativeUnit::Absolute );
- QCOMPARE( j.m_atleast.unit(), ResizeFSJob::RelativeUnit::None );
+ QCOMPARE( j.m_size.unit(), Calamares::SizeUnit::MiB );
+ QCOMPARE( j.m_atleast.unit(), Calamares::SizeUnit::None );
QCOMPARE( j.m_size.value(), 71 );
QCOMPARE( j.m_atleast.value(), 0 );
}
diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h
index 99f8ee4497c9a0e32d999fc9153a569d3d089b42..dca8b869a916f2a9d85d643c65fb75f5222e17dc 100644
--- a/src/modules/keyboard/KeyboardPage.h
+++ b/src/modules/keyboard/KeyboardPage.h
@@ -24,13 +24,11 @@
#ifndef KEYBOARDPAGE_H
#define KEYBOARDPAGE_H
-#include "keyboardwidget/keyboardglobal.h"
-
-#include "Typedefs.h"
+#include "Job.h"
#include <QListWidgetItem>
-#include <QWidget>
#include <QTimer>
+#include <QWidget>
namespace Ui
{
@@ -50,7 +48,7 @@ public:
QString prettyStatus() const;
- QList< Calamares::job_ptr > createJobs( const QString& xOrgConfFileName,
+ Calamares::JobList createJobs( const QString& xOrgConfFileName,
const QString& convertedKeymapPath,
bool writeEtcDefaultKeyboard );
diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt
index affaa3753b2c49f204365e6be639966dd814d3af..768a67543e49695f36d470b9cfb7adaa7b0e05e7 100644
--- a/src/modules/locale/CMakeLists.txt
+++ b/src/modules/locale/CMakeLists.txt
@@ -8,16 +8,6 @@ endif()
include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
-set( geoip_src GeoIP.cpp GeoIPJSON.cpp )
-set( geoip_libs )
-
-find_package(Qt5 COMPONENTS Xml)
-if( Qt5Xml_FOUND )
- list( APPEND geoip_src GeoIPXML.cpp )
- list( APPEND geoip_libs Qt5::Xml )
- add_definitions( -DHAVE_XML )
-endif()
-
calamares_add_plugin( locale
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
@@ -42,20 +32,6 @@ calamares_add_plugin( locale
)
if( ECM_FOUND AND BUILD_TESTING )
- ecm_add_test(
- GeoIPTests.cpp
- ${geoip_src}
- TEST_NAME
- geoiptest
- LINK_LIBRARIES
- calamaresui
- Qt5::Network
- Qt5::Test
- ${geoip_libs}
- ${YAMLCPP_LIBRARY}
- )
- calamares_automoc( geoiptest )
-
ecm_add_test(
Tests.cpp
LocaleConfiguration.cpp
@@ -67,9 +43,3 @@ if( ECM_FOUND AND BUILD_TESTING )
)
calamares_automoc( localetest )
endif()
-
-if( BUILD_TESTING )
- add_executable( test_geoip test_geoip.cpp ${geoip_src} )
- target_link_libraries( test_geoip calamaresui Qt5::Network ${geoip_libs} ${YAMLCPP_LIBRARY} )
- calamares_automoc( test_geoip )
-endif()
diff --git a/src/modules/locale/GeoIP.h b/src/modules/locale/GeoIP.h
deleted file mode 100644
index 41abd2042668fae167eb2aba8c39531db67a8db8..0000000000000000000000000000000000000000
--- a/src/modules/locale/GeoIP.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
- *
- * Copyright 2018, Adriaan de Groot <groot@kde.org>
- *
- * Calamares is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Calamares is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GEOIP_H
-#define GEOIP_H
-
-#include <QPair>
-#include <QString>
-#include <QUrl>
-
-class QByteArray;
-
-/**
- * @brief Interface for GeoIP retrievers.
- *
- * A GeoIP retriever takes a configured URL (from the config file)
- * and can handle the data returned from its interpretation of that
- * configured URL, returning a region and zone.
- */
-class GeoIP
-{
-public:
- using RegionZonePair = QPair<QString, QString>;
-
- virtual ~GeoIP();
-
- /** @brief Handle a (successful) request by interpreting the data.
- *
- * Should return a ( <zone>, <region> ) pair, e.g.
- * ( "Europe", "Amsterdam" ). This is called **only** if the
- * request to the fullUrl was successful; the handler
- * is free to read as much, or as little, data as it
- * likes. On error, returns a RegionZonePair with empty
- * strings (e.g. ( "", "" ) ).
- */
- virtual RegionZonePair processReply( const QByteArray& ) = 0;
-
- /** @brief Splits a region/zone string into a pair.
- *
- * Cleans up the string by removing backslashes (\\)
- * since some providers return silly-escaped names. Replaces
- * spaces with _ since some providers return human-readable names.
- * Splits on the first / in the resulting string, or returns a
- * pair of empty QStrings if it can't. (e.g. America/North Dakota/Beulah
- * will return "America", "North_Dakota/Beulah").
- */
- static RegionZonePair splitTZString( const QString& s );
-
-protected:
- GeoIP( const QString& e = QString() );
-
- QString m_element; // string for selecting from data
-} ;
-
-#endif
diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index c8076866ed449e0996e86e1313e2236143eb758c..f6cdba4363dec044f2b536600ab8e40189b85cf8 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -27,8 +27,8 @@
#include "LCLocaleDialog.h"
#include "Settings.h"
+#include "locale/Label.h"
#include "utils/CalamaresUtilsGui.h"
-#include "utils/LocaleLabel.h"
#include "utils/Logger.h"
#include "utils/Retranslator.h"
@@ -387,10 +387,10 @@ LocalePage::init( const QString& initialRegion,
std::pair< QString, QString > LocalePage::prettyLocaleStatus( const LocaleConfiguration& lc ) const
{
- using CalamaresUtils::LocaleLabel;
+ using CalamaresUtils::Locale::Label;
- LocaleLabel lang( lc.language(), LocaleLabel::LabelFormat::AlwaysWithCountry );
- LocaleLabel num( lc.lc_numeric, LocaleLabel::LabelFormat::AlwaysWithCountry );
+ Label lang( lc.language(), Label::LabelFormat::AlwaysWithCountry );
+ Label num( lc.lc_numeric, Label::LabelFormat::AlwaysWithCountry );
return std::make_pair< QString, QString >(
tr( "The system language will be set to %1." ).arg( lang.label() ),
diff --git a/src/modules/locale/LocalePage.h b/src/modules/locale/LocalePage.h
index 2a9dc8b60dd3a423226dee93ab3475a1cb3fe4da..20ad444c969795b002566be99f4db7a7967a8d44 100644
--- a/src/modules/locale/LocalePage.h
+++ b/src/modules/locale/LocalePage.h
@@ -20,9 +20,8 @@
#ifndef LOCALEPAGE_H
#define LOCALEPAGE_H
-#include "Typedefs.h"
-
#include "LocaleConfiguration.h"
+#include "Job.h"
#include <QWidget>
@@ -44,7 +43,7 @@ public:
QString prettyStatus() const;
- QList< Calamares::job_ptr > createJobs();
+ Calamares::JobList createJobs();
QMap< QString, QString > localesMap();
diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp
index d321b850154eb1976ce9c5e42c684d53ce50adfb..29006ec33833e502fe724cbca5290084835c650f 100644
--- a/src/modules/locale/LocaleViewStep.cpp
+++ b/src/modules/locale/LocaleViewStep.cpp
@@ -19,18 +19,15 @@
#include "LocaleViewStep.h"
-#include "GeoIP.h"
-#include "GeoIPJSON.h"
-#ifdef HAVE_XML
-#include "GeoIPXML.h"
-#endif
-#include "GlobalStorage.h"
-#include "JobQueue.h"
#include "LocalePage.h"
-
#include "timezonewidget/localeglobal.h"
#include "widgets/WaitingWidget.h"
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+
+#include "geoip/Handler.h"
+
#include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h"
#include "utils/Variant.h"
@@ -116,54 +113,16 @@ LocaleViewStep::setUpPage()
void
LocaleViewStep::fetchGeoIpTimezone()
{
- QString actualUrl( m_geoipUrl );
- GeoIP *handler = nullptr;
-
- if ( m_geoipStyle.isEmpty() || m_geoipStyle == "legacy" )
- {
- actualUrl.append( "/json/" );
- handler = new GeoIPJSON( m_geoipSelector );
- }
- else if ( m_geoipStyle == "json" )
+ CalamaresUtils::GeoIP::Handler h( m_geoipStyle, m_geoipUrl, m_geoipSelector );
+ if ( h.isValid() )
{
- handler = new GeoIPJSON( m_geoipSelector );
+ m_startingTimezone = h.get();
+ if ( !m_startingTimezone.isValid() )
+ cWarning() << "GeoIP lookup at" << m_geoipUrl << "failed.";
}
-#if defined(HAVE_XML)
- else if ( m_geoipStyle == "xml" )
- {
- handler = new GeoIPXML( m_geoipSelector );
- }
-#endif
else
- {
cWarning() << "GeoIP Style" << m_geoipStyle << "is not recognized.";
- setUpPage();
- return;
- }
- cDebug() << "Fetching GeoIP data from" << actualUrl;
-
- QNetworkAccessManager *manager = new QNetworkAccessManager( this );
- connect( manager, &QNetworkAccessManager::finished,
- [=]( QNetworkReply* reply )
- {
- if ( reply->error() == QNetworkReply::NoError )
- {
- auto tz = handler->processReply( reply->readAll() );
- if ( !tz.first.isEmpty() )
- m_startingTimezone = tz;
- else
- cWarning() << "GeoIP lookup at" << reply->url() << "failed.";
- }
- delete handler;
- reply->deleteLater();
- manager->deleteLater();
- setUpPage();
- } );
-
- QNetworkRequest request;
- request.setUrl( QUrl::fromUserInput( actualUrl ) );
- request.setAttribute( QNetworkRequest::FollowRedirectsAttribute, true );
- manager->get( request );
+ setUpPage();
}
@@ -251,35 +210,43 @@ LocaleViewStep::onLeave()
void
LocaleViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{
- if ( configurationMap.contains( "region" ) &&
- configurationMap.value( "region" ).type() == QVariant::String &&
- !configurationMap.value( "region" ).toString().isEmpty() &&
- configurationMap.contains( "zone" ) &&
- configurationMap.value( "zone" ).type() == QVariant::String &&
- !configurationMap.value( "zone" ).toString().isEmpty() )
+ QString region = CalamaresUtils::getString( configurationMap, "region" );
+ QString zone = CalamaresUtils::getString( configurationMap, "zone" );
+ if ( !region.isEmpty() && !zone.isEmpty() )
{
- m_startingTimezone = qMakePair( configurationMap.value( "region" ).toString(),
- configurationMap.value( "zone" ).toString() );
+ m_startingTimezone = CalamaresUtils::GeoIP::RegionZonePair( region, zone );
}
else
{
- m_startingTimezone = qMakePair( QStringLiteral( "America" ),
- QStringLiteral( "New_York" ) );
+ m_startingTimezone = CalamaresUtils::GeoIP::RegionZonePair( QStringLiteral( "America" ), QStringLiteral( "New_York" ) );
}
- if ( configurationMap.contains( "localeGenPath" ) &&
- configurationMap.value( "localeGenPath" ).type() == QVariant::String &&
- !configurationMap.value( "localeGenPath" ).toString().isEmpty() )
+ m_localeGenPath = CalamaresUtils::getString( configurationMap, "localeGenPath" );
+ if ( m_localeGenPath.isEmpty() )
+ m_localeGenPath = QStringLiteral( "/etc/locale.gen" );
+
+ bool ok = false;
+ QVariantMap geoip = CalamaresUtils::getSubMap( configurationMap, "geoip", ok );
+ if ( ok )
{
- m_localeGenPath = configurationMap.value( "localeGenPath" ).toString();
+ m_geoipUrl = CalamaresUtils::getString( geoip, "url" );
+ m_geoipStyle = CalamaresUtils::getString( geoip, "style" );
+ m_geoipSelector = CalamaresUtils::getString( geoip, "selector" );
}
else
{
- m_localeGenPath = QStringLiteral( "/etc/locale.gen" );
- }
+ // Optional
+ m_geoipUrl = CalamaresUtils::getString( configurationMap, "geoipUrl" );
+ m_geoipStyle = CalamaresUtils::getString( configurationMap, "geoipStyle" );
+ m_geoipSelector = CalamaresUtils::getString( configurationMap, "geoipSelector" );
- // Optional
- m_geoipUrl = CalamaresUtils::getString( configurationMap, "geoipUrl" );
- m_geoipStyle = CalamaresUtils::getString( configurationMap, "geoipStyle" );
- m_geoipSelector = CalamaresUtils::getString( configurationMap, "geoipSelector" );
+ if ( !m_geoipUrl.isEmpty() && ( m_geoipStyle.isEmpty() || m_geoipStyle == "legacy" ) )
+ {
+ m_geoipStyle = "json";
+ m_geoipUrl.append( "/json/" );
+ }
+
+ if ( !m_geoipUrl.isEmpty() )
+ cWarning() << "Legacy-style GeoIP configuration is deprecated. Use geoip: map.";
+ }
}
diff --git a/src/modules/locale/LocaleViewStep.h b/src/modules/locale/LocaleViewStep.h
index 3f5c91621c14bf8445427a0eef8bce120c628523..8ab50b75db90dbc42754b7c3f5c92c7066b48800 100644
--- a/src/modules/locale/LocaleViewStep.h
+++ b/src/modules/locale/LocaleViewStep.h
@@ -20,14 +20,14 @@
#ifndef LOCALEVIEWSTEP_H
#define LOCALEVIEWSTEP_H
-#include <QObject>
-
-#include <utils/PluginFactory.h>
-#include <viewpages/ViewStep.h>
+#include "geoip/Interface.h"
+#include "utils/PluginFactory.h"
+#include "viewpages/ViewStep.h"
-#include <PluginDllMacro.h>
+#include "PluginDllMacro.h"
#include <QFutureWatcher>
+#include <QObject>
class LocalePage;
class WaitingWidget;
@@ -71,7 +71,7 @@ private:
bool m_nextEnabled;
QString m_prettyStatus;
- QPair< QString, QString > m_startingTimezone;
+ CalamaresUtils::GeoIP::RegionZonePair m_startingTimezone;
QString m_localeGenPath;
QString m_geoipUrl; // The URL, depening on style might be modified on lookup
diff --git a/src/modules/locale/locale.conf b/src/modules/locale/locale.conf
index ddd0bc97e248acbf29a822fe281c922e7f967cde..7c2ec332c287dfdb47343423e1e267f94c7ed954 100644
--- a/src/modules/locale/locale.conf
+++ b/src/modules/locale/locale.conf
@@ -25,21 +25,46 @@ zone: "New_York"
# custom path for locale.gen
#localeGenPath: "PATH_TO/locale.gen"
-# GeoIP based Language settings:
+# GeoIP based Language settings: Leave commented out to disable GeoIP.
#
-# GeoIP need an working Internet connection.
+# GeoIP needs a working Internet connection.
# This can be managed from `welcome.conf` by adding
# internet to the list of required conditions.
#
-# Leave commented out to disable GeoIP.
+# The configuration
+# is in three parts: a *style*, which can be "json" or "xml"
+# depending on the kind of data returned by the service, and
+# a *url* where the data is retrieved, and an optional *selector*
+# to pick the right field out of the returned data (e.g. field
+# name in JSON or element name in XML).
#
-# An HTTP request is made to *geoipUrl* -- depending on the geoipStyle,
-# the URL may be modified before use. The request should return
-# valid data in a suitable format, depending on geoipStyle;
+# The default selector (when the setting is blank) is picked to
+# work with existing JSON providers (which use "time_zone") and
+# Ubiquity's XML providers (which use "TimeZone").
+#
+# If the service configured via *url* uses
+# a different attribute name (e.g. "timezone") in JSON or a
+# different element tag (e.g. "<Time_Zone>") in XML, set this
+# string to the name or tag to be used.
+#
+# In JSON:
+# - if the string contains "." characters, this is used as a
+# multi-level selector, e.g. "a.b" will select the timezone
+# from data "{a: {b: "Europe/Amsterdam" } }".
+# - each part of the string split by "." characters is used as
+# a key into the JSON data.
+# In XML:
+# - all elements with the named tag (e.g. all TimeZone) elements
+# from the document are checked; the first one with non-empty
+# text value is used.
+#
+#
+# An HTTP(S) request is made to *url*. The request should return
+# valid data in a suitable format, depending on *style*;
# generally this includes a string value with the timezone
# in <region>/<zone> format. For services that return data which
# does not follow the conventions of "suitable data" described
-# below, *geoIPSelector* may be used to pick different data.
+# below, *selector* may be used to pick different data.
#
# Note that this example URL works, but the service is shutting
# down in June 2018.
@@ -58,40 +83,9 @@ zone: "New_York"
# - backslashes are removed
# - spaces are replaced with _
#
-#geoipUrl: "freegeoip.net"
-
-# GeoIP style. Leave commented out for the "legacy" interpretation.
-# This setting only makes sense if geoipUrl is set, enabliing geoIP.
-#
-# Possible values are:
-# unset same as "legacy"
-# blank same as "legacy"
-# "legacy" appends "/json" to geoipUrl, above, and uses JSON format
-# (which is what freegeoip.net provides there).
-# "json" URL is not modified, uses JSON format.
-# "xml" URL is not modified, uses XML format.
-#
-# The JSON format is provided by freegeoip.net, but that service is
-# shutting down in June 2018. There are other providers with the same
-# format. XML format is provided for Ubiquity.
-#geoipStyle: "legacy"
-
-# GeoIP selector. Leave commented out for the default selector
-# (which depends on the style: JSON uses "time_zone" and XML
-# uses TimeZone, for the FreeGeoIP-alike and the Ubiquity-alike
-# respectively). If the service configured via *geoipUrl* uses
-# a different attribute name (e.g. "timezone") in JSON or a
-# different element tag (e.g. "<Time_Zone>") in XML, set this
-# string to the name or tag to be used.
-#
-# In JSON:
-# - if the string contains "." characters, this is used as a
-# multi-level selector, e.g. "a.b" will select the timezone
-# from data "{a: {b: "Europe/Amsterdam" } }".
-# - each part of the string split by "." characters is used as
-# a key into the JSON data.
-# In XML:
-# - all elements with the named tag (e.g. all TimeZone) elements
-# from the document are checked; the first one with non-empty
-# text value is used.
-#geoipSelector: ""
+# Legacy settings "geoipStyle", "geoipUrl" and "geoipSelector"
+# in the top-level are still supported, but I'd advise against.
+geoip:
+ style: "json"
+ url: "https://geoip.kde.org/v1/calamares"
+ selector: "" # leave blank for the default
diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
index aab3568d1f653275e112c7fa68ab88dca35b4656..ed649aead315af04a4c53cf497006b7cff204052 100644
--- a/src/modules/mount/main.py
+++ b/src/modules/mount/main.py
@@ -6,6 +6,7 @@
# Copyright 2014, Aurélien Gâteau <agateau@kde.org>
# Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2019, Adriaan de Groot <groot@kde.org>
+# Copyright 2019, Kevin Kofler <kevin.kofler@chello.at>
#
# Calamares is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -22,6 +23,7 @@
import tempfile
import subprocess
+import os
import libcalamares
@@ -48,7 +50,15 @@ def mount_partitions(root_mount_point, partitions):
continue
# Create mount point with `+` rather than `os.path.join()` because
# `partition["mountPoint"]` starts with a '/'.
- mount_point = root_mount_point + partition["mountPoint"]
+ raw_mount_point = partition["mountPoint"]
+ mount_point = root_mount_point + raw_mount_point
+
+ # Ensure that the created directory has the correct SELinux context on
+ # SELinux-enabled systems.
+ os.makedirs(mount_point, exist_ok=True)
+ subprocess.call(['chcon', '--reference=' + raw_mount_point,
+ mount_point])
+
fstype = partition.get("fs", "").lower()
if fstype == "fat16" or fstype == "fat32":
diff --git a/src/modules/netinstall/NetInstallPage.h b/src/modules/netinstall/NetInstallPage.h
index 7ec37e7ac8efdebb54c6f3968de0a2737290ad10..b2887304b20c01b2e8c77784e33f5ff0bbb9b0d9 100644
--- a/src/modules/netinstall/NetInstallPage.h
+++ b/src/modules/netinstall/NetInstallPage.h
@@ -23,7 +23,6 @@
#include "PackageModel.h"
#include "PackageTreeItem.h"
-#include "Typedefs.h"
#include <QAbstractButton>
#include <QNetworkAccessManager>
diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 251fc62db9539c018f133414081a14c6dc8b8e38..7b44d3d6497f8383e0cbd45c6c34579cb836c56a 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -43,216 +43,6 @@
namespace PartUtils
{
-static const NamedEnumTable<SizeUnit>&
-unitSuffixes()
-{
- static const NamedEnumTable<SizeUnit> names{
- { QStringLiteral( "%" ), SizeUnit::Percent },
- { QStringLiteral( "B" ), SizeUnit::Byte },
- { QStringLiteral( "K" ), SizeUnit::KiB },
- { QStringLiteral( "M" ), SizeUnit::MiB },
- { QStringLiteral( "G" ), SizeUnit::GiB }
- };
-
- return names;
-}
-
-PartSize::PartSize( const QString& s )
- : NamedSuffix( unitSuffixes(), s )
-{
- if ( ( unit() == SizeUnit::Percent ) && ( value() > 100 || value() < 0 ) )
- {
- cDebug() << "Percent value" << value() << "is not valid.";
- m_value = 0;
- }
-
- if ( m_unit == SizeUnit::None )
- {
- m_value = s.toInt();
- if ( m_value > 0 )
- m_unit = SizeUnit::Byte;
- }
-
- if ( m_value <= 0 )
- {
- m_value = 0;
- m_unit = SizeUnit::None;
- }
-}
-
-qint64
-PartSize::toSectors( qint64 totalSectors, qint64 sectorSize ) const
-{
- if ( !isValid() )
- return -1;
- if ( totalSectors < 1 || sectorSize < 1 )
- return -1;
-
- switch ( m_unit )
- {
- case unit_t::None:
- return -1;
- case unit_t::Percent:
- if ( value() == 100 )
- return totalSectors; // Common-case, avoid futzing around
- else
- return totalSectors * value() / 100;
- case unit_t::Byte:
- case unit_t::KiB:
- case unit_t::MiB:
- case unit_t::GiB:
- return bytesToSectors ( toBytes(), sectorSize );
- }
-
- return -1;
-}
-
-qint64
-PartSize::toBytes( qint64 totalSectors, qint64 sectorSize ) const
-{
- if ( !isValid() )
- return -1;
-
- switch ( m_unit )
- {
- case unit_t::None:
- return -1;
- case unit_t::Percent:
- if ( totalSectors < 1 || sectorSize < 1 )
- return -1;
- if ( value() == 100 )
- return totalSectors * sectorSize; // Common-case, avoid futzing around
- else
- return totalSectors * value() / 100;
- case unit_t::Byte:
- case unit_t::KiB:
- case unit_t::MiB:
- case unit_t::GiB:
- return toBytes();
- }
-
- // notreached
- return -1;
-}
-
-qint64
-PartSize::toBytes( qint64 totalBytes ) const
-{
- if ( !isValid() )
- return -1;
-
- switch ( m_unit )
- {
- case unit_t::None:
- return -1;
- case unit_t::Percent:
- if ( totalBytes < 1 )
- return -1;
- if ( value() == 100 )
- return totalBytes; // Common-case, avoid futzing around
- else
- return totalBytes * value() / 100;
- case unit_t::Byte:
- case unit_t::KiB:
- case unit_t::MiB:
- case unit_t::GiB:
- return toBytes();
- }
-
- // notreached
- return -1;
-}
-
-qint64
-PartSize::toBytes() const
-{
- if ( !isValid() )
- return -1;
-
- switch ( m_unit )
- {
- case unit_t::Byte:
- return value();
- case unit_t::KiB:
- return CalamaresUtils::KiBtoBytes( static_cast<unsigned long long>( value() ) );
- case unit_t::MiB:
- return CalamaresUtils::MiBtoBytes( static_cast<unsigned long long>( value() ) );
- case unit_t::GiB:
- return CalamaresUtils::GiBtoBytes( static_cast<unsigned long long>( value() ) );
- default:
- break;
- }
-
- // Reached only when unit is Percent or None
- return -1;
-}
-
-bool
-PartSize::operator< ( const PartSize& other ) const
-{
- if ( ( m_unit == SizeUnit::None || other.m_unit == SizeUnit::None ) ||
- ( m_unit == SizeUnit::Percent && other.m_unit != SizeUnit::Percent ) ||
- ( m_unit != SizeUnit::Percent && other.m_unit == SizeUnit::Percent ) )
- return false;
-
- switch ( m_unit )
- {
- case SizeUnit::Percent:
- return ( m_value < other.m_value );
- case SizeUnit::Byte:
- case SizeUnit::KiB:
- case SizeUnit::MiB:
- case SizeUnit::GiB:
- return ( toBytes() < other.toBytes () );
- }
-
- return false;
-}
-
-bool
-PartSize::operator> ( const PartSize& other ) const
-{
- if ( ( m_unit == SizeUnit::None || other.m_unit == SizeUnit::None ) ||
- ( m_unit == SizeUnit::Percent && other.m_unit != SizeUnit::Percent ) ||
- ( m_unit != SizeUnit::Percent && other.m_unit == SizeUnit::Percent ) )
- return false;
-
- switch ( m_unit )
- {
- case SizeUnit::Percent:
- return ( m_value > other.m_value );
- case SizeUnit::Byte:
- case SizeUnit::KiB:
- case SizeUnit::MiB:
- case SizeUnit::GiB:
- return ( toBytes() > other.toBytes () );
- }
-
- return false;
-}
-
-bool
-PartSize::operator== ( const PartSize& other ) const
-{
- if ( ( m_unit == SizeUnit::None || other.m_unit == SizeUnit::None ) ||
- ( m_unit == SizeUnit::Percent && other.m_unit != SizeUnit::Percent ) ||
- ( m_unit != SizeUnit::Percent && other.m_unit == SizeUnit::Percent ) )
- return false;
-
- switch ( m_unit )
- {
- case SizeUnit::Percent:
- return ( m_value == other.m_value );
- case SizeUnit::Byte:
- case SizeUnit::KiB:
- case SizeUnit::MiB:
- case SizeUnit::GiB:
- return ( toBytes() == other.toBytes () );
- }
-
- return false;
-}
-
QString
convenienceName( const Partition* const candidate )
{
@@ -284,7 +74,7 @@ canBeReplaced( Partition* candidate )
bool ok = false;
double requiredStorageGB = Calamares::JobQueue::instance()
->globalStorage()
- ->value( "requiredStorageGB" )
+ ->value( "requiredStorageGiB" )
.toDouble( &ok );
qint64 availableStorageB = candidate->capacity();
@@ -356,7 +146,7 @@ canBeResized( Partition* candidate )
bool ok = false;
double requiredStorageGB = Calamares::JobQueue::instance()
->globalStorage()
- ->value( "requiredStorageGB" )
+ ->value( "requiredStorageGiB" )
.toDouble( &ok );
// We require a little more for partitioning overhead and swap file
double advisedStorageGB = requiredStorageGB + 0.5 + 2.0;
diff --git a/src/modules/partition/core/PartUtils.h b/src/modules/partition/core/PartUtils.h
index 4653468c3343ac2a33e1b664e9593b9efdf3112e..1b4ee0b71203b2df375e10b397a6dff3667da34c 100644
--- a/src/modules/partition/core/PartUtils.h
+++ b/src/modules/partition/core/PartUtils.h
@@ -36,78 +36,6 @@ class Partition;
namespace PartUtils
{
-using CalamaresUtils::MiBtoBytes;
-
-enum class SizeUnit
-{
- None,
- Percent,
- Byte,
- KiB,
- MiB,
- GiB
-};
-
-/** @brief Partition size expressions
- *
- * Sizes can be specified in bytes, KiB, MiB, GiB or percent (of
- * the available drive space are on). This class handles parsing
- * of such strings from the config file.
- */
-class PartSize : public NamedSuffix<SizeUnit, SizeUnit::None>
-{
-public:
- PartSize() : NamedSuffix() { }
- PartSize( int v, unit_t u ) : NamedSuffix( v, u ) { }
- PartSize( const QString& );
-
- bool isValid() const
- {
- return ( unit() != SizeUnit::None ) && ( value() > 0 );
- }
-
- bool operator< ( const PartSize& other ) const;
- bool operator> ( const PartSize& other ) const;
- bool operator== ( const PartSize& other ) const;
-
- /** @brief Convert the size to the number of sectors @p totalSectors .
- *
- * Each sector has size @p sectorSize, for converting sizes in Bytes,
- * KiB, MiB or GiB to sector counts.
- *
- * @return the number of sectors needed, or -1 for invalid sizes.
- */
- qint64 toSectors( qint64 totalSectors, qint64 sectorSize ) const;
-
- /** @brief Convert the size to bytes.
- *
- * The device's sectors count @p totalSectors and sector size
- * @p sectoreSize are used to calculated the total size, which
- * is then used to calculate the size when using Percent.
- *
- * @return the size in bytes, or -1 for invalid sizes.
- */
- qint64 toBytes( qint64 totalSectors, qint64 sectorSize ) const;
-
- /** @brief Convert the size to bytes.
- *
- * Total size @p totalBytes is needed for sizes in Percent. This
- * parameter is unused in any other case.
- *
- * @return the size in bytes, or -1 for invalid sizes.
- */
- qint64 toBytes( qint64 totalBytes ) const;
-
- /** @brief Convert the size to bytes.
- *
- * This method is only valid for sizes in Bytes, KiB, MiB or GiB.
- * It will return -1 in any other case.
- *
- * @return the size in bytes, or -1 if it cannot be calculated.
- */
- qint64 toBytes() const;
-};
-
/**
* @brief Provides a nice human-readable name for @p candidate
@@ -171,30 +99,6 @@ bool isEfiBootable( const Partition* candidate );
*/
QString findFS( QString fsName, FileSystem::Type* fsType );
-/**
- * @brief Convert a partition size to a sectors count.
- * @param size the partition size.
- * @param unit the partition size unit.
- * @param totalSectors the total number of sectors of the selected drive.
- * @param logicalSize the sector size, in bytes.
- * @return the number of sectors to be used for the given partition size.
- */
-qint64 sizeToSectors( double size, SizeUnit unit, qint64 totalSectors, qint64 logicalSize );
-
-constexpr qint64 alignBytesToBlockSize( qint64 bytes, qint64 blocksize )
-{
- qint64 blocks = bytes / blocksize;
-
- if ( blocks * blocksize != bytes )
- ++blocks;
- return blocks * blocksize;
-}
-
-constexpr qint64 bytesToSectors( qint64 bytes, qint64 blocksize )
-{
- return alignBytesToBlockSize( alignBytesToBlockSize( bytes, blocksize), MiBtoBytes(1ULL) ) / blocksize;
-}
-
}
#endif // PARTUTILS_H
diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
index 761b8e4e33b4e261418816420464e5e19be9b188..1c89a5b7f923cbf4853c5fffa61389ecf75c77b3 100644
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -103,7 +103,8 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
{
if ( gs->contains( "efiSystemPartitionSize" ) )
{
- PartUtils::PartSize part_size = PartUtils::PartSize( gs->value( "efiSystemPartitionSize" ).toString() );
+ Calamares::PartitionSize part_size = Calamares::PartitionSize(
+ gs->value( "efiSystemPartitionSize" ).toString() );
uefisys_part_sizeB = part_size.toBytes( dev->capacity() );
}
else
@@ -115,11 +116,11 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
// Since sectors count from 0, if the space is 2048 sectors in size,
// the first free sector has number 2048 (and there are 2048 sectors
// before that one, numbered 0..2047).
- qint64 firstFreeSector = PartUtils::bytesToSectors( empty_space_sizeB, dev->logicalSize() );
+ qint64 firstFreeSector = CalamaresUtils::bytesToSectors( empty_space_sizeB, dev->logicalSize() );
if ( isEfi )
{
- qint64 efiSectorCount = PartUtils::bytesToSectors( uefisys_part_sizeB, dev->logicalSize() );
+ qint64 efiSectorCount = CalamaresUtils::bytesToSectors( uefisys_part_sizeB, dev->logicalSize() );
Q_ASSERT( efiSectorCount > 0 );
// Since sectors count from 0, and this partition is created starting
diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index b230a23fb0ce782d1f926a4ad9053cff2ecd26a3..6dd2b6faf245cea1bb696b79f9bb7a36e89ddaff 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -50,7 +50,6 @@
#ifdef DEBUG_PARTITION_LAME
#include "JobExample.h"
#endif
-#include "Typedefs.h"
#include "utils/Logger.h"
// KPMcore
diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h
index aebf9835f17fe52d46f577eb2ce76a1c1bde8b4a..906119a7472f0cacc1ed7494cd64a12b0b1f6404 100644
--- a/src/modules/partition/core/PartitionCoreModule.h
+++ b/src/modules/partition/core/PartitionCoreModule.h
@@ -24,7 +24,8 @@
#include "core/KPMHelpers.h"
#include "core/PartitionLayout.h"
#include "core/PartitionModel.h"
-#include "Typedefs.h"
+
+#include "Job.h"
// KPMcore
#include <kpmcore/core/lvmdevice.h>
@@ -172,7 +173,7 @@ public:
* requested by the user.
* @return a list of jobs.
*/
- QList< Calamares::job_ptr > jobs() const;
+ Calamares::JobList jobs() const;
bool hasRootMountPoint() const;
diff --git a/src/modules/partition/core/PartitionIterator.cpp b/src/modules/partition/core/PartitionIterator.cpp
index 8301835c65e08e5e732181ea45f66bca12cbac03..34471f6f2e9c917a1a897c6676ccb8f8c55e2d9a 100644
--- a/src/modules/partition/core/PartitionIterator.cpp
+++ b/src/modules/partition/core/PartitionIterator.cpp
@@ -98,7 +98,7 @@ PartitionIterator::begin( PartitionTable* table )
{
auto it = PartitionIterator( table );
QList< Partition* > children = table->children();
- // Does not usually happen, but it did happen on a 10MB disk with an MBR
+ // Does not usually happen, but it did happen on a tiny (10MiB) disk with an MBR
// partition table.
if ( children.isEmpty() )
return it;
diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 35a540a960790ecb487360c48f991c3138cb3a0f..a988da3f73a528ef50391e1653bc74c0bc840787 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -87,9 +87,9 @@ PartitionLayout::addEntry( PartitionLayout::PartitionEntry entry )
PartitionLayout::PartitionEntry::PartitionEntry( const QString& size, const QString& min, const QString& max )
{
- partSize = PartUtils::PartSize( size );
- partMinSize = PartUtils::PartSize( min );
- partMaxSize = PartUtils::PartSize( max );
+ partSize = Calamares::PartitionSize( size );
+ partMinSize = Calamares::PartitionSize( min );
+ partMaxSize = Calamares::PartitionSize( max );
}
bool
diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h
index 626c90b66eda3e90cb80eae399dd52916a1e2bee..74bc09873df3a61a63e9b01cfe429f76fca166b1 100644
--- a/src/modules/partition/core/PartitionLayout.h
+++ b/src/modules/partition/core/PartitionLayout.h
@@ -20,9 +20,9 @@
#ifndef PARTITIONLAYOUT_H
#define PARTITIONLAYOUT_H
-#include "core/PartUtils.h"
+#include "partition/PartitionSize.h"
-#include "Typedefs.h"
+#include "core/PartUtils.h"
// KPMcore
#include <kpmcore/core/partitiontable.h>
@@ -43,9 +43,9 @@ public:
QString partLabel;
QString partMountPoint;
FileSystem::Type partFileSystem = FileSystem::Unknown;
- PartUtils::PartSize partSize;
- PartUtils::PartSize partMinSize;
- PartUtils::PartSize partMaxSize;
+ Calamares::PartitionSize partSize;
+ Calamares::PartitionSize partMinSize;
+ Calamares::PartitionSize partMaxSize;
/// @brief All-zeroes PartitionEntry
PartitionEntry() {}
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 8ec048f0e38b18ea2f5ddf18ae7555ae557f2825..04eec56edcdc0e3bc8c2925c7745a8f9e7ef769b 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -462,7 +462,7 @@ ChoicePage::applyActionChoice( ChoicePage::InstallChoice choice )
gs->value( "defaultFileSystemType" ).toString(),
m_encryptWidget->passphrase(),
gs->value( "efiSystemPartition" ).toString(),
- CalamaresUtils::GiBtoBytes( gs->value( "requiredStorageGB" ).toDouble() ),
+ CalamaresUtils::GiBtoBytes( gs->value( "requiredStorageGiB" ).toDouble() ),
m_eraseSwapChoice
};
@@ -560,11 +560,10 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current,
double requiredStorageGB = Calamares::JobQueue::instance()
->globalStorage()
- ->value( "requiredStorageGB" )
+ ->value( "requiredStorageGiB" )
.toDouble();
- // TODO: make this consistent
- qint64 requiredStorageB = qRound64( requiredStorageGB + 0.1 + 2.0 ) * 1024 * 1024 * 1024;
+ qint64 requiredStorageB = CalamaresUtils::GiBtoBytes( requiredStorageGB + 0.1 + 2.0 );
m_afterPartitionSplitterWidget->setSplitPartition(
part->partitionPath(),
@@ -967,11 +966,11 @@ ChoicePage::updateActionChoicePreview( ChoicePage::InstallChoice choice )
qint64 sizeNext )
{
Q_UNUSED( path )
- sizeLabel->setText( tr( "%1 will be shrunk to %2MB and a new "
- "%3MB partition will be created for %4." )
+ sizeLabel->setText( tr( "%1 will be shrunk to %2MiB and a new "
+ "%3MiB partition will be created for %4." )
.arg( m_beforePartitionBarsView->selectionModel()->currentIndex().data().toString() )
- .arg( size / ( 1024 * 1024 ) )
- .arg( sizeNext / ( 1024 * 1024 ) )
+ .arg( CalamaresUtils::BytesToMiB( size ) )
+ .arg( CalamaresUtils::BytesToMiB( sizeNext ) )
.arg( *Calamares::Branding::ShortProductName ) );
} );
diff --git a/src/modules/partition/gui/PartitionLabelsView.cpp b/src/modules/partition/gui/PartitionLabelsView.cpp
index b5fd0fc9111069eb4da1156877d2bd6c7111c6b5..f47dc41e1ce2e2a024b336b89972f41b41fe03c9 100644
--- a/src/modules/partition/gui/PartitionLabelsView.cpp
+++ b/src/modules/partition/gui/PartitionLabelsView.cpp
@@ -19,11 +19,12 @@
#include "PartitionLabelsView.h"
-#include <core/PartitionModel.h>
-#include <core/ColorUtils.h>
+#include "core/PartitionModel.h"
+#include "core/ColorUtils.h"
-#include <utils/CalamaresUtilsGui.h>
-#include <utils/Logger.h>
+#include "utils/CalamaresUtilsGui.h"
+#include "utils/Logger.h"
+#include "utils/Units.h"
#include <kpmcore/core/device.h>
#include <kpmcore/fs/filesystem.h>
@@ -35,6 +36,7 @@
#include <QMouseEvent>
#include <QPainter>
+using CalamaresUtils::operator""_MiB;
static const int LAYOUT_MARGIN = 4;
static const int LABEL_PARTITION_SQUARE_MARGIN =
@@ -62,12 +64,6 @@ PartitionLabelsView::PartitionLabelsView( QWidget* parent )
setSelectionBehavior( QAbstractItemView::SelectRows );
setSelectionMode( QAbstractItemView::SingleSelection );
this->setObjectName("partitionLabel");
- // Debug
- connect( this, &PartitionLabelsView::clicked,
- this, [=]( const QModelIndex& index )
- {
- cDebug() << "Clicked row" << index.row();
- } );
setMouseTracking( true );
}
@@ -162,8 +158,8 @@ PartitionLabelsView::getIndexesToDraw( const QModelIndex& parent ) const
//HACK: horrible special casing follows.
// To save vertical space, we choose to hide short instances of free space.
- // Arbitrary limit: 10MB.
- const qint64 maxHiddenB = 10000000;
+ // Arbitrary limit: 10MiB.
+ const qint64 maxHiddenB = 10_MiB;
if ( index.data( PartitionModel::IsFreeSpaceRole ).toBool() &&
index.data( PartitionModel::SizeRole ).toLongLong() < maxHiddenB )
continue;
diff --git a/src/modules/partition/gui/ReplaceWidget.cpp b/src/modules/partition/gui/ReplaceWidget.cpp
index 13001468fb9f16d79821024dbd5bf18bc4c9eea2..2ee360cedf79bfed4cde254e63e59efa0d74e823 100644
--- a/src/modules/partition/gui/ReplaceWidget.cpp
+++ b/src/modules/partition/gui/ReplaceWidget.cpp
@@ -143,7 +143,7 @@ ReplaceWidget::onPartitionSelected()
bool ok = false;
double requiredSpaceB = Calamares::JobQueue::instance()
->globalStorage()
- ->value( "requiredStorageGB" )
+ ->value( "requiredStorageGiB" )
.toDouble( &ok ) * 1024 * 1024 * 1024;
PartitionModel* model = qobject_cast< PartitionModel* >( m_ui->partitionTreeView->model() );
diff --git a/src/modules/partition/jobs/ClearMountsJob.cpp b/src/modules/partition/jobs/ClearMountsJob.cpp
index da6bee325e9e3cb214820ac1bc88cbc018acbfde..605087147c22184a1e5382a3e8eb5b4c77ac4034 100644
--- a/src/modules/partition/jobs/ClearMountsJob.cpp
+++ b/src/modules/partition/jobs/ClearMountsJob.cpp
@@ -2,6 +2,7 @@
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2018, Adriaan de Groot <groot@kde.org>
+ * Copyright 2019, Kevin Kofler <kevin.kofler@chello.at>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -258,7 +259,11 @@ ClearMountsJob::getCryptoDevices() const
QProcess process;
for ( const QFileInfo &fi : fiList )
{
- if ( fi.baseName() == "control" )
+ QString baseName = fi.baseName();
+ // Fedora live images use /dev/mapper/live-* internally. We must not
+ // unmount those devices, because they are used by the live image and
+ // because we need /dev/mapper/live-base in the unpackfs module.
+ if ( baseName == "control" || baseName.startsWith( "live-" ) )
continue;
list.append( fi.absoluteFilePath() );
}
diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp
index 119ecb12c09b1105e97459bbaeef81cd6d28ec09..9f8a01004f782fe0b9b576d4ccb306231dd2c433 100644
--- a/src/modules/partition/jobs/CreatePartitionJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionJob.cpp
@@ -41,7 +41,7 @@ CreatePartitionJob::CreatePartitionJob( Device* device, Partition* partition )
QString
CreatePartitionJob::prettyName() const
{
- return tr( "Create new %2MB partition on %4 (%3) with file system %1." )
+ return tr( "Create new %2MiB partition on %4 (%3) with file system %1." )
.arg( m_partition->fileSystem().name() )
.arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) )
.arg( m_device->name() )
@@ -52,7 +52,7 @@ CreatePartitionJob::prettyName() const
QString
CreatePartitionJob::prettyDescription() const
{
- return tr( "Create new <strong>%2MB</strong> partition on <strong>%4</strong> "
+ return tr( "Create new <strong>%2MiB</strong> partition on <strong>%4</strong> "
"(%3) with file system <strong>%1</strong>." )
.arg( m_partition->fileSystem().name() )
.arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) )
diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp
index dcc1c7142af183ad28dff23b2f55c36fd5accdec..0d43dfdb3611bf32ecd83bc590a4a602cb6a109d 100644
--- a/src/modules/partition/jobs/FormatPartitionJob.cpp
+++ b/src/modules/partition/jobs/FormatPartitionJob.cpp
@@ -38,7 +38,7 @@ FormatPartitionJob::FormatPartitionJob( Device* device, Partition* partition )
QString
FormatPartitionJob::prettyName() const
{
- return tr( "Format partition %1 (file system: %2, size: %3 MB) on %4." )
+ return tr( "Format partition %1 (file system: %2, size: %3 MiB) on %4." )
.arg( m_partition->partitionPath() )
.arg( m_partition->fileSystem().name() )
.arg( m_partition->capacity() / 1024 / 1024 )
@@ -49,7 +49,7 @@ FormatPartitionJob::prettyName() const
QString
FormatPartitionJob::prettyDescription() const
{
- return tr( "Format <strong>%3MB</strong> partition <strong>%1</strong> with "
+ return tr( "Format <strong>%3MiB</strong> partition <strong>%1</strong> with "
"file system <strong>%2</strong>." )
.arg( m_partition->partitionPath() )
.arg( m_partition->fileSystem().name() )
diff --git a/src/modules/partition/jobs/ResizePartitionJob.cpp b/src/modules/partition/jobs/ResizePartitionJob.cpp
index c0477cafe006b81ebea28e62ce673e30bf4376bf..bac4c7a6c210fa8858658e86e7507330b813bb88 100644
--- a/src/modules/partition/jobs/ResizePartitionJob.cpp
+++ b/src/modules/partition/jobs/ResizePartitionJob.cpp
@@ -52,8 +52,8 @@ ResizePartitionJob::prettyName() const
QString
ResizePartitionJob::prettyDescription() const
{
- return tr( "Resize <strong>%2MB</strong> partition <strong>%1</strong> to "
- "<strong>%3MB</strong>." )
+ return tr( "Resize <strong>%2MiB</strong> partition <strong>%1</strong> to "
+ "<strong>%3MiB</strong>." )
.arg( partition()->partitionPath() )
.arg( ( BytesToMiB( m_oldLastSector - m_oldFirstSector + 1 ) * partition()->sectorSize() ) )
.arg( ( BytesToMiB( m_newLastSector - m_newFirstSector + 1 ) * partition()->sectorSize() ) );
@@ -63,8 +63,8 @@ ResizePartitionJob::prettyDescription() const
QString
ResizePartitionJob::prettyStatusMessage() const
{
- return tr( "Resizing %2MB partition %1 to "
- "%3MB." )
+ return tr( "Resizing %2MiB partition %1 to "
+ "%3MiB." )
.arg( partition()->partitionPath() )
.arg( ( BytesToMiB( m_oldLastSector - m_oldFirstSector + 1 ) * partition()->sectorSize() ) )
.arg( ( BytesToMiB( m_newLastSector - m_newFirstSector + 1 ) * partition()->sectorSize() ) );
diff --git a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
index fee9874798d9627a0b07765feadab59dfdd4d586..d79f70479992c5d5965900c9235ee106e5581eef 100644
--- a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
+++ b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
@@ -49,7 +49,7 @@ SetPartFlagsJob::prettyName() const
return tr( "Set flags on partition %1." ).arg( partition()->partitionPath() );
if ( !partition()->fileSystem().name().isEmpty() )
- return tr( "Set flags on %1MB %2 partition." )
+ return tr( "Set flags on %1MiB %2 partition." )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( partition()->fileSystem().name() );
@@ -68,7 +68,7 @@ SetPartFlagsJob::prettyDescription() const
.arg( partition()->partitionPath() );
if ( !partition()->fileSystem().name().isEmpty() )
- return tr( "Clear flags on %1MB <strong>%2</strong> partition." )
+ return tr( "Clear flags on %1MiB <strong>%2</strong> partition." )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( partition()->fileSystem().name() );
@@ -82,7 +82,7 @@ SetPartFlagsJob::prettyDescription() const
.arg( flagsList.join( ", " ) );
if ( !partition()->fileSystem().name().isEmpty() )
- return tr( "Flag %1MB <strong>%2</strong> partition as "
+ return tr( "Flag %1MiB <strong>%2</strong> partition as "
"<strong>%3</strong>." )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( partition()->fileSystem().name() )
@@ -104,7 +104,7 @@ SetPartFlagsJob::prettyStatusMessage() const
.arg( partition()->partitionPath() );
if ( !partition()->fileSystem().name().isEmpty() )
- return tr( "Clearing flags on %1MB <strong>%2</strong> partition." )
+ return tr( "Clearing flags on %1MiB <strong>%2</strong> partition." )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( partition()->fileSystem().name() );
@@ -119,7 +119,7 @@ SetPartFlagsJob::prettyStatusMessage() const
if ( !partition()->fileSystem().name().isEmpty() )
return tr( "Setting flags <strong>%3</strong> on "
- "%1MB <strong>%2</strong> partition." )
+ "%1MiB <strong>%2</strong> partition." )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( partition()->fileSystem().name() )
.arg( flagsList.join( ", " ) );
diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp
index 0f5184257c920f27ed1bdbc8c9f000f4a55c2439..1e94bc65331e0203ba4928b2c353e505894f4f79 100644
--- a/src/modules/partition/tests/PartitionJobTests.cpp
+++ b/src/modules/partition/tests/PartitionJobTests.cpp
@@ -73,6 +73,7 @@ private:
bool m_mounted;
};
+/// @brief Generate random data of given @p size as a QByteArray
static QByteArray
generateTestData( qint64 size )
{
@@ -322,10 +323,10 @@ PartitionJobTests::testCreatePartitionExtended()
void
PartitionJobTests::testResizePartition_data()
{
- QTest::addColumn< int >( "oldStartMB" );
- QTest::addColumn< int >( "oldSizeMB" );
- QTest::addColumn< int >( "newStartMB" );
- QTest::addColumn< int >( "newSizeMB" );
+ QTest::addColumn< int >( "oldStartMiB" );
+ QTest::addColumn< int >( "oldSizeMiB" );
+ QTest::addColumn< int >( "newStartMiB" );
+ QTest::addColumn< int >( "newSizeMiB" );
QTest::newRow("grow") << 10 << 50 << 10 << 70;
QTest::newRow("shrink") << 10 << 70 << 10 << 50;
@@ -336,22 +337,22 @@ PartitionJobTests::testResizePartition_data()
void
PartitionJobTests::testResizePartition()
{
- QFETCH( int, oldStartMB );
- QFETCH( int, oldSizeMB );
- QFETCH( int, newStartMB );
- QFETCH( int, newSizeMB );
+ QFETCH( int, oldStartMiB );
+ QFETCH( int, oldSizeMiB );
+ QFETCH( int, newStartMiB );
+ QFETCH( int, newSizeMiB );
- const qint64 sectorForMB = 1_MiB / m_device->logicalSize();
+ const qint64 sectorsPerMiB = 1_MiB / m_device->logicalSize();
- qint64 oldFirst = sectorForMB * oldStartMB;
- qint64 oldLast = oldFirst + sectorForMB * oldSizeMB - 1;
- qint64 newFirst = sectorForMB * newStartMB;
- qint64 newLast = newFirst + sectorForMB * newSizeMB - 1;
+ qint64 oldFirst = sectorsPerMiB * oldStartMiB;
+ qint64 oldLast = oldFirst + sectorsPerMiB * oldSizeMiB - 1;
+ qint64 newFirst = sectorsPerMiB * newStartMiB;
+ qint64 newLast = newFirst + sectorsPerMiB * newSizeMiB - 1;
// Make the test data file smaller than the full size of the partition to
// accomodate for the file system overhead
- const unsigned long long minSizeMB = qMin( oldSizeMB, newSizeMB );
- const QByteArray testData = generateTestData( CalamaresUtils::MiBtoBytes( minSizeMB ) * 3 / 4 );
+ const unsigned long long minSizeMiB = qMin( oldSizeMiB, newSizeMiB );
+ const QByteArray testData = generateTestData( CalamaresUtils::MiBtoBytes( minSizeMiB ) * 3 / 4 );
const QString testName = "test.data";
// Setup: create the test partition
diff --git a/src/modules/summary/SummaryPage.h b/src/modules/summary/SummaryPage.h
index c165d3e335c7ae7a9485cdf8bfd1c7523bc7f352..b9a98f2a19fb566b3131ed6f0ce29c54f11b9500 100644
--- a/src/modules/summary/SummaryPage.h
+++ b/src/modules/summary/SummaryPage.h
@@ -19,7 +19,7 @@
#ifndef SUMMARYPAGE_H
#define SUMMARYPAGE_H
-#include "Typedefs.h"
+#include "viewpages/ViewStep.h"
#include <QWidget>
diff --git a/src/modules/umount/umount.conf b/src/modules/umount/umount.conf
index 798dfc3f51516922b0af703afa80847b02d44a1c..22a2e7441219dce90bd740b43e060c3a7adcfa94 100644
--- a/src/modules/umount/umount.conf
+++ b/src/modules/umount/umount.conf
@@ -10,7 +10,7 @@
# destLog location in the target system to copy the log
#
# You can either use the default source path (which is
-# `/root/.cache/Calamares/Calamares/Calamares.log` ) to copy the regular log,
+# `/root/.cache/calamares/session.log` ) to copy the regular log,
# or if you want to use the full output of `sudo calamares -d` you will need
# to redirect standard output, for instance in a launcher script or
# in the desktop file.
@@ -34,7 +34,7 @@
---
# example when using the normal Calamares log:
-srcLog: "/root/.cache/Calamares/Calamares/Calamares.log"
+srcLog: "/root/.cache/calamares/session.log"
destLog: "/var/log/Calamares.log"
# example when using a log created by `sudo calamares -d`:
diff --git a/src/modules/unpackfs/main.py b/src/modules/unpackfs/main.py
index dd9439a2c566aec964aa208a85df56f93f25df89..ac90a994e622cbee6e2906207ae01caae72ccd70 100644
--- a/src/modules/unpackfs/main.py
+++ b/src/modules/unpackfs/main.py
@@ -7,6 +7,7 @@
# Copyright 2014, Daniel Hillenbrand <codeworkx@bbqlinux.org>
# Copyright 2014, Philip Müller <philm@manjaro.org>
# Copyright 2017, Alf Gaida <agaida@siduction.org>
+# Copyright 2019, Kevin Kofler <kevin.kofler@chello.at>
#
# Calamares is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -252,13 +253,19 @@ class UnpackOperation:
subprocess.check_call(["mount",
"--bind", entry.source,
imgmountdir])
- else:
+ elif os.path.isfile(entry.source):
subprocess.check_call(["mount",
entry.source,
imgmountdir,
"-t", entry.sourcefs,
"-o", "loop"
])
+ else: # entry.source is a device
+ subprocess.check_call(["mount",
+ entry.source,
+ imgmountdir,
+ "-t", entry.sourcefs
+ ])
def unpack_image(self, entry, imgmountdir):
"""
diff --git a/src/modules/users/UsersPage.h b/src/modules/users/UsersPage.h
index a238461eca37641fea95ddd7d91a50df37506365..ac1e1f9db06fe4a13ebc393e7961ff56de45cf7a 100644
--- a/src/modules/users/UsersPage.h
+++ b/src/modules/users/UsersPage.h
@@ -24,9 +24,8 @@
#ifndef USERSPAGE_H
#define USERSPAGE_H
-#include "Typedefs.h"
-
#include "CheckPWQuality.h"
+#include "Job.h"
#include <QWidget>
@@ -44,7 +43,7 @@ public:
bool isReady();
- QList< Calamares::job_ptr > createJobs( const QStringList& defaultGroupsList );
+ Calamares::JobList createJobs( const QStringList& defaultGroupsList );
void onActivate();
diff --git a/src/modules/welcome/CMakeLists.txt b/src/modules/welcome/CMakeLists.txt
index e6ddd2bd75570bce6d9e4f801c78b98ea73669cc..e25b7f5d0a024ca7fa659dcddf4e7235711c7145 100644
--- a/src/modules/welcome/CMakeLists.txt
+++ b/src/modules/welcome/CMakeLists.txt
@@ -27,7 +27,6 @@ calamares_add_plugin( welcome
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
${CHECKER_SOURCES}
- LocaleModel.cpp
WelcomeViewStep.cpp
WelcomePage.cpp
UI
diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
index 65a4753104dddd3df2395f28acd3e04ae80c76ac..ae78aa8ff1f702bd6bcff47a4fb53a3c22b621bd 100644
--- a/src/modules/welcome/WelcomePage.cpp
+++ b/src/modules/welcome/WelcomePage.cpp
@@ -21,16 +21,16 @@
#include "WelcomePage.h"
#include "ui_WelcomePage.h"
-#include "LocaleModel.h"
#include "checker/CheckerContainer.h"
#include "Branding.h"
#include "CalamaresVersion.h"
#include "Settings.h"
#include "ViewManager.h"
+
+#include "locale/LabelModel.h"
#include "modulesystem/ModuleManager.h"
#include "utils/CalamaresUtilsGui.h"
-#include "utils/LocaleLabel.h"
#include "utils/Logger.h"
#include "utils/Retranslator.h"
@@ -131,7 +131,7 @@ WelcomePage::initLanguages()
ui->languageWidget->clear();
ui->languageWidget->setInsertPolicy( QComboBox::InsertAtBottom );
- m_languages = new LocaleModel( QString( CALAMARES_TRANSLATION_LANGUAGES ).split( ';') );
+ m_languages = CalamaresUtils::Locale::availableTranslations();
ui->languageWidget->setModel( m_languages );
ui->languageWidget->setItemDelegate( new LocaleTwoColumnDelegate( ui->languageWidget ) );
@@ -257,7 +257,23 @@ WelcomePage::focusInEvent( QFocusEvent* e )
e->accept();
}
-bool WelcomePage::verdict() const
+bool
+WelcomePage::verdict() const
{
return m_checkingWidget->verdict();
}
+
+void
+WelcomePage::externallySelectedLanguage( int row )
+{
+ if ( ( row >= 0 ) && ( row < ui->languageWidget->count() ) )
+ ui->languageWidget->setCurrentIndex( row );
+}
+
+
+void
+LocaleTwoColumnDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+ QStyledItemDelegate::paint( painter, option, index );
+ option.widget->style()->drawItemText( painter, option.rect, Qt::AlignRight | Qt::AlignVCenter, option.palette, false, index.data( CalamaresUtils::Locale::LabelModel::EnglishLabelRole ).toString() );
+}
diff --git a/src/modules/welcome/WelcomePage.h b/src/modules/welcome/WelcomePage.h
index ec689735bc65c9c50a0792483d40a4d6eb6b436e..f05426d38d0eab4745a98059d36b0fecd7ce8106 100644
--- a/src/modules/welcome/WelcomePage.h
+++ b/src/modules/welcome/WelcomePage.h
@@ -20,6 +20,9 @@
#ifndef WELCOMEPAGE_H
#define WELCOMEPAGE_H
+#include "locale/LabelModel.h"
+
+#include <QStyledItemDelegate>
#include <QWidget>
namespace Ui
@@ -28,7 +31,6 @@ class WelcomePage;
}
class CheckerContainer;
-class LocaleModel;
class WelcomePage : public QWidget
{
@@ -44,6 +46,8 @@ public:
/// @brief Results of requirements checking
bool verdict() const;
+ /// @brief Change the language from an external source.
+ void externallySelectedLanguage( int row );
protected:
void focusInEvent( QFocusEvent* e ) override; //choose the child widget to focus
@@ -53,7 +57,19 @@ private:
Ui::WelcomePage* ui;
CheckerContainer* m_checkingWidget;
- LocaleModel *m_languages;
+ CalamaresUtils::Locale::LabelModel *m_languages;
};
+/** @brief Delegate to display language information in two columns.
+ *
+ * Displays the native language name and the English language name.
+ */
+class LocaleTwoColumnDelegate : public QStyledItemDelegate
+{
+public:
+ using QStyledItemDelegate::QStyledItemDelegate;
+
+ void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const override;
+} ;
+
#endif // WELCOMEPAGE_H
diff --git a/src/modules/welcome/WelcomeViewStep.cpp b/src/modules/welcome/WelcomeViewStep.cpp
index 88b5f63247560d077e3d7b66e2e8eb5a1582eb16..e115565b739d18a7e0874122408ac93493bfc5fd 100644
--- a/src/modules/welcome/WelcomeViewStep.cpp
+++ b/src/modules/welcome/WelcomeViewStep.cpp
@@ -22,9 +22,13 @@
#include "WelcomePage.h"
#include "checker/GeneralRequirements.h"
+#include "geoip/Handler.h"
+#include "locale/Lookup.h"
#include "modulesystem/ModuleManager.h"
#include "utils/Logger.h"
+#include "utils/Variant.h"
+#include <QFutureWatcher>
#include <QVariant>
CALAMARES_PLUGIN_FACTORY_DEFINITION( WelcomeViewStepFactory, registerPlugin<WelcomeViewStep>(); )
@@ -97,18 +101,9 @@ WelcomeViewStep::jobs() const
void
WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{
- bool showSupportUrl =
- configurationMap.contains( "showSupportUrl" ) &&
- configurationMap.value( "showSupportUrl" ).type() == QVariant::Bool &&
- configurationMap.value( "showSupportUrl" ).toBool();
- bool showKnownIssuesUrl =
- configurationMap.contains( "showKnownIssuesUrl" ) &&
- configurationMap.value( "showKnownIssuesUrl" ).type() == QVariant::Bool &&
- configurationMap.value( "showKnownIssuesUrl" ).toBool();
- bool showReleaseNotesUrl =
- configurationMap.contains( "showReleaseNotesUrl" ) &&
- configurationMap.value( "showReleaseNotesUrl" ).type() == QVariant::Bool &&
- configurationMap.value( "showReleaseNotesUrl" ).toBool();
+ bool showSupportUrl = CalamaresUtils::getBool( configurationMap, "showSupportUrl", false );
+ bool showKnownIssuesUrl = CalamaresUtils::getBool( configurationMap, "showKnownIssuesUrl", false );
+ bool showReleaseNotesUrl = CalamaresUtils::getBool( configurationMap, "showReleaseNotesUrl", false );
m_widget->setUpLinks( showSupportUrl,
showKnownIssuesUrl,
@@ -120,9 +115,57 @@ WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap )
else
cWarning() << "no valid requirements map found in welcome "
"module configuration.";
+
+ bool ok = false;
+ QVariantMap geoip = CalamaresUtils::getSubMap( configurationMap, "geoip", ok );
+ if ( ok )
+ {
+ using FWString = QFutureWatcher< QString >;
+
+ auto* handler = new CalamaresUtils::GeoIP::Handler(
+ CalamaresUtils::getString( geoip, "style" ),
+ CalamaresUtils::getString( geoip, "url" ),
+ CalamaresUtils::getString( geoip, "selector" ) );
+ auto* future = new FWString();
+ connect( future, &FWString::finished, [view=this, f=future, h=handler]()
+ {
+ QString countryResult = f->future().result();
+ cDebug() << "GeoIP result for welcome=" << countryResult;
+ view->setCountry( countryResult );
+ f->deleteLater();
+ delete h;
+ } );
+ future->setFuture( handler->queryRaw() );
+ }
}
-Calamares::RequirementsList WelcomeViewStep::checkRequirements()
+Calamares::RequirementsList
+WelcomeViewStep::checkRequirements()
{
return m_requirementsChecker->checkRequirements();
}
+
+void
+WelcomeViewStep::setCountry( const QString& countryCode )
+{
+ if ( countryCode.length() != 2 )
+ {
+ cDebug() << "Unusable country code" << countryCode;
+ return;
+ }
+
+ auto c_l = CalamaresUtils::Locale::countryData( countryCode );
+ if ( c_l.first == QLocale::Country::AnyCountry )
+ {
+ cDebug() << "Unusable country code" << countryCode;
+ return;
+ }
+ else
+ {
+ int r = CalamaresUtils::Locale::availableTranslations()->find( countryCode );
+ if ( r < 0 )
+ cDebug() << "Unusable country code" << countryCode << "(no suitable translation)";
+ if ( ( r >= 0 ) && m_widget )
+ m_widget->externallySelectedLanguage( r );
+ }
+}
diff --git a/src/modules/welcome/WelcomeViewStep.h b/src/modules/welcome/WelcomeViewStep.h
index 937cad246f7a15310959c277768f882426ff0be2..7deed21671d2cfbde29f3312e05e4cab79b63a5d 100644
--- a/src/modules/welcome/WelcomeViewStep.h
+++ b/src/modules/welcome/WelcomeViewStep.h
@@ -54,6 +54,13 @@ public:
void setConfigurationMap( const QVariantMap& configurationMap ) override;
+ /** @brief Sets the country that Calamares is running in.
+ *
+ * This (ideally) sets up language and locale settings that are right for
+ * the given 2-letter country code.
+ */
+ void setCountry( const QString& );
+
Calamares::RequirementsList checkRequirements() override;
private:
diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp
index 675d43ed45beb7f98a29481e4e4246b1a5b09802..8126050917c9156360e182364958b9e840a6af5f 100644
--- a/src/modules/welcome/checker/GeneralRequirements.cpp
+++ b/src/modules/welcome/checker/GeneralRequirements.cpp
@@ -56,8 +56,8 @@
GeneralRequirements::GeneralRequirements( QObject* parent )
: QObject( parent )
- , m_requiredStorageGB( -1 )
- , m_requiredRamGB( -1 )
+ , m_requiredStorageGiB( -1 )
+ , m_requiredRamGiB( -1 )
{
}
@@ -72,12 +72,12 @@ Calamares::RequirementsList GeneralRequirements::checkRequirements()
bool isRoot = false;
bool enoughScreen = (availableSize.width() >= CalamaresUtils::windowMinimumWidth) && (availableSize.height() >= CalamaresUtils::windowMinimumHeight);
- qint64 requiredStorageB = CalamaresUtils::GiBtoBytes(m_requiredStorageGB);
+ qint64 requiredStorageB = CalamaresUtils::GiBtoBytes(m_requiredStorageGiB);
cDebug() << "Need at least storage bytes:" << requiredStorageB;
if ( m_entriesToCheck.contains( "storage" ) )
enoughStorage = checkEnoughStorage( requiredStorageB );
- qint64 requiredRamB = CalamaresUtils::GiBtoBytes(m_requiredRamGB);
+ qint64 requiredRamB = CalamaresUtils::GiBtoBytes(m_requiredRamGiB);
cDebug() << "Need at least ram bytes:" << requiredRamB;
if ( m_entriesToCheck.contains( "ram" ) )
enoughRam = checkEnoughRam( requiredRamB );
@@ -105,16 +105,16 @@ Calamares::RequirementsList GeneralRequirements::checkRequirements()
if ( entry == "storage" )
checkEntries.append( {
entry,
- [req=m_requiredStorageGB]{ return tr( "has at least %1 GB available drive space" ).arg( req ); },
- [req=m_requiredStorageGB]{ return tr( "There is not enough drive space. At least %1 GB is required." ).arg( req ); },
+ [req=m_requiredStorageGiB]{ return tr( "has at least %1 GiB available drive space" ).arg( req ); },
+ [req=m_requiredStorageGiB]{ return tr( "There is not enough drive space. At least %1 GiB is required." ).arg( req ); },
enoughStorage,
m_entriesToRequire.contains( entry )
} );
else if ( entry == "ram" )
checkEntries.append( {
entry,
- [req=m_requiredRamGB]{ return tr( "has at least %1 GB working memory" ).arg( req ); },
- [req=m_requiredRamGB]{ return tr( "The system does not have enough working memory. At least %1 GB is required." ).arg( req ); },
+ [req=m_requiredRamGiB]{ return tr( "has at least %1 GiB working memory" ).arg( req ); },
+ [req=m_requiredRamGiB]{ return tr( "The system does not have enough working memory. At least %1 GiB is required." ).arg( req ); },
enoughRam,
m_entriesToRequire.contains( entry )
} );
@@ -209,19 +209,19 @@ GeneralRequirements::setConfigurationMap( const QVariantMap& configurationMap )
configurationMap.value( "requiredStorage" ).type() == QVariant::Int ) )
{
bool ok = false;
- m_requiredStorageGB = configurationMap.value( "requiredStorage" ).toDouble( &ok );
+ m_requiredStorageGiB = configurationMap.value( "requiredStorage" ).toDouble( &ok );
if ( !ok )
{
cWarning() << "GeneralRequirements entry 'requiredStorage' is invalid.";
- m_requiredStorageGB = 3.;
+ m_requiredStorageGiB = 3.;
}
- Calamares::JobQueue::instance()->globalStorage()->insert( "requiredStorageGB", m_requiredStorageGB );
+ Calamares::JobQueue::instance()->globalStorage()->insert( "requiredStorageGiB", m_requiredStorageGiB );
}
else
{
cWarning() << "GeneralRequirements entry 'requiredStorage' is missing.";
- m_requiredStorageGB = 3.;
+ m_requiredStorageGiB = 3.;
incompleteConfiguration = true;
}
@@ -230,18 +230,18 @@ GeneralRequirements::setConfigurationMap( const QVariantMap& configurationMap )
configurationMap.value( "requiredRam" ).type() == QVariant::Int ) )
{
bool ok = false;
- m_requiredRamGB = configurationMap.value( "requiredRam" ).toDouble( &ok );
+ m_requiredRamGiB = configurationMap.value( "requiredRam" ).toDouble( &ok );
if ( !ok )
{
cWarning() << "GeneralRequirements entry 'requiredRam' is invalid.";
- m_requiredRamGB = 1.;
+ m_requiredRamGiB = 1.;
incompleteConfiguration = true;
}
}
else
{
cWarning() << "GeneralRequirements entry 'requiredRam' is missing.";
- m_requiredRamGB = 1.;
+ m_requiredRamGiB = 1.;
incompleteConfiguration = true;
}
diff --git a/src/modules/welcome/checker/GeneralRequirements.h b/src/modules/welcome/checker/GeneralRequirements.h
index fe0d7a94d8b9135410339e9d794e24cac19372c4..1efe118a6c2c543e00de58a47d4ee9eadb81bfcd 100644
--- a/src/modules/welcome/checker/GeneralRequirements.h
+++ b/src/modules/welcome/checker/GeneralRequirements.h
@@ -46,8 +46,8 @@ private:
bool checkHasInternet();
bool checkIsRoot();
- qreal m_requiredStorageGB;
- qreal m_requiredRamGB;
+ qreal m_requiredStorageGiB;
+ qreal m_requiredRamGiB;
QString m_checkHasInternetUrl;
};
diff --git a/src/modules/welcome/checker/partman_devices.c b/src/modules/welcome/checker/partman_devices.c
index 7a7463857d6ad5a311d4ad1aacca8cd26f886c18..4fd3dd4c0c907b1af0f11398eb9d2edece3d1d5f 100644
--- a/src/modules/welcome/checker/partman_devices.c
+++ b/src/modules/welcome/checker/partman_devices.c
@@ -66,7 +66,7 @@ is_cdrom(const char *path)
int fd;
fd = open(path, O_RDONLY | O_NONBLOCK);
- ioctl(fd, CDIOCCAPABILITY, NULL);
+ ioctl(fd, CDIOCCAPABILITY, NULL);
close(fd);
if (errno != EBADF && errno != ENOTTY)
@@ -120,7 +120,7 @@ check_big_enough(long long required_space)
for (dev = NULL; NULL != (dev = ped_device_get_next(dev));)
{
long long dev_size = process_device(dev);
- if (dev_size > required_space)
+ if (dev_size >= required_space)
{
big_enough = true;
break;
diff --git a/src/modules/welcome/welcome.conf b/src/modules/welcome/welcome.conf
index 52492ffef6df83d9168dc5b40837112501f58ac5..6d9a307fcf24b6b17a1ece5d43e2565032af95c9 100644
--- a/src/modules/welcome/welcome.conf
+++ b/src/modules/welcome/welcome.conf
@@ -15,12 +15,12 @@ showReleaseNotesUrl: true
# that are checked. They may not match with the actual requirements
# imposed by other modules in the system.
requirements:
- # Amount of available disk, in GB. Floating-point is allowed here.
+ # Amount of available disk, in GiB. Floating-point is allowed here.
# Note that this does not account for *usable* disk, so it is possible
# to pass this requirement, yet have no space to install to.
requiredStorage: 5.5
- # Amount of available RAM, in GB. Floating-point is allowed here.
+ # Amount of available RAM, in GiB. Floating-point is allowed here.
requiredRam: 1.0
# To check for internet connectivity, Calamares does a HTTP GET
@@ -47,3 +47,16 @@ requirements:
# - storage
- ram
# - root
+
+# GeoIP checking
+#
+# This can be used to pre-select a language based on the country
+# the user is currently in. It *assumes* that there's internet
+# connectivity, though. Configuration is like in the locale module,
+# but remember to use a URL that returns full data **and** to
+# use a selector that will pick the country, not the timezone.
+
+geoip:
+ style: "xml"
+ url: "https://geoip.kde.org/v1/ubiquity" # extended XML format
+ selector: "CountryCode" # blank uses default, which is wrong