diff --git a/.gersemirc b/.gersemirc new file mode 100644 index 000000000..8459e681b --- /dev/null +++ b/.gersemirc @@ -0,0 +1,10 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Gersemi configuration +color: false +definitions: [ CMakeModules/CalamaresAddTest.cmake ] +line_length: 120 +quiet: false +unsafe: false + diff --git a/.github/workflows/nightly-debian.yml b/.github/workflows/nightly-debian.yml index 9d3fc4d4d..f7c232569 100644 --- a/.github/workflows/nightly-debian.yml +++ b/.github/workflows/nightly-debian.yml @@ -18,7 +18,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: docker://debian:10 + image: docker://debian:11 options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare env" diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml index 717cabe66..34a90b392 100644 --- a/.github/workflows/nightly-opensuse.yml +++ b/.github/workflows/nightly-opensuse.yml @@ -18,7 +18,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: docker://opensuse/leap + image: docker://opensuse/tumbleweed options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare env" diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index cf1505f17..798ee4edc 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -4,7 +4,7 @@ on: push: branches: - calamares - - work-3.3 + - 3.2.x-stable pull_request: types: - opened @@ -31,7 +31,7 @@ jobs: - name: "prepare env" uses: calamares/actions/prepare-neon@v4 - name: "prepare source" - uses: calamares/actions/generic-checkout@v4 + uses: calamares/actions/generic-checkout@330c45ae1eb6efad4ad75a6dd887c3c5d5fe1590 - name: "build" id: build uses: calamares/actions/generic-build@v4 diff --git a/3rdparty/kdsingleapplicationguard/LICENSE.LGPL.txt b/3rdparty/kdsingleapplicationguard/LICENSE.LGPL.txt deleted file mode 100644 index df942b1ff..000000000 --- a/3rdparty/kdsingleapplicationguard/LICENSE.LGPL.txt +++ /dev/null @@ -1,488 +0,0 @@ - - The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB. - - You may use, distribute and copy the KD Tools Library under the terms of - GNU Library General Public License version 2, which is displayed below. - -------------------------------------------------------------------------- - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - c) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - d) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp b/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp deleted file mode 100644 index 284870e06..000000000 --- a/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp +++ /dev/null @@ -1,481 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB. - * SPDX-License-Identifier: LGPL-2.0-only - * - * The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB. - */ -#include "kdlockedsharedmemorypointer.h" - -#if QT_VERSION >= 0x040400 || defined( DOXYGEN_RUN ) -#ifndef QT_NO_SHAREDMEMORY - -namespace kdtools -{ -} -using namespace kdtools; - -KDLockedSharedMemoryPointerBase::KDLockedSharedMemoryPointerBase( QSharedMemory * m ) - : locker( m ), - mem( m ) -{ - -} - -KDLockedSharedMemoryPointerBase::KDLockedSharedMemoryPointerBase( QSharedMemory & m ) - : locker( &m ), - mem( &m ) -{ - -} - -KDLockedSharedMemoryPointerBase::~KDLockedSharedMemoryPointerBase() {} - -void * KDLockedSharedMemoryPointerBase::get() { - return mem ? mem->data() : 0 ; -} - -const void * KDLockedSharedMemoryPointerBase::get() const { - return mem ? mem->data() : 0 ; -} - -size_t KDLockedSharedMemoryPointerBase::byteSize() const { - return mem ? mem->size() : 0; -} - -/*! - \class KDLockedSharedMemoryPointer - \ingroup core raii smartptr - \brief Locking pointer for Qt shared memory segments - \since_c 2.1 - - (The exception safety of this class has not been evaluated yet.) - - KDLockedSharedMemoryPointer is a smart immutable pointer, which gives convenient and safe access to a QSharedMemory data segment. - The content of a KDLockedSharedMemoryPointer cannot be changed during it's lifetime. - - You can use this class like a normal pointer to the shared memory segment and be sure it's locked while accessing it. - \note You can only put simple types/structs/classes into it. structs and classes shall not contain any other pointers. See the - documentation of QSharedMemory for details. -*/ - -/*! - \fn KDLockedSharedMemoryPointer::KDLockedSharedMemoryPointer( QSharedMemory * mem ) - - Constructor. Constructs a KDLockedSharedMemory pointer which points to the data segment of \a mem. - The constructor locks \a mem. If the memory segment is already locked by another process, this constructor - blocks until the lock is released. - - \post data() == mem->data() and the memory segment has been locked -*/ - -/*! - \fn KDLockedSharedMemoryPointer::KDLockedSharedMemoryPointer( QSharedMemory & mem ) - - \overload - - \post data() == mem.data() and the memory segment has been locked -*/ - -/*! - \fn KDLockedSharedMemoryPointer::~KDLockedSharedMemoryPointer() - - Destructor. Unlocks the shared memory segment. - - \post The shared memory segment has been unlocked -*/ - -/*! - \fn T * KDLockedSharedMemoryPointer::get() - - \returns a pointer to the contained object. -*/ - -/*! - \fn const T * KDLockedSharedMemoryPointer::get() const - - \returns a const pointer to the contained object - \overload -*/ - -/*! - \fn T * KDLockedSharedMemoryPointer::data() - - Equivalent to get(), provided for consistency with Qt naming conventions. -*/ - -/*! - \fn const T * KDLockedSharedMemoryPointer::data() const - - \overload -*/ - -/*! - \fn T & KDLockedSharedMemoryPointer::operator*() - - Dereference operator. Returns \link get() *get()\endlink. -*/ - -/*! - \fn const T & KDLockedSharedMemoryPointer::operator*() const - - Dereference operator. Returns \link get() *get()\endlink. - \overload -*/ - -/*! - \fn T * KDLockedSharedMemoryPointer::operator->() - - Member-by-pointer operator. Returns get(). -*/ - -/*! - \fn const T * KDLockedSharedMemoryPointer::operator->() const - - Member-by-pointer operator. Returns get(). - \overload -*/ - -/*! - \class KDLockedSharedMemoryArray - \ingroup core raii smartptr - \brief Locking array pointer to Qt shared memory segments - \since_c 2.1 - - (The exception safety of this class has not been evaluated yet.) - - KDLockedSharedMemoryArray is a smart immutable pointer, which gives convenient and safe access to array data stored in a QSharedMemory - data segment. - The content of a KDLockedSharedMemoryArray cannot be changed during it's lifetime. - - You can use this class like a normal pointer to the shared memory segment and be sure it's locked while accessing it. - \note You can only put arrays of simple types/structs/classes into it. structs and classes shall not contain any other pointers. See the - documentation of QSharedMemory for details. - - \sa KDLockedSharedMemoryPointer -*/ - -/*! - \fn KDLockedSharedMemoryArray::KDLockedSharedMemoryArray( QSharedMemory* mem ) - Constructor. Constructs a KDLockedSharedMemoryArray which points to the data segment of \a mem. The constructor locks \a mem. If the memory - segment is already locked by another process, this constructor blocks until the lock is release. - - \post get() == mem->data() and the memory segment has been locked -*/ - -/*! - \fn KDLockedSharedMemoryArray::KDLockedSharedMemoryArray( QSharedMemory& mem ) - \overload - - \post get() == mem->data() and the memory segment has been locked -*/ - - -/*! - \typedef KDLockedSharedMemoryArray::size_type - Typedef for std::size_t. Provided for STL compatibility. -*/ - -/*! - \typedef KDLockedSharedMemoryArray::difference_type - Typedef for std::ptrdiff_t. Provided for STL compatibility. -*/ - -/*! - \typedef KDLockedSharedMemoryArray::iterator - Typedef for T*. Provided for STL compatibility. - \since_t 2.2 -*/ - -/*! - \typedef KDLockedSharedMemoryArray::const_iterator - Typedef for const T*. Provided for STL compatibility. - \since_t 2.2 -*/ - -/*! - \typedef KDLockedSharedMemoryArray::reverse_iterator - Typedef for std::reverse_iterator< \link KDLockedSharedMemoryArray::iterator iterator\endlink >. Provided for STL compatibility. - \since_t 2.2 -*/ - -/*! - \typedef KDLockedSharedMemoryArray::const_reverse_iterator - Typedef for std::reverse_iterator< \link KDLockedSharedMemoryArray::const_iterator const_iterator\endlink >. Provided for STL compatibility. - \since_t 2.2 -*/ - -/*! - \fn KDLockedSharedMemoryArray::iterator KDLockedSharedMemoryArray::begin() - Returns an \link KDLockedSharedMemoryArray::iterator iterator\endlink pointing to the first item of the array. - \since_f 2.2 -*/ - -/*! - \fn KDLockedSharedMemoryArray::const_iterator KDLockedSharedMemoryArray::begin() const - \overload - \since_f 2.2 -*/ - -/*! - \fn KDLockedSharedMemoryArray::iterator KDLockedSharedMemoryArray::end() - Returns an \link KDLockedSharedMemoryArray::iterator iterator\endlink pointing to the item after the last item of the array. - \since_f 2.2 -*/ - -/*! - \fn KDLockedSharedMemoryArray::const_iterator KDLockedSharedMemoryArray::end() const - \overload - \since_f 2.2 -*/ - -/*! - \fn KDLockedSharedMemoryArray::reverse_iterator KDLockedSharedMemoryArray::rbegin() - Returns an \link KDLockedSharedMemoryArray::reverse_iterator reverse_iterator\endlink pointing to the item after the last item of the array. - \since_f 2.2 -*/ - -/*! - \fn KDLockedSharedMemoryArray::const_reverse_iterator KDLockedSharedMemoryArray::rbegin() const - \overload - \since_f 2.2 -*/ - -/*! - \fn KDLockedSharedMemoryArray::reverse_iterator KDLockedSharedMemoryArray::rend() - Returns an \link KDLockedSharedMemoryArray::reverse_iterator reverse_iterator\endlink pointing to the first item of the array. - \since_f 2.2 -*/ - -/*! - \fn KDLockedSharedMemoryArray::const_reverse_iterator KDLockedSharedMemoryArray::rend() const - \overload - \since_f 2.2 -*/ - -/*! - \fn KDLockedSharedMemoryArray::size_type KDLockedSharedMemoryArray::size() const - Returns the size of this array. The size is calculated from the storage size of T and - the size of the shared memory segment. - \since_f 2.2 -*/ - -/*! - \fn T& KDLockedSharedMemoryArray::operator[]( difference_type n ) - Array access operator. Returns a reference to the item at index position \a n. -*/ - -/*! - \fn const T& KDLockedSharedMemoryArray::operator[]( difference_type n ) const - \overload -*/ - -/*! - \fn T& KDLockedSharedMemoryArray::front() - Returns a reference to the first item in the array. This is the same as operator[](0). -*/ - -/*! - \fn const T& KDLockedSharedMemoryArray::front() const - \overload -*/ - -/*! - \fn T& KDLockedSharedMemoryArray::back() - Returns a reference to the last item in the array. This is the same as operator[](size()-1). - \since_f 2.2 -*/ - -/*! - \fn const T& KDLockedSharedMemoryArray::back() const - \overload - \since_f 2.2 -*/ - - -#ifdef eKDTOOLSCORE_UNITTESTS - -#include - -#include -#include - -namespace -{ - struct TestStruct - { - TestStruct( uint nn = 0 ) - : n( nn ), - f( 0.0 ), - c( '\0' ), - b( false ) - { - } - uint n; - double f; - char c; - bool b; - }; - - bool operator==( const TestStruct& lhs, const TestStruct& rhs ) - { - return lhs.n == rhs.n && lhs.f == rhs.f && lhs.c == rhs.c && lhs.b == rhs.b; - } - - class TestThread : public QThread - { - public: - TestThread( const QString& key ) - : mem( key ) - { - mem.attach(); - } - - void run() - { - while( true ) - { - msleep( 100 ); - kdtools::KDLockedSharedMemoryPointer< TestStruct > p( &mem ); - if( !p->b ) - continue; - - p->n = 5; - p->f = 3.14; - p->c = 'A'; - p->b = false; - return; - } - } - - QSharedMemory mem; - }; - - bool isConst( TestStruct* ) - { - return false; - } - - bool isConst( const TestStruct* ) - { - return true; - } -} - - -KDAB_UNITTEST_SIMPLE( KDLockedSharedMemoryPointer, "kdcoretools" ) { - - const QString key = QUuid::createUuid(); - QSharedMemory mem( key ); - const bool created = mem.create( sizeof( TestStruct ) ); - assertTrue( created ); - if ( !created ) - return; // don't execute tests if shm coulnd't be created - - // On Windows, shared mem is only available in increments of page - // size (4k), so don't fail if the segment is larger: - const unsigned long mem_size = mem.size(); - assertGreaterOrEqual( mem_size, sizeof( TestStruct ) ); - - { - kdtools::KDLockedSharedMemoryPointer< TestStruct > p( &mem ); - assertTrue( p ); - *p = TestStruct(); - assertEqual( p->n, 0u ); - assertEqual( p->f, 0.0 ); - assertEqual( p->c, '\0' ); - assertFalse( p->b ); - } - - { - TestThread thread( key ); - assertEqual( thread.mem.key().toStdString(), key.toStdString() ); - assertEqual( static_cast< unsigned long >( thread.mem.size() ), mem_size ); - thread.start(); - - assertTrue( thread.isRunning() ); - thread.wait( 2000 ); - assertTrue( thread.isRunning() ); - - { - kdtools::KDLockedSharedMemoryPointer< TestStruct > p( &mem ); - p->b = true; - } - - thread.wait( 2000 ); - assertFalse( thread.isRunning() ); - } - - { - kdtools::KDLockedSharedMemoryPointer< TestStruct > p( &mem ); - assertEqual( p->n, 5u ); - assertEqual( p->f, 3.14 ); - assertEqual( p->c, 'A' ); - assertFalse( p->b ); - } - - { - kdtools::KDLockedSharedMemoryPointer< TestStruct > p( mem ); - assertEqual( mem.data(), p.get() ); - assertEqual( p.get(), p.operator->() ); - assertEqual( p.get(), &(*p) ); - assertEqual( p.get(), p.data() ); - assertFalse( isConst( p.get() ) ); - } - - { - const kdtools::KDLockedSharedMemoryPointer< TestStruct > p( &mem ); - assertEqual( mem.data(), p.get() ); - assertEqual( p.get(), p.operator->() ); - assertEqual( p.get(), &(*p) ); - assertEqual( p.get(), p.data() ); - assertTrue( isConst( p.get() ) ); - } - - { - QSharedMemory mem2( key + key ); - const bool created2 = mem2.create( 16 * sizeof( TestStruct ) ); - assertTrue( created2 ); - if ( !created2 ) - return; // don't execute tests if shm coulnd't be created - - kdtools::KDLockedSharedMemoryArray a( mem2 ); - assertTrue( a ); - assertEqual( a.get(), mem2.data() ); - assertEqual( &a[0], a.get() ); - - a[1] = a[0]; - assertTrue( a[0] == a[1] ); - - TestStruct ts; - ts.n = 5; - ts.f = 3.14; - a[0] = ts; - assertFalse( a[0] == a[1] ); - assertEqual( a.front().n, ts.n ); - assertEqual( a[0].f, ts.f ); - a[0].n = 10; - assertEqual( a.front().n, 10u ); - ts = a[0]; - assertEqual( ts.n, 10u ); - - std::vector< TestStruct > v; - for( uint i = 0; i < a.size(); ++i ) - v.push_back( TestStruct( i ) ); - - std::copy( v.begin(), v.end(), a.begin() ); - for( uint i = 0; i < a.size(); ++i ) - assertEqual( a[ i ].n, i ); - assertEqual( a.front().n, 0u ); - assertEqual( a.back().n, a.size() - 1 ); - - std::copy( v.begin(), v.end(), a.rbegin() ); - for( uint i = 0; i < a.size(); ++i ) - assertEqual( a[ i ].n, a.size() - 1 - i ); - assertEqual( a.front().n, a.size() - 1 ); - assertEqual( a.back().n, 0u ); - } - -} -#endif // KDTOOLSCORE_UNITTESTS -#endif // QT_NO_SHAREDMEMORY -#endif // QT_VERSION >= 0x040400 || defined( DOXYGEN_RUN ) diff --git a/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h b/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h deleted file mode 100644 index 19fdaa082..000000000 --- a/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h +++ /dev/null @@ -1,121 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB. - * SPDX-License-Identifier: LGPL-2.0-only - * - * The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB. - */ -#ifndef __KDTOOLS__CORE__KDLOCKEDSHAREDMEMORYPOINTER_H__ -#define __KDTOOLS__CORE__KDLOCKEDSHAREDMEMORYPOINTER_H__ - -#include - -#if QT_VERSION >= 0x040400 || defined( DOXYGEN_RUN ) -#ifndef QT_NO_SHAREDMEMORY - -#include "kdsharedmemorylocker.h" -#include - -#include - -#ifndef DOXYGEN_RUN -namespace kdtools { -#endif - -class KDLockedSharedMemoryPointerBase { -protected: - explicit KDLockedSharedMemoryPointerBase( QSharedMemory * mem ); - explicit KDLockedSharedMemoryPointerBase( QSharedMemory & mem ); - ~KDLockedSharedMemoryPointerBase(); - - // PENDING(marc) do we really want const propagation here? I - // usually declare all my RAII objects const... - void * get(); - const void * get() const; - - KDAB_IMPLEMENT_SAFE_BOOL_OPERATOR( get() ) - - size_t byteSize() const; - -private: - KDSharedMemoryLocker locker; - QSharedMemory * const mem; -}; - -template< typename T> -class MAKEINCLUDES_EXPORT KDLockedSharedMemoryPointer : KDLockedSharedMemoryPointerBase { - KDAB_DISABLE_COPY( KDLockedSharedMemoryPointer ); -public: - explicit KDLockedSharedMemoryPointer( QSharedMemory * m ) - : KDLockedSharedMemoryPointerBase( m ) {} - explicit KDLockedSharedMemoryPointer( QSharedMemory & m ) - : KDLockedSharedMemoryPointerBase( m ) {} - - T * get() { return static_cast( KDLockedSharedMemoryPointerBase::get() ); } - const T * get() const { return static_cast( KDLockedSharedMemoryPointerBase::get() ); } - - T * data() { return static_cast( get() ); } - const T * data() const { return static_cast( get() ); } - - T & operator*() { assert( get() ); return *get(); } - const T & operator*() const { assert( get() ); return *get(); } - - T * operator->() { return get(); } - const T * operator->() const { return get(); } - - KDAB_USING_SAFE_BOOL_OPERATOR( KDLockedSharedMemoryPointerBase ) -}; - -template -class MAKEINCLUDES_EXPORT KDLockedSharedMemoryArray : KDLockedSharedMemoryPointerBase { - KDAB_DISABLE_COPY( KDLockedSharedMemoryArray ); -public: - explicit KDLockedSharedMemoryArray( QSharedMemory * m ) - : KDLockedSharedMemoryPointerBase( m ) {} - explicit KDLockedSharedMemoryArray( QSharedMemory & m ) - : KDLockedSharedMemoryPointerBase( m ) {} - - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; - typedef T* iterator; - typedef const T* const_iterator; - typedef std::reverse_iterator< const_iterator > const_reverse_iterator; - typedef std::reverse_iterator< iterator > reverse_iterator; - - iterator begin() { return get(); } - const_iterator begin() const { return get(); } - - iterator end() { return begin() + size(); } - const_iterator end() const { return begin() + size(); } - - reverse_iterator rbegin() { return reverse_iterator( end() ); } - const_reverse_iterator rbegin() const { return reverse_iterator( end() ); } - - reverse_iterator rend() { return reverse_iterator( begin() ); } - const_reverse_iterator rend() const { return const_reverse_iterator( begin() ); } - - size_type size() const { return byteSize() / sizeof( T ); } - - T * get() { return static_cast( KDLockedSharedMemoryPointerBase::get() ); } - const T * get() const { return static_cast( KDLockedSharedMemoryPointerBase::get() ); } - - T & operator[]( difference_type n ) { assert( get() ); return *(get()+n); } - const T & operator[]( difference_type n ) const { assert( get() ); return *(get()+n); } - - T & front() { assert( get() ); return *get(); } - const T & front() const { assert( get() ); return *get(); } - - T & back() { assert( get() ); return *( get() + size() - 1 ); } - const T & back() const { assert( get() ); return *( get() + size() - 1 ); } - - KDAB_USING_SAFE_BOOL_OPERATOR( KDLockedSharedMemoryPointerBase ) -}; - -#ifndef DOXYGEN_RUN -} -#endif - -#endif /* QT_NO_SHAREDMEMORY */ - -#endif /* QT_VERSION >= 0x040400 || defined( DOXYGEN_RUN ) */ - -#endif /* __KDTOOLS__CORE__KDLOCKEDSHAREDMEMORYPOINTER_H__ */ diff --git a/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp b/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp deleted file mode 100644 index 3af326193..000000000 --- a/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB. - * SPDX-License-Identifier: LGPL-2.0-only - * - * The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB. - */ -#include "kdsharedmemorylocker.h" - -#if QT_VERSION >= 0x040400 || defined( DOXYGEN_RUN ) - -#include - -using namespace kdtools; - -/*! - \class KDSharedMemoryLocker - \ingroup raii core - \brief Exception-safe and convenient wrapper around QSharedMemory::lock() -*/ - -/** - * Constructor. Locks the shared memory segment \a mem. - * If another process has locking the segment, this constructor blocks - * until the lock is released. The memory segments needs to be properly created or attached. - */ -KDSharedMemoryLocker::KDSharedMemoryLocker( QSharedMemory* mem ) - : mem( mem ) -{ - mem->lock(); -} - -/** - * Destructor. Unlocks the shared memory segment associated with this - * KDSharedMemoryLocker. - */ -KDSharedMemoryLocker::~KDSharedMemoryLocker() -{ - mem->unlock(); -} - -#ifdef KDAB_EVAL -#include KDAB_EVAL -static const EvalDialogChecker evalChecker( "KD Tools", false ); -#endif - -#endif diff --git a/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.h b/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.h deleted file mode 100644 index 64b5c267f..000000000 --- a/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB. - * SPDX-License-Identifier: LGPL-2.0-only - * - * The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB. - */ -#ifndef __KDTOOLS__CORE__KDSHAREDMEMORYLOCKER_H -#define __KDTOOLS__CORE__KDSHAREDMEMORYLOCKER_H - -#include "kdtoolsglobal.h" - -#if QT_VERSION < 0x040400 && !defined( DOXYGEN_RUN ) -#ifdef Q_CC_GNU -#warning "Can't use KDTools KDSharedMemoryLocker with Qt versions prior to 4.4" -#endif -#else - -class QSharedMemory; - -#ifndef DOXYGEN_RUN -namespace kdtools -{ -#endif - -class KDTOOLSCORE_EXPORT KDSharedMemoryLocker -{ - Q_DISABLE_COPY( KDSharedMemoryLocker ) -public: - KDSharedMemoryLocker( QSharedMemory* mem ); - ~KDSharedMemoryLocker(); - -private: - QSharedMemory* const mem; -}; - -#ifndef DOXYGEN_RUN -} -#endif - -#endif - -#endif diff --git a/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp b/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp deleted file mode 100644 index 52eb60d37..000000000 --- a/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp +++ /dev/null @@ -1,1256 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB. - * SPDX-License-Identifier: LGPL-2.0-only - * - * The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB. - */ -#include "kdsingleapplicationguard.h" - -#if QT_VERSION >= 0x040400 || defined(DOXYGEN_RUN) -#ifndef QT_NO_SHAREDMEMORY - -#include "kdsharedmemorylocker.h" -#include "kdlockedsharedmemorypointer.h" - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#ifndef Q_WS_WIN -#include -#include -#endif - -#ifdef Q_WS_WIN -#include -#ifndef _SSIZE_T_DEFINED -typedef signed int ssize_t; -#endif -#endif - -using namespace kdtools; - -#ifndef KDSINGLEAPPLICATIONGUARD_TIMEOUT_SECONDS -#define KDSINGLEAPPLICATIONGUARD_TIMEOUT_SECONDS 10 -#endif - -#ifndef KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES -#define KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES 10 -#endif - -#ifndef KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE -#define KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE 32768 -#endif - -static unsigned int KDSINGLEAPPLICATIONGUARD_SHM_VERSION = 0; - -Q_GLOBAL_STATIC_WITH_ARGS( int, registerInstanceType, - (qRegisterMetaType()) ) - -/*! - \class KDSingleApplicationGuard::Instance - \relates KDSingleApplicationGuard - \ingroup core - \brief Information about instances a KDSingleApplicationGuard knows about - - Instance represents instances of applications under - KDSingleApplicationGuard protection, and allows access to their - pid() and the arguments() they were started with. -*/ - -class KDSingleApplicationGuard::Instance::Private : public QSharedData { - friend class ::KDSingleApplicationGuard::Instance; -public: - Private( const QStringList & args, bool truncated, qint64 pid ) - : pid( pid ), arguments( args ), truncated( truncated ) {} - -private: - qint64 pid; - QStringList arguments; - bool truncated; -}; - -struct ProcessInfo; - -/*! - \internal - */ -class KDSingleApplicationGuard::Private -{ - friend class ::KDSingleApplicationGuard; - friend class ::KDSingleApplicationGuard::Instance; - friend struct ::ProcessInfo; - KDSingleApplicationGuard * const q; -public: - Private( Policy policy, KDSingleApplicationGuard* qq ); - ~Private(); - - void create( const QStringList& arguments ); - - bool checkOperational( const char * function, const char * act ) const; - bool checkOperationalPrimary( const char * function, const char * act ) const; - - struct segmentheader - { - size_t size : 16; - }; - - static void sharedmem_free( char* ); - static char* sharedmem_malloc( size_t size ); - -private: - void shutdownInstance(); - void poll(); - -private: - static KDSingleApplicationGuard* primaryInstance; - -private: - QBasicTimer timer; - QSharedMemory mem; - int id; - Policy policy; - bool operational; - bool exitRequested; -}; - -/*! - \internal -*/ -KDSingleApplicationGuard::Instance::Instance( const QStringList & args, bool truncated, qint64 p ) - : d( new Private( args, truncated, p ) ) -{ - d->ref.ref(); - (void)registerInstanceType(); -} - -/*! - Default constructor. Constructs in Instance that is \link isNull() - null\endlink. - - \sa isNull() -*/ -KDSingleApplicationGuard::Instance::Instance() : d( 0 ) {} - -/*! - Copy constructor. -*/ -KDSingleApplicationGuard::Instance::Instance( const Instance & other ) - : d( other.d ) -{ - if ( d ) - d->ref.ref(); -} - -/*! - Destructor. -*/ -KDSingleApplicationGuard::Instance::~Instance() -{ - if ( d && !d->ref.deref() ) - delete d; -} - -/*! - \fn KDSingleApplicationGuard::Instance::swap( Instance & other ) - - Swaps the contents of this and \a other. - - This function never throws exceptions. -*/ - -/*! - \fn KDSingleApplicationGuard::Instance::operator=( Instance other ) - - Assigns the contents of \a other to this. - - This function is strongly exception-safe. -*/ - -/*! - \fn std::swap( KDSingleApplicationGuard::Instance & lhs, KDSingleApplicationGuard::Instance & rhs ) - \relates KDSingleApplicationGuard::Instance - - Specialisation of std::swap() for - KDSingleApplicationGuard::Instance. Calls swap(). -*/ - -/*! - \fn qSwap( KDSingleApplicationGuard::Instance & lhs, KDSingleApplicationGuard::Instance & rhs ) - \relates KDSingleApplicationGuard::Instance - - Specialisation of qSwap() for - KDSingleApplicationGuard::Instance. Calls swap(). -*/ - -/*! - \fn KDSingleApplicationGuard::Instance::isNull() const - - Returns whether this instance is null. -*/ - -/*! - Returns whether this instance is valid. A valid instance is neither - null, nor does it have a negative PID. -*/ -bool KDSingleApplicationGuard::Instance::isValid() const -{ - return d && d->pid >= 0 ; -} - -/*! - Returns whether the #arguments are complete (\c false) or not (\c - true), e.g. because they have been truncated due to limited storage - space. - - \sa arguments() -*/ -bool KDSingleApplicationGuard::Instance::areArgumentsTruncated() const -{ - return d && d->truncated; -} - -/*! - Returns the arguments that this instance was started with. - - \sa areArgumentsTruncated() -*/ -const QStringList & KDSingleApplicationGuard::Instance::arguments() const -{ - if ( d ) - return d->arguments; - static const QStringList empty; - return empty; -} - -/*! - Returns the process-id (PID) of this instance. -*/ -qint64 KDSingleApplicationGuard::Instance::pid() const -{ - if ( d ) - return d->pid; - else - return -1; -} - -/*! - \class KDSingleApplicationGuard KDSingleApplicationGuard - \ingroup core - \brief A guard to protect an application from having several instances. - - KDSingleApplicationGuard can be used to make sure only one instance of an - application is running at the same time. - - \note As KDSingleApplicationGuard currently uses QSharedMemory, Qt - 4.4 or later is required. - */ - -/*! - \fn void KDSingleApplicationGuard::instanceStarted(const KDSingleApplicationGuard::Instance & instance) - - This signal is emitted by the primary instance whenever another - instance \a instance started. - */ - -/*! - \fn void KDSingleApplicationGuard::instanceExited(const KDSingleApplicationGuard::Instance & instance) - - This signal is emitted by the primary instance whenever another - instance \a instance exited. - */ - -/*! - \fn void KDSingleApplicationGuard::raiseRequested() - - This signal is emitted when the current running application is requested - to raise its main window. -*/ - -/*! - \fn void KDSingleApplicationGuard::exitRequested() - - This signal is emitted when the current running application has been asked to exit - by calling kill on the instance. -*/ - -/*! - \fn void KDSingleApplicationGuard::becamePrimaryInstance() - - This signal is emitted when the current running application becomes - the new primary application. The old primary application has quit. - */ - -/*! - \fn void KDSingleApplicationGuard::becameSecondaryInstance() - - This signal is emmited when the primary instance became secondary instance. - This happens when the instance doesn't update its status for some (default 10) seconds. Another instance - got primary instance in that case. - */ - -/*! - \fn void KDSingleApplicationGuard::policyChanged( KDSingleApplicationGuard::Policy policy ) - - This signal is emitted when the #policy of the system changes. -*/ - -enum Command -{ - NoCommand = 0x00, - ExitedInstance = 0x01, - NewInstance = 0x02, - FreeInstance = 0x04, - ShutDownCommand = 0x08, - KillCommand = 0x10, - BecomePrimaryCommand = 0x20, - RaiseCommand = 0x40 -}; - -static const quint16 PrematureEndOfOptions = -1; -static const quint16 RegularEndOfOptions = -2; - -struct ProcessInfo -{ - static const size_t MarkerSize = sizeof(quint16); - - explicit ProcessInfo( Command c = FreeInstance, const QStringList& arguments = QStringList(), qint64 p = -1 ) - : pid( p ), - command( c ), - timestamp( 0 ), - commandline( 0 ) - { - setArguments( arguments ); - } - - void setArguments( const QStringList & arguments ); - QStringList arguments( bool * prematureEnd ) const; - - qint64 pid; - quint32 command; - quint32 timestamp; - char* commandline; -}; - -static inline bool operator==( const ProcessInfo & lhs, const ProcessInfo & rhs ) -{ - return lhs.command == rhs.command && - ( lhs.commandline == rhs.commandline || ( lhs.commandline != 0 && rhs.commandline != 0 && ::strcmp( lhs.commandline, rhs.commandline ) == 0 ) ); -} - -static inline bool operator!=( const ProcessInfo & lhs, const ProcessInfo & rhs ) -{ - return !operator==( lhs, rhs ); -} - -/*! - This struct contains information about the managed process system. - \internal - */ -struct InstanceRegister -{ - explicit InstanceRegister( KDSingleApplicationGuard::Policy policy = KDSingleApplicationGuard::NoPolicy ) - : policy( policy ), - maxInstances( KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES ), - version( 0 ) - { - std::fill_n( commandLines, KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE, 0 ); - ::memcpy( magicCookie, "kdsingleapp", 12 ); - } - - /*! - Returns whether this register was properly initialized by the first instance. - */ - bool isValid() const - { - return ::strcmp( magicCookie, "kdsingleapp" ) == 0; - } - - char magicCookie[ 12 ]; - unsigned int policy : 8; - quint32 maxInstances : 20; - unsigned int version : 4; - ProcessInfo info[ KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES ]; - - char commandLines[ KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE ]; - - Q_DISABLE_COPY( InstanceRegister ) -}; - -void ProcessInfo::setArguments( const QStringList & arguments ) -{ - if( commandline != 0 ) - KDSingleApplicationGuard::Private::sharedmem_free( commandline ); - - commandline = 0; - if( arguments.isEmpty() ) - return; - - size_t totalsize = MarkerSize; - for ( const QString& arg : arguments ) - { - const QByteArray utf8 = arg.toUtf8(); - totalsize += utf8.size() + MarkerSize; - } - InstanceRegister* const reg = reinterpret_cast( KDSingleApplicationGuard::Private::primaryInstance->d->mem.data() ); - this->commandline = KDSingleApplicationGuard::Private::sharedmem_malloc( totalsize ); - if( this->commandline == 0 ) - { - qWarning("KDSingleApplicationguard: out of memory when trying to save arguments.\n"); - return; - } - - char* const commandline = this->commandline + reinterpret_cast(reg->commandLines); - - int argpos = 0; - for ( const QString & arg : arguments ) - { - const QByteArray utf8 = arg.toUtf8(); - const int required = MarkerSize + utf8.size() + MarkerSize ; - const int available = KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE - argpos ; - if ( required > available || utf8.size() > std::numeric_limits::max() ) { - // write a premature-eoo marker, and quit - memcpy( commandline + argpos, &PrematureEndOfOptions, MarkerSize ); - argpos += MarkerSize; - qWarning( "KDSingleApplicationGuard: argument list is too long (bytes required: %d, used: %d, available: %d", - required, argpos - 2, available ); - return; - } else { - const quint16 len16 = utf8.size(); - // write the size of the data... - memcpy( commandline + argpos, &len16, MarkerSize ); - argpos += MarkerSize; - // then the data - memcpy( commandline + argpos, utf8.data(), len16 ); - argpos += len16; - } - } - const ssize_t available = KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE - argpos; - assert( available >= static_cast( MarkerSize ) ); - memcpy( commandline + argpos, &RegularEndOfOptions, MarkerSize ); - argpos += MarkerSize; -} - -QStringList ProcessInfo::arguments( bool * prematureEnd ) const -{ - QStringList result; - if( commandline == 0 ) - { - if( prematureEnd ) - *prematureEnd = true; - return result; - } - - InstanceRegister* const reg = reinterpret_cast( KDSingleApplicationGuard::Private::primaryInstance->d->mem.data() ); - const char* const commandline = this->commandline + reinterpret_cast(reg->commandLines); - - int argpos = 0; - while ( true ) { - const int available = KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE - argpos ; - assert( available >= 2 ); - - quint16 marker; - memcpy( &marker, commandline + argpos, MarkerSize ); - argpos += MarkerSize; - - if ( marker == PrematureEndOfOptions ) { - if ( prematureEnd ) *prematureEnd = true; - break; - } - if ( marker == RegularEndOfOptions ) { - if ( prematureEnd ) *prematureEnd = false; - break; - } - - const int requested = MarkerSize + marker + MarkerSize ; - if ( requested > available ) { - const long long int p = pid; - qWarning( "KDSingleApplicationGuard: inconsistency detected when parsing command-line argument for process %lld", p ); - if ( prematureEnd ) *prematureEnd = true; - break; - } - - result.push_back( QString::fromUtf8( commandline + argpos, marker ) ); - argpos += marker; - } - - return result; -} - -KDSingleApplicationGuard::Private::~Private() -{ - if( primaryInstance == q ) - primaryInstance = 0; -} - -bool KDSingleApplicationGuard::Private::checkOperational( const char * function, const char * act ) const -{ - assert( function ); - assert( act ); - if ( !operational ) - qWarning( "KDSingleApplicationGuard::%s: need to be operational to %s", function, act ); - return operational; -} - -bool KDSingleApplicationGuard::Private::checkOperationalPrimary( const char * function, const char * act ) const -{ - if ( !checkOperational( function, act ) ) - return false; - if ( id != 0 ) - qWarning( "KDSingleApplicationGuard::%s: need to be primary to %s", function, act ); - return id == 0; -} - -struct segmentheader -{ - size_t size : 16; -}; - -void KDSingleApplicationGuard::Private::sharedmem_free( char* pointer ) -{ - InstanceRegister* const reg = reinterpret_cast( KDSingleApplicationGuard::Private::primaryInstance->d->mem.data() ); - char* const heap = reg->commandLines; - char* const heap_ptr = heap + reinterpret_cast(pointer) - sizeof( segmentheader ); - const segmentheader* const header = reinterpret_cast< const segmentheader* >( heap_ptr ); - const size_t size = header->size; - - char* end = heap + KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE; - - std::copy( heap_ptr + size, end, heap_ptr ); - std::fill( end - size, end, 0 ); - - for( uint i = 0; i < reg->maxInstances; ++i ) - { - if( reg->info[ i ].commandline > pointer ) - reg->info[ i ].commandline -= size + sizeof( segmentheader ); - } -} - -char* KDSingleApplicationGuard::Private::sharedmem_malloc( size_t size ) -{ - InstanceRegister* const reg = reinterpret_cast( KDSingleApplicationGuard::Private::primaryInstance->d->mem.data() ); - char* heap = reg->commandLines; - - while( heap + sizeof( segmentheader ) + size < reg->commandLines + KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE ) - { - segmentheader* const header = reinterpret_cast< segmentheader* >( heap ); - if( header->size == 0 ) - { - header->size = size; - return heap + sizeof( segmentheader ) - reinterpret_cast(reg->commandLines); - } - heap += sizeof( header ) + header->size; - } - return 0; -} - -void KDSingleApplicationGuard::Private::shutdownInstance() -{ - KDLockedSharedMemoryPointer< InstanceRegister > instances( &q->d->mem ); - instances->info[ q->d->id ].command |= ExitedInstance; - - if( q->isPrimaryInstance() ) - { - // ohh... we need a new primary instance... - for ( int i = 1, end = instances->maxInstances ; i < end ; ++i ) - { - if( ( instances->info[ i ].command & ( FreeInstance | ExitedInstance | ShutDownCommand | KillCommand ) ) == 0 ) - { - instances->info[ i ].command |= BecomePrimaryCommand; - return; - } - } - // none found? then my species is dead :-( - } -} - -KDSingleApplicationGuard* KDSingleApplicationGuard::Private::primaryInstance = 0; - -/*! - Requests that the instance kills itself (by emitting exitRequested). - - If the instance has since exited, does nothing. - - \sa shutdown(), raise() -*/ -void KDSingleApplicationGuard::Instance::kill() -{ - KDLockedSharedMemoryPointer< InstanceRegister > instances( &KDSingleApplicationGuard::Private::primaryInstance->d->mem ); - for ( int i = 0, end = instances->maxInstances ; i < end ; ++i ) - { - if( instances->info[ i ].pid != d->pid ) - continue; - if( ( instances->info[ i ].command & ( FreeInstance | ExitedInstance ) ) == 0 ) - instances->info[ i ].command = KillCommand; - } -} - -/*! - Requests that the instance shuts itself down (by calling QCoreApplication::quit()). - - If the instance has since exited, does nothing. - - \sa kill(), raise() -*/ -void KDSingleApplicationGuard::Instance::shutdown() -{ - KDLockedSharedMemoryPointer< InstanceRegister > instances( &KDSingleApplicationGuard::Private::primaryInstance->d->mem ); - for ( int i = 0, end = instances->maxInstances ; i < end ; ++i ) - { - if( instances->info[ i ].pid != d->pid ) - continue; - if( ( instances->info[ i ].command & ( FreeInstance | ExitedInstance ) ) == 0 ) - instances->info[ i ].command = ShutDownCommand; - } -} - -/*! - - Requests that the instance raises its main window. - - The effects are implementation-defined: the KDSingleApplicationGuard - corresponding to the instance will emit its \link - KDSingleApplicationGuard::raiseRequested() raiseRequested()\endlink - signal. - - If the instance has since exited, does nothing. - - \sa kill(), shutdown() -*/ -void KDSingleApplicationGuard::Instance::raise() -{ - KDLockedSharedMemoryPointer< InstanceRegister > instances( &KDSingleApplicationGuard::Private::primaryInstance->d->mem ); - for ( int i = 0, end = instances->maxInstances ; i < end ; ++i ) - { - if( instances->info[ i ].pid != d->pid ) - continue; - if( ( instances->info[ i ].command & ( FreeInstance | ExitedInstance ) ) == 0 ) - instances->info[ i ].command = RaiseCommand; - } -} - - -#ifndef Q_WS_WIN -// static -void KDSingleApplicationGuard::SIGINT_handler( int sig ) -{ - if( sig == SIGINT && Private::primaryInstance != 0 ) - Private::primaryInstance->d->shutdownInstance(); - ::exit( 1 ); -} -#endif - -/*! - \enum KDSingleApplicationGuard::Policy - - Defines the policy that a KDSingleApplicationGuard can enforce: -*/ - -/*! - \var KDSingleApplicationGuard::NoPolicy - - instanceStarted() is emitted, and the new instance allowed to continue. -*/ - -/*! - \var KDSingleApplicationGuard::AutoKillOtherInstances - - instanceStarted() is emitted, and the new instance is killed (Instance::kill()). -*/ - -/*! - Creates a new KDSingleApplicationGuard with arguments - QCoreApplication::arguments() and policy AutoKillOtherInstances, - passing \a parent to the base class constructor, as usual. -*/ -KDSingleApplicationGuard::KDSingleApplicationGuard( QObject * parent ) - : QObject( parent ), d( new Private( AutoKillOtherInstances, this ) ) -{ - d->create( QCoreApplication::arguments() ); -} - -/*! - Creates a new KDSingleApplicationGuard with arguments - QCoreApplication::arguments() and policy \a policy, passing \a - parent to the base class constructor, as usual. -*/ -KDSingleApplicationGuard::KDSingleApplicationGuard( Policy policy, QObject * parent ) - : QObject( parent ), d( new Private( policy, this ) ) -{ - d->create( QCoreApplication::arguments() ); -} - -/*! - Creates a new KDSingleApplicationGuard with arguments \a arguments - and policy AutoKillOtherInstances, passing \a parent to the base - class constructor, as usual. -*/ -KDSingleApplicationGuard::KDSingleApplicationGuard( const QStringList & arguments, QObject * parent ) - : QObject( parent ), d( new Private( AutoKillOtherInstances, this ) ) -{ - d->create( arguments ); -} - -/*! - Creates a new KDSingleApplicationGuard with arguments \a arguments - and policy \a policy, passing \a parent to the base class - constructor, as usual. -*/ -KDSingleApplicationGuard::KDSingleApplicationGuard( const QStringList & arguments, Policy policy, QObject * parent ) - : QObject( parent ), d( new Private( policy, this ) ) -{ - d->create( arguments ); -} - -KDSingleApplicationGuard::Private::Private( Policy policy_, KDSingleApplicationGuard * qq ) - : q( qq ), - id( -1 ), - policy( policy_ ), - operational( false ), - exitRequested( false ) -{ -} - -void KDSingleApplicationGuard::Private::create( const QStringList & arguments ) -{ - if ( !QCoreApplication::instance() ) { - qWarning( "KDSingleApplicationGuard: you need to construct a Q(Core)Application before you can construct a KDSingleApplicationGuard" ); - return; - } - - const QString name = QCoreApplication::applicationName(); - if ( name.isEmpty() ) { - qWarning( "KDSingleApplicationGuard: QCoreApplication::applicationName must not be empty" ); - return; - } - - (void)registerInstanceType(); - if ( primaryInstance == 0 ) - primaryInstance = q; - - mem.setKey( name ); - - // if another instance crashed, the shared memory segment is still there on Unix - // the following lines trigger deletion in that case -#ifndef Q_WS_WIN - mem.attach(); - mem.detach(); -#endif - - const bool created = mem.create( sizeof( InstanceRegister ) ); - if( !created ) - { - QString errorMsg; - if( mem.error() != QSharedMemory::NoError && mem.error() != QSharedMemory::AlreadyExists ) - errorMsg += QString::fromLatin1( "QSharedMemomry::create() failed: %1" ).arg( mem.errorString() ); - - if( !mem.attach() ) - { - if( mem.error() != QSharedMemory::NoError ) - errorMsg += QString::fromLatin1( "QSharedMemomry::attach() failed: %1" ).arg( mem.errorString() ); - - qWarning( "KDSingleApplicationGuard: Could neither create nor attach to shared memory segment." ); - qWarning( "%s\n", errorMsg.toLocal8Bit().constData() ); - return; - } - - const int maxWaitMSecs = 1000 * 60; // stop waiting after 60 seconds - QElapsedTimer waitTimer; - waitTimer.start(); - - // lets wait till the other instance initialized the register - bool initialized = false; - while( !initialized && waitTimer.elapsed() < maxWaitMSecs ) - { - const KDLockedSharedMemoryPointer< InstanceRegister > instances( &mem ); - initialized = instances->isValid(); -#ifdef Q_WS_WIN - ::Sleep(20); -#else - usleep(20000); -#endif - } - - const KDLockedSharedMemoryPointer< InstanceRegister > instances( &mem ); - if ( instances->version != 0 ) { - qWarning( "KDSingleApplicationGuard: Detected version mismatch. " - "Highest supported version: %ud, actual version: %ud", - KDSINGLEAPPLICATIONGUARD_SHM_VERSION, instances->version ); - return; - } - - } - - - KDLockedSharedMemoryPointer< InstanceRegister > instances( &mem ); - - if( !created ) - { - assert( instances->isValid() ); - - // we're _not_ the first instance - // but the - bool killOurSelf = false; - - // find a new slot... - id = std::find( instances->info, instances->info + instances->maxInstances, ProcessInfo() ) - instances->info; - ProcessInfo& info = instances->info[ id ]; - info = ProcessInfo( NewInstance, arguments, QCoreApplication::applicationPid() ); - killOurSelf = instances->policy == AutoKillOtherInstances; - policy = static_cast( instances->policy ); - - // but the signal that we tried to start was sent to the primary application - if( killOurSelf ) - exitRequested = true; - } - else - { - // ok.... we are the first instance - new ( instances.get() ) InstanceRegister( policy ); // create a new list (in shared memory) - id = 0; // our id = 0 - // and we've no command - instances->info[ 0 ] = ProcessInfo( NoCommand, arguments, QCoreApplication::applicationPid() ); - } - -#ifndef Q_WS_WIN - ::signal( SIGINT, SIGINT_handler ); -#endif - - // now listen for commands - timer.start( 750, q ); - - operational = true; -} - -/*! - Destroys this SingleApplicationGuard. - If this instance has been the primary instance and no other instance is existing anymore, - the application is shut down completely. Otherwise the destructor selects another instance to - be the primary instances. - */ -KDSingleApplicationGuard::~KDSingleApplicationGuard() -{ - if( d->id == -1 ) - return; - - d->shutdownInstance(); -} - -/*! - \property KDSingleApplicationGuard::operational - - Contains whether this KDSingleApplicationGuard is operational. - - A non-operational KDSingleApplicationGuard cannot be used in any meaningful way. - - Reasons for a KDSingleApplicationGuard being non-operational include: - \li it was constructed before QApplication (or at least QCoreApplication) was constructed - \li it failed to create or attach to the shared memory segment that is used for communication - - Get this property's value using %isOperational(). -*/ -bool KDSingleApplicationGuard::isOperational() const -{ - return d->operational; -} - -/*! - \property KDSingleApplicationGuard::exitRequested - - Contains wheter this istance has been requested to exit. This will happen when this instance - was just started, but the policy is AutoKillOtherInstances or by explicitely calling kill on - this instance(). - - Get this property's value using %isExitRequested(). -*/ -bool KDSingleApplicationGuard::isExitRequested() const -{ - return d->exitRequested; -}; - -/*! - \property KDSingleApplicationGuard::primaryInstance - - Contains whether this instance is the primary instance. - - The primary instance is the first instance which was started or else the instance which - got selected by KDSingleApplicationGuard's destructor, when the primary instance was - shut down. - - Get this property's value using %isPrimaryInstance(), and monitor changes to it - using becamePrimaryInstance(). - */ -bool KDSingleApplicationGuard::isPrimaryInstance() const -{ - return d->id == 0; -} - -/*! - \property KDSingleApplicationGuard::policy - Specifies the policy KDSingleApplicationGuard is using when new instances are started. - This can only be set in the primary instance. - - Get this property's value using %policy(), set it using %setPolicy(), and monitor changes - to it using policyChanged(). - */ -KDSingleApplicationGuard::Policy KDSingleApplicationGuard::policy() const -{ - return d->policy; -} - -void KDSingleApplicationGuard::setPolicy( Policy policy ) -{ - if ( !d->checkOperationalPrimary( "setPolicy", "change the policy" ) ) - return; - - if( d->policy == policy ) - return; - - d->policy = policy; - emit policyChanged( policy ); - KDLockedSharedMemoryPointer< InstanceRegister > instances( &d->mem ); - instances->policy = policy; -} - -/*! - Returns a list of all currently running instances. - */ -QVector -KDSingleApplicationGuard::instances() const -{ - if ( !d->checkOperational( "instances", "report on other instances" ) ) - return QVector(); - - if ( Private::primaryInstance == 0 ) { - Private::primaryInstance = const_cast( this ); - } - - QVector result; - const KDLockedSharedMemoryPointer< InstanceRegister > instances( const_cast< QSharedMemory* >( &d->mem ) ); - for ( int i = 0, end = instances->maxInstances ; i < end ; ++i ) - { - const ProcessInfo& info = instances->info[ i ]; - if( ( info.command & ( FreeInstance | ExitedInstance ) ) == 0 ) - { - bool truncated; - const QStringList arguments = info.arguments( &truncated ); - result.push_back( Instance( arguments, truncated, info.pid ) ); - } - } - return result; -} - -/*! - Shuts down all other instances. This can only be called from the - the primary instance. - Shut down is done gracefully via QCoreApplication::quit(). - */ -void KDSingleApplicationGuard::shutdownOtherInstances() -{ - if ( !d->checkOperationalPrimary( "shutdownOtherInstances", "shut other instances down" ) ) - return; - - KDLockedSharedMemoryPointer< InstanceRegister > instances( &d->mem ); - for ( int i = 1, end = instances->maxInstances ; i < end ; ++i ) - { - if( ( instances->info[ i ].command & ( FreeInstance | ExitedInstance ) ) == 0 ) - instances->info[ i ].command = ShutDownCommand; - } -} - -/*! - Kills all other instances. This can only be called from the - the primary instance. - Killing is done via emitting exitRequested. It's up to the receiving - instance to react properly. - */ -void KDSingleApplicationGuard::killOtherInstances() -{ - if ( !d->checkOperationalPrimary( "killOtherInstances", "kill other instances" ) ) - return; - - KDLockedSharedMemoryPointer< InstanceRegister > instances( &d->mem ); - for ( int i = 1, end = instances->maxInstances ; i < end ; ++i ) - { - if( ( instances->info[ i ].command & ( FreeInstance | ExitedInstance ) ) == 0 ) - instances->info[ i ].command = KillCommand; - } -} - -bool KDSingleApplicationGuard::event( QEvent * event ) -{ - if ( event->type() == QEvent::Timer ) { - const QTimerEvent * const te = static_cast( event ); - if ( te->timerId() == d->timer.timerId() ) { - d->poll(); - return true; - } - } - return QObject::event( event ); -} - -void KDSingleApplicationGuard::Private::poll() { - - const quint32 now = QDateTime::currentDateTime().toTime_t(); - - if ( primaryInstance == 0 ) { - primaryInstance = q; - } - - if ( q->isPrimaryInstance() ) - { - // only the primary instance will get notified about new instances - QVector< Instance > exitedInstances; - QVector< Instance > startedInstances; - - { - KDLockedSharedMemoryPointer< InstanceRegister > instances( &mem ); - - if( instances->info[ id ].pid != QCoreApplication::applicationPid() ) - { - for ( int i = 1, end = instances->maxInstances ; i < end && id == 0 ; ++i ) - { - if( instances->info[ i ].pid == QCoreApplication::applicationPid() ) - id = i; - } - emit q->becameSecondaryInstance(); - return; - } - - instances->info[ id ].timestamp = now; - - for ( int i = 1, end = instances->maxInstances ; i < end ; ++i ) - { - ProcessInfo& info = instances->info[ i ]; - if( info.command & NewInstance ) - { - bool truncated; - const QStringList arguments = info.arguments( &truncated ); - startedInstances.push_back( Instance( arguments, truncated, info.pid ) ); - info.command &= ~NewInstance; // clear NewInstance flag - } - if( info.command & ExitedInstance ) - { - bool truncated; - const QStringList arguments = info.arguments( &truncated ); - exitedInstances.push_back( Instance( arguments, truncated, info.pid ) ); - info.command = FreeInstance; // set FreeInstance flag - } - } - } - - // one signal for every new instance - _after_ the memory segment was unlocked again - for( QVector< Instance >::const_iterator it = startedInstances.constBegin(); it != startedInstances.constEnd(); ++it ) - emit q->instanceStarted( *it ); - for( QVector< Instance >::const_iterator it = exitedInstances.constBegin(); it != exitedInstances.constEnd(); ++it ) - emit q->instanceExited( *it ); - } - else - { - // do we have a command? - bool killOurSelf = false; - bool shutDownOurSelf = false; - bool policyDidChange = false; - - { - KDLockedSharedMemoryPointer< InstanceRegister > instances( &mem ); - - const Policy oldPolicy = policy; - policy = static_cast( instances->policy ); - policyDidChange = policy != oldPolicy; - - // check for the primary instance health status - if( now - instances->info[ 0 ].timestamp > KDSINGLEAPPLICATIONGUARD_TIMEOUT_SECONDS ) - { - std::swap( instances->info[ 0 ], instances->info[ id ] ); - id = 0; - instances->info[ id ].timestamp = now; - emit q->becamePrimaryInstance(); - instances->info[ id ].command &= ~BecomePrimaryCommand; // afterwards, reset the flag - } - - if( instances->info[ id ].command & BecomePrimaryCommand ) - { - // we became primary! - instances->info[ 0 ] = instances->info[ id ]; - instances->info[ id ] = ProcessInfo(); // change our id to 0 and declare the old slot as free - id = 0; - instances->info[ id ].timestamp = now; - emit q->becamePrimaryInstance(); - } - - if( instances->info[ id ].command & RaiseCommand ) - { - // raise ourself! - emit q->raiseRequested(); - instances->info[ id ].command &= ~RaiseCommand; // afterwards, reset the flag - } - - - killOurSelf = instances->info[ id ].command & KillCommand; // check for kill command - shutDownOurSelf = instances->info[ id ].command & ShutDownCommand; // check for shut down command - instances->info[ id ].command &= ~( KillCommand | ShutDownCommand | BecomePrimaryCommand ); // reset both flags - if( killOurSelf ) - { - instances->info[ id ].command |= ExitedInstance; // upon kill, we have to set the ExitedInstance flag - id = -1; // becauso our d'tor won't be called anymore - } - } - - if( killOurSelf ) // kill our self takes precedence - { - exitRequested = true; - emit q->exitRequested(); - } - else if( shutDownOurSelf ) - qApp->quit(); - else if( policyDidChange ) - emit q->policyChanged( policy ); - } -} - -// #include "moc_kdsingleapplicationguard.cpp" - -#ifdef KDTOOLSCORE_UNITTESTS - -#include - -#include "kdautopointer.h" - -#include - -#include -#include -#include - -static void wait( int msec, QSignalSpy * spy=0, int expectedCount=INT_MAX ) -{ - QTime t; - t.start(); - while ( ( !spy || spy->count() < expectedCount ) && t.elapsed() < msec ) - { - qApp->processEvents( QEventLoop::WaitForMoreEvents, qMax( 10, msec - t.elapsed() ) ); - } -} - -static std::ostream& operator<<( std::ostream& stream, const QStringList& list ) -{ - stream << "QStringList("; - for( QStringList::const_iterator it = list.begin(); it != list.end(); ++it ) - { - stream << " " << it->toLocal8Bit().data(); - if( it + 1 != list.end() ) - stream << ","; - } - stream << " )"; - return stream; -} - -namespace { - class ApplicationNameSaver { - Q_DISABLE_COPY( ApplicationNameSaver ) - const QString oldname; - public: - explicit ApplicationNameSaver( const QString & name ) - : oldname( QCoreApplication::applicationName() ) - { - QCoreApplication::setApplicationName( name ); - } - ~ApplicationNameSaver() { - QCoreApplication::setApplicationName( oldname ); - } - }; -} - -KDAB_UNITTEST_SIMPLE( KDSingleApplicationGuard, "kdcoretools" ) { - - // set it to an unique name - const ApplicationNameSaver saver( QUuid::createUuid().toString() ); - - KDAutoPointer guard3; - KDAutoPointer spy3; - KDAutoPointer spy4; - - { - KDSingleApplicationGuard guard1; - assertEqual( guard1.policy(), KDSingleApplicationGuard::AutoKillOtherInstances ); - assertEqual( guard1.instances().count(), 1 ); - assertTrue( guard1.isPrimaryInstance() ); - - guard1.setPolicy( KDSingleApplicationGuard::NoPolicy ); - assertEqual( guard1.policy(), KDSingleApplicationGuard::NoPolicy ); - - QSignalSpy spy1( &guard1, SIGNAL(instanceStarted(KDSingleApplicationGuard::Instance)) ); - - KDSingleApplicationGuard guard2; - assertEqual( guard1.instances().count(), 2 ); - assertEqual( guard2.instances().count(), 2 ); - assertEqual( guard2.policy(), KDSingleApplicationGuard::NoPolicy ); - assertFalse( guard2.isPrimaryInstance() ); - - wait( 1000, &spy1, 1 ); - - assertEqual( spy1.count(), 1 ); - guard3.reset( new KDSingleApplicationGuard ); - spy3.reset( new QSignalSpy( guard3.get(), SIGNAL(becamePrimaryInstance()) ) ); - spy4.reset( new QSignalSpy( guard3.get(), SIGNAL(instanceExited(KDSingleApplicationGuard::Instance) ) ) ); - assertFalse( guard3->isPrimaryInstance() ); - } - - wait( 1000, spy3.get(), 1 ); - wait( 1000, spy4.get(), 1 ); - assertEqual( spy3->count(), 1 ); - assertEqual( guard3->instances().count(), 1 ); - assertTrue( guard3->isPrimaryInstance() ); - guard3.reset( new KDSingleApplicationGuard ); - - assertEqual( guard3->instances().first().arguments(), qApp->arguments() ); - - QSignalSpy spyStarted( guard3.get(), SIGNAL(instanceStarted(KDSingleApplicationGuard::Instance)) ); - QSignalSpy spyExited( guard3.get(), SIGNAL(instanceExited(KDSingleApplicationGuard::Instance)) ); - - { - KDSingleApplicationGuard guard1; - KDSingleApplicationGuard guard2; - - wait( 1000, &spyStarted, 2 ); - - assertEqual( spyStarted.count(), 2 ); - } - - wait( 1000, &spyExited, 2 ); - assertEqual( spyExited.count(), 2 ); - - spyStarted.clear(); - spyExited.clear(); - - { - // check arguments-too-long handling: - QStringList args; - for ( unsigned int i = 0, end = KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE/16 ; i != end ; ++i ) - args.push_back( QLatin1String( "0123456789ABCDEF" ) ); - KDSingleApplicationGuard guard3( args ); - - wait( 1000, &spyStarted, 1 ); - - const QVector instances = guard3.instances(); - assertEqual( instances.size(), 2 ); - - assertTrue( instances[1].areArgumentsTruncated() ); - } -} - -#endif // KDTOOLSCORE_UNITTESTS - -#endif // QT_NO_SHAREDMEMORY -#endif // QT_VERSION >= 0x040400 || defined(DOXYGEN_RUN) diff --git a/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h b/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h deleted file mode 100644 index f75825cef..000000000 --- a/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h +++ /dev/null @@ -1,147 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB. - * SPDX-License-Identifier: LGPL-2.0-only - * - * The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB. - */ -#ifndef KDTOOLSCORE_KDSINGLEAPPLICATIONGUARD_H -#define KDTOOLSCORE_KDSINGLEAPPLICATIONGUARD_H - -#include - -#ifndef QT_NO_SHAREDMEMORY - -#include -#include - -#include "pimpl_ptr.h" -#include "DllMacro.h" - -#include - -template class QVector; -class QCoreApplication; - -class DLLEXPORT KDSingleApplicationGuard : public QObject -{ - Q_OBJECT - Q_ENUMS( Policy ) - Q_PROPERTY( bool operational READ isOperational ) - Q_PROPERTY( bool exitRequested READ isExitRequested ) - Q_PROPERTY( bool primaryInstance READ isPrimaryInstance NOTIFY becamePrimaryInstance ) - Q_PROPERTY( Policy policy READ policy WRITE setPolicy NOTIFY policyChanged ) -public: - enum Policy - { - NoPolicy = 0, - AutoKillOtherInstances = 1 - }; - - explicit KDSingleApplicationGuard( QObject * parent=nullptr ); - explicit KDSingleApplicationGuard( Policy policy, QObject * parent=nullptr ); - explicit KDSingleApplicationGuard( const QStringList & arguments, QObject * parent=nullptr ); - explicit KDSingleApplicationGuard( const QStringList & arguments, Policy policy, QObject * parent=nullptr ); - ~KDSingleApplicationGuard() override; - - bool isOperational() const; - - bool isExitRequested() const; - - bool isPrimaryInstance() const; - - Policy policy() const; - void setPolicy( Policy policy ); - - class Instance; - - QVector instances() const; - -Q_SIGNALS: - void instanceStarted( const KDSingleApplicationGuard::Instance & instance ); - void instanceExited( const KDSingleApplicationGuard::Instance & instance ); - void exitRequested(); - void raiseRequested(); - void becamePrimaryInstance(); - void becameSecondaryInstance(); - void policyChanged( KDSingleApplicationGuard::Policy policy ); - -public Q_SLOTS: - void shutdownOtherInstances(); - void killOtherInstances(); - -protected: - /*! \reimp */ bool event( QEvent * event ) override; - -private: -#ifndef Q_WS_WIN - static void SIGINT_handler( int ); -#endif - -private: - friend struct ProcessInfo; - - class Private; - kdtools::pimpl_ptr< Private > d; -}; - -class DLLEXPORT KDSingleApplicationGuard::Instance { - friend class ::KDSingleApplicationGuard; - friend class ::KDSingleApplicationGuard::Private; - Instance( const QStringList &, bool, qint64 ); -public: - Instance(); - Instance( const Instance & other ); - ~Instance(); - - void swap( Instance & other ) { - std::swap( d, other.d ); - } - - Instance & operator=( Instance other ) { - swap( other ); - return *this; - } - - bool isNull() const { return !d; } - bool isValid() const; - - bool areArgumentsTruncated() const; - - const QStringList & arguments() const; - qint64 pid() const; - - void shutdown(); - void kill(); - void raise(); - -private: - class Private; - Private * d; -}; - -namespace std { - template <> - inline void swap( KDSingleApplicationGuard::Instance & lhs, - KDSingleApplicationGuard::Instance & rhs ) - { - lhs.swap( rhs ); - } -} // namespace std - -QT_BEGIN_NAMESPACE - -template <> -inline void qSwap( KDSingleApplicationGuard::Instance & lhs, - KDSingleApplicationGuard::Instance & rhs ) -{ - lhs.swap( rhs ); -} -Q_DECLARE_METATYPE( KDSingleApplicationGuard::Instance ) -Q_DECLARE_TYPEINFO( KDSingleApplicationGuard::Instance, Q_MOVABLE_TYPE ); - -QT_END_NAMESPACE - - -#endif // QT_NO_SHAREDMEMORY - -#endif /* KDTOOLSCORE_KDSINGLEAPPLICATIONGUARD_H */ diff --git a/3rdparty/kdsingleapplicationguard/kdtoolsglobal.cpp b/3rdparty/kdsingleapplicationguard/kdtoolsglobal.cpp deleted file mode 100644 index f886189c3..000000000 --- a/3rdparty/kdsingleapplicationguard/kdtoolsglobal.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB. - * SPDX-License-Identifier: LGPL-2.0-only - * - * The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB. - */ -#include "kdtoolsglobal.h" - -#include - -#include - -namespace { - struct Version { - unsigned char v[3]; - }; - - static inline bool operator<( const Version & lhs, const Version & rhs ) { - return std::lexicographical_compare( lhs.v, lhs.v + 3, rhs.v, rhs.v + 3 ); - } - static inline bool operator==( const Version & lhs, const Version & rhs ) { - return std::equal( lhs.v, lhs.v + 3, rhs.v ); - } - KDTOOLS_MAKE_RELATION_OPERATORS( Version, static inline ) -} - -static Version kdParseQtVersion( const char * const version ) { - if ( !version || qstrlen( version ) < 5 || version[1] != '.' || version[3] != '.' || ( version[5] != 0 && version[5] != '.' && version[5] != '-' ) ) - return Version(); // parse error - const Version result = { { static_cast< unsigned char >( version[0] - '0' ), - static_cast< unsigned char >( version[2] - '0' ), - static_cast< unsigned char >( version[4] - '0' ) } }; - return result; -} - -bool _kdCheckQtVersion_impl( unsigned int major, unsigned int minor, unsigned int patchlevel ) { - static const Version actual = kdParseQtVersion( qVersion() ); // do this only once each run... - const Version requested = { { static_cast< unsigned char >( major ), - static_cast< unsigned char >( minor ), - static_cast< unsigned char >( patchlevel ) } }; - return actual >= requested; -} diff --git a/3rdparty/kdsingleapplicationguard/kdtoolsglobal.h b/3rdparty/kdsingleapplicationguard/kdtoolsglobal.h deleted file mode 100644 index 5086ddd71..000000000 --- a/3rdparty/kdsingleapplicationguard/kdtoolsglobal.h +++ /dev/null @@ -1,120 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB. - * SPDX-License-Identifier: LGPL-2.0-only - * - * The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB. - */ -#ifndef KDTOOLS_KDTOOLSGLOBAL_H -#define KDTOOLS_KDTOOLSGLOBAL_H - -#include - -#define KDAB_DISABLE_COPY( x ) private: x( const x & ); x & operator=( const x & ) - -#ifdef KDTOOLS_SHARED -# ifdef BUILD_SHARED_KDTOOLSCORE -# define KDTOOLSCORE_EXPORT Q_DECL_EXPORT -# else -# define KDTOOLSCORE_EXPORT Q_DECL_IMPORT -# endif -# ifdef BUILD_SHARED_KDTOOLSGUI -# define KDTOOLSGUI_EXPORT Q_DECL_EXPORT -# else -# define KDTOOLSGUI_EXPORT Q_DECL_IMPORT -# endif -# ifdef BUILD_SHARED_KDTOOLSXML -# define KDTOOLSXML_EXPORT Q_DECL_EXPORT -# else -# define KDTOOLSXML_EXPORT Q_DECL_IMPORT -# endif -# ifdef BUILD_SHARED_KDUPDATER -# define KDTOOLS_UPDATER_EXPORT Q_DECL_EXPORT -# else -# define KDTOOLS_UPDATER_EXPORT Q_DECL_IMPORT -# endif -#else // KDTOOLS_SHARED -# define KDTOOLSCORE_EXPORT -# define KDTOOLSGUI_EXPORT -# define KDTOOLSXML_EXPORT -# define KDTOOLS_UPDATER_EXPORT -#endif // KDTOOLS_SHARED - -#define MAKEINCLUDES_EXPORT - -#define DOXYGEN_PROPERTY( x ) -#ifdef DOXYGEN_RUN -# define KDAB_IMPLEMENT_SAFE_BOOL_OPERATOR( func ) operator unspecified_bool_type() const { return func; } -# define KDAB_USING_SAFE_BOOL_OPERATOR( Class ) operator unspecified_bool_type() const; -#else -# define KDAB_IMPLEMENT_SAFE_BOOL_OPERATOR( func ) \ - private: \ - struct __safe_bool_dummy__ { void nonnull() {} }; \ - public: \ - typedef void ( __safe_bool_dummy__::*unspecified_bool_type )(); \ - operator unspecified_bool_type() const { \ - return ( func ) ? &__safe_bool_dummy__::nonnull : 0 ; \ - } -#define KDAB_USING_SAFE_BOOL_OPERATOR( Class ) \ - using Class::operator Class::unspecified_bool_type; -#endif - -#define KDTOOLS_MAKE_RELATION_OPERATORS( Class, linkage ) \ - linkage bool operator>( const Class & lhs, const Class & rhs ) { \ - return operator<( rhs, lhs ); \ - } \ - linkage bool operator!=( const Class & lhs, const Class & rhs ) { \ - return !operator==( lhs, rhs ); \ - } \ - linkage bool operator<=( const Class & lhs, const Class & rhs ) { \ - return !operator>( lhs, rhs ); \ - } \ - linkage bool operator>=( const Class & lhs, const Class & rhs ) { \ - return !operator<( lhs, rhs ); \ - } - -template -inline T & __kdtools__dereference_for_methodcall( T & o ) { - return o; -} - -template -inline T & __kdtools__dereference_for_methodcall( T * o ) { - return *o; -} - -#define KDAB_SET_OBJECT_NAME( x ) __kdtools__dereference_for_methodcall( x ).setObjectName( QLatin1String( #x ) ) - -KDTOOLSCORE_EXPORT bool _kdCheckQtVersion_impl( unsigned int major, unsigned int minor=0, unsigned int patchlevel=0 ); -static inline bool kdCheckQtVersion( unsigned int major, unsigned int minor=0, unsigned int patchlevel=0 ) { - return (major<<16|minor<<8|patchlevel) <= static_cast(QT_VERSION) - || _kdCheckQtVersion_impl( major, minor, patchlevel ); -} - -#define KDTOOLS_DECLARE_PRIVATE_BASE( Class ) \ -protected: \ - class Private; \ - Private * d_func() { return _d; } \ - const Private * d_func() const { return _d; } \ - Class( Private * _d_, bool b ) : _d( _d_ ) { init(b); } \ -private: \ - void init(bool); \ -private: \ - Private * _d - -#define KDTOOLS_DECLARE_PRIVATE_DERIVED( Class, Base ) \ -protected: \ - class Private; \ - Private * d_func() { \ - return reinterpret_cast( Base::d_func() ); \ - } \ - const Private * d_func() const { \ - return reinterpret_cast( Base::d_func() ); \ - } \ - Class( Private * _d_, bool b ) \ - : Base( reinterpret_cast(_d_), b ) { init(b); } \ -private: \ - void init(bool) - - -#endif /* KDTOOLS_KDTOOLSGLOBAL_H */ - diff --git a/3rdparty/kdsingleapplicationguard/pimpl_ptr.cpp b/3rdparty/kdsingleapplicationguard/pimpl_ptr.cpp deleted file mode 100644 index f2b0a4dd9..000000000 --- a/3rdparty/kdsingleapplicationguard/pimpl_ptr.cpp +++ /dev/null @@ -1,209 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB. - * SPDX-License-Identifier: LGPL-2.0-only - * - * The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB. - */ -#include "pimpl_ptr.h" - -/*! - \class pimpl_ptr: - \ingroup core smartptr - \brief Owning pointer for private implementations - \since_c 2.1 - - (The exception safety of this class has not been evaluated yet.) - - pimpl_ptr is a smart immutable pointer, which owns the contained object. Unlike other smart pointers, - it creates a standard constructed object when instanciated via the - \link pimpl_ptr() standard constructor\endlink. - Additionally, pimpl_ptr respects constness of the pointer object and returns \c const \c T* for - a const pimpl_ptr object. - - The content of a pimpl_ptr cannot be changed during it's lifetime. - - \section general-use General Use - - The general use case of pimpl_ptr is the "Pimpl Idiom", i.e. hiding the private implementation of a class - from the user's compiler which see \c MyClass as - - \code - class MyClass - { - public: - MyClass(); - ~MyClass(); - - // public class API - int value() const; - - private: - class Private; // defined later - kdtools::pimpl_ptr< Private > d; - }; - \endcode - - but not the private parts of it. These can only be seen (and accessed) by the code knowing \c MyClass::Private: - - \code - class MyClass::Private - { - public: - int value; - }; - - MyClass::MyClass() - { - // d was automatically filled with new Private - d->value = 42; - } - - MyClass::~MyClass() - { - // the content of d gets deleted automatically - } - - int MyClass::value() const - { - // access the private part: - // since MyClass::value() is const, the returned pointee is const, too - return d->value; - } - \endcode - -*/ - -/*! - \fn pimpl_ptr::pimpl_ptr() - - Default constructor. Constructs a pimpl_tr that contains (owns) a standard constructed - instance of \c T. - - \post \c *this owns a new object. -*/ - -/*! - \fn pimpl_ptr::pimpl_ptr( T * t ) - - Constructor. Constructs a pimpl_ptr that contains (owns) \a t. - - \post get() == obj -*/ - -/*! - \fn pimpl_ptr::~pimpl_ptr() - - Destructor. - - \post The object previously owned by \c *this has been deleted. -*/ - -/*! - \fn const T * pimpl_ptr::get() const - - \returns a const pointer to the contained (owned) object. - \overload -*/ - -/*! - \fn T * pimpl_ptr::get() - - \returns a pointer to the contained (owned) object. -*/ - -/*! - \fn const T & pimpl_ptr::operator*() const - - Dereference operator. Returns \link get() *get()\endlink. - \overload -*/ - -/*! - \fn T & pimpl_ptr::operator*() - - Dereference operator. Returns \link get() *get()\endlink. -*/ - -/*! - \fn const T * pimpl_ptr::operator->() const - - Member-by-pointer operator. Returns get(). - \overload -*/ - -/*! - \fn T * pimpl_ptr::operator->() - - Member-by-pointer operator. Returns get(). -*/ - -#ifdef KDTOOLSCORE_UNITTESTS - -#include - -#include -#include - -namespace -{ - struct ConstTester - { - bool isConst() - { - return false; - } - - bool isConst() const - { - return true; - } - }; -} - -KDAB_UNITTEST_SIMPLE( pimpl_ptr, "kdcoretools" ) { - - { - kdtools::pimpl_ptr< QObject > p; - assertNotNull( p.get() ); - assertNull( p->parent() ); - } - - - { - QPointer< QObject > o; - { - kdtools::pimpl_ptr< QObject > qobject( new QObject ); - o = qobject.get(); - assertEqual( o, qobject.operator->() ); - assertEqual( o, &(qobject.operator*()) ); - } - assertNull( o ); - } - - { - const kdtools::pimpl_ptr< QObject > qobject( new QObject ); - const QObject* o = qobject.get(); - assertEqual( o, qobject.operator->() ); - assertEqual( o, &(qobject.operator*()) ); - } - - { - kdtools::pimpl_ptr< QObject > o1; - assertTrue( o1 ); - kdtools::pimpl_ptr< QObject > o2( 0 ); - assertFalse( o2 ); - } - - { - const kdtools::pimpl_ptr< ConstTester > o1; - kdtools::pimpl_ptr< ConstTester > o2; - assertTrue( o1->isConst() ); - assertFalse( o2->isConst() ); - assertTrue( (*o1).isConst() ); - assertFalse( (*o2).isConst() ); - assertTrue( o1.get()->isConst() ); - assertFalse( o2.get()->isConst() ); - } -} - -#endif // KDTOOLSCORE_UNITTESTS diff --git a/3rdparty/kdsingleapplicationguard/pimpl_ptr.h b/3rdparty/kdsingleapplicationguard/pimpl_ptr.h deleted file mode 100644 index b8b4786ba..000000000 --- a/3rdparty/kdsingleapplicationguard/pimpl_ptr.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB. - * SPDX-License-Identifier: LGPL-2.0-only - * - * The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB. - */ -#ifndef KDTOOLSCORE_PIMPL_PTR_H -#define KDTOOLSCORE_PIMPL_PTR_H - -#include "kdtoolsglobal.h" - -#ifndef DOXYGEN_RUN -namespace kdtools { -#endif - - template - class pimpl_ptr { - KDAB_DISABLE_COPY( pimpl_ptr ); - T * d; - public: - pimpl_ptr() : d( new T ) {} - explicit pimpl_ptr( T * t ) : d( t ) {} - ~pimpl_ptr() { delete d; d = nullptr; } - - T * get() { return d; } - const T * get() const { return d; } - - T * operator->() { return get(); } - const T * operator->() const { return get(); } - - T & operator*() { return *get(); } - const T & operator*() const { return *get(); } - - KDAB_IMPLEMENT_SAFE_BOOL_OPERATOR( get() ) - }; - - // these are not implemented, so's we can catch their use at - // link-time. Leaving them undeclared would open up a comparison - // via operator unspecified-bool-type(). - template - void operator==( const pimpl_ptr &, const pimpl_ptr & ); - template - void operator!=( const pimpl_ptr &, const pimpl_ptr & ); - -#ifndef DOXYGEN_RUN -} // namespace kdtools -#endif - -#endif /* KDTOOLSCORE_PIMPL_PTR_H */ - diff --git a/3rdparty/waitingspinnerwidget.cpp b/3rdparty/waitingspinnerwidget.cpp deleted file mode 100644 index 98931a6ad..000000000 --- a/3rdparty/waitingspinnerwidget.cpp +++ /dev/null @@ -1,284 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2012-2014 Alexander Turkin - * SPDX-FileCopyrightText: 2014 William Hallatt - * SPDX-FileCopyrightText: 2015 Jacob Dawid - * SPDX-License-Identifier: MIT - */ - -/* Original Work Copyright (c) 2012-2014 Alexander Turkin - Modified 2014 by William Hallatt - Modified 2015 by Jacob Dawid - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - -// Own includes -#include "waitingspinnerwidget.h" - -// Standard includes -#include -#include - -// Qt includes -#include -#include - -WaitingSpinnerWidget::WaitingSpinnerWidget(QWidget *parent, - bool centerOnParent, - bool disableParentWhenSpinning) - : QWidget(parent), - _centerOnParent(centerOnParent), - _disableParentWhenSpinning(disableParentWhenSpinning) { - initialize(); -} - -WaitingSpinnerWidget::WaitingSpinnerWidget(Qt::WindowModality modality, - QWidget *parent, - bool centerOnParent, - bool disableParentWhenSpinning) - : QWidget(parent, Qt::Dialog | Qt::FramelessWindowHint), - _centerOnParent(centerOnParent), - _disableParentWhenSpinning(disableParentWhenSpinning){ - initialize(); - - // We need to set the window modality AFTER we've hidden the - // widget for the first time since changing this property while - // the widget is visible has no effect. - setWindowModality(modality); - setAttribute(Qt::WA_TranslucentBackground); -} - -void WaitingSpinnerWidget::initialize() { - _color = Qt::black; - _roundness = 100.0; - _minimumTrailOpacity = 3.14159265358979323846; - _trailFadePercentage = 80.0; - _revolutionsPerSecond = 1.57079632679489661923; - _numberOfLines = 20; - _lineLength = 10; - _lineWidth = 2; - _innerRadius = 10; - _currentCounter = 0; - _isSpinning = false; - - _timer = new QTimer(this); - connect(_timer, SIGNAL(timeout()), this, SLOT(rotate())); - updateSize(); - updateTimer(); - hide(); -} - -void WaitingSpinnerWidget::paintEvent(QPaintEvent *) { - updatePosition(); - QPainter painter(this); - painter.fillRect(this->rect(), Qt::transparent); - painter.setRenderHint(QPainter::Antialiasing, true); - - if (_currentCounter >= _numberOfLines) { - _currentCounter = 0; - } - - painter.setPen(Qt::NoPen); - for (int i = 0; i < _numberOfLines; ++i) { - painter.save(); - painter.translate(_innerRadius + _lineLength, - _innerRadius + _lineLength); - qreal rotateAngle = - static_cast(360 * i) / static_cast(_numberOfLines); - painter.rotate(rotateAngle); - painter.translate(_innerRadius, 0); - int distance = - lineCountDistanceFromPrimary(i, _currentCounter, _numberOfLines); - QColor color = - currentLineColor(distance, _numberOfLines, _trailFadePercentage, - _minimumTrailOpacity, _color); - painter.setBrush(color); - // TODO improve the way rounded rect is painted - painter.drawRoundedRect( - QRect(0, -_lineWidth / 2, _lineLength, _lineWidth), _roundness, - _roundness, Qt::RelativeSize); - painter.restore(); - } -} - -void WaitingSpinnerWidget::start() { - updatePosition(); - _isSpinning = true; - show(); - - if(parentWidget() && _disableParentWhenSpinning) { - parentWidget()->setEnabled(false); - } - - if (!_timer->isActive()) { - _timer->start(); - _currentCounter = 0; - } -} - -void WaitingSpinnerWidget::stop() { - _isSpinning = false; - hide(); - - if(parentWidget() && _disableParentWhenSpinning) { - parentWidget()->setEnabled(true); - } - - if (_timer->isActive()) { - _timer->stop(); - _currentCounter = 0; - } -} - -void WaitingSpinnerWidget::setNumberOfLines(int lines) { - _numberOfLines = lines; - _currentCounter = 0; - updateTimer(); -} - -void WaitingSpinnerWidget::setLineLength(int length) { - _lineLength = length; - updateSize(); -} - -void WaitingSpinnerWidget::setLineWidth(int width) { - _lineWidth = width; - updateSize(); -} - -void WaitingSpinnerWidget::setInnerRadius(int radius) { - _innerRadius = radius; - updateSize(); -} - -QColor WaitingSpinnerWidget::color() { - return _color; -} - -qreal WaitingSpinnerWidget::roundness() { - return _roundness; -} - -qreal WaitingSpinnerWidget::minimumTrailOpacity() { - return _minimumTrailOpacity; -} - -qreal WaitingSpinnerWidget::trailFadePercentage() { - return _trailFadePercentage; -} - -qreal WaitingSpinnerWidget::revolutionsPersSecond() { - return _revolutionsPerSecond; -} - -int WaitingSpinnerWidget::numberOfLines() { - return _numberOfLines; -} - -int WaitingSpinnerWidget::lineLength() { - return _lineLength; -} - -int WaitingSpinnerWidget::lineWidth() { - return _lineWidth; -} - -int WaitingSpinnerWidget::innerRadius() { - return _innerRadius; -} - -bool WaitingSpinnerWidget::isSpinning() const { - return _isSpinning; -} - -void WaitingSpinnerWidget::setRoundness(qreal roundness) { - _roundness = std::max(0.0, std::min(100.0, roundness)); -} - -void WaitingSpinnerWidget::setColor(QColor color) { - _color = color; -} - -void WaitingSpinnerWidget::setRevolutionsPerSecond(qreal revolutionsPerSecond) { - _revolutionsPerSecond = revolutionsPerSecond; - updateTimer(); -} - -void WaitingSpinnerWidget::setTrailFadePercentage(qreal trail) { - _trailFadePercentage = trail; -} - -void WaitingSpinnerWidget::setMinimumTrailOpacity(qreal minimumTrailOpacity) { - _minimumTrailOpacity = minimumTrailOpacity; -} - -void WaitingSpinnerWidget::rotate() { - ++_currentCounter; - if (_currentCounter >= _numberOfLines) { - _currentCounter = 0; - } - update(); -} - -void WaitingSpinnerWidget::updateSize() { - int size = (_innerRadius + _lineLength) * 2; - setFixedSize(size, size); -} - -void WaitingSpinnerWidget::updateTimer() { - _timer->setInterval(1000 / (_numberOfLines * _revolutionsPerSecond)); -} - -void WaitingSpinnerWidget::updatePosition() { - if (parentWidget() && _centerOnParent) { - move(parentWidget()->width() / 2 - width() / 2, - parentWidget()->height() / 2 - height() / 2); - } -} - -int WaitingSpinnerWidget::lineCountDistanceFromPrimary(int current, int primary, - int totalNrOfLines) { - int distance = primary - current; - if (distance < 0) { - distance += totalNrOfLines; - } - return distance; -} - -QColor WaitingSpinnerWidget::currentLineColor(int countDistance, int totalNrOfLines, - qreal trailFadePerc, qreal minOpacity, - QColor color) { - if (countDistance == 0) { - return color; - } - const qreal minAlphaF = minOpacity / 100.0; - int distanceThreshold = - static_cast(ceil((totalNrOfLines - 1) * trailFadePerc / 100.0)); - if (countDistance > distanceThreshold) { - color.setAlphaF(minAlphaF); - } else { - qreal alphaDiff = color.alphaF() - minAlphaF; - qreal gradient = alphaDiff / static_cast(distanceThreshold + 1); - qreal resultAlpha = color.alphaF() - gradient * countDistance; - - // If alpha is out of bounds, clip it. - resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); - color.setAlphaF(resultAlpha); - } - return color; -} diff --git a/3rdparty/waitingspinnerwidget.h b/3rdparty/waitingspinnerwidget.h deleted file mode 100644 index d171e9beb..000000000 --- a/3rdparty/waitingspinnerwidget.h +++ /dev/null @@ -1,122 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2012-2014 Alexander Turkin - * SPDX-FileCopyrightText: 2014 William Hallatt - * SPDX-FileCopyrightText: 2015 Jacob Dawid - * SPDX-License-Identifier: MIT - */ - -/* Original Work Copyright (c) 2012-2014 Alexander Turkin - Modified 2014 by William Hallatt - Modified 2015 by Jacob Dawid - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - -#pragma once - -// Qt includes -#include -#include -#include - -class WaitingSpinnerWidget : public QWidget { - Q_OBJECT -public: - /*! Constructor for "standard" widget behaviour - use this - * constructor if you wish to, e.g. embed your widget in another. */ - WaitingSpinnerWidget(QWidget *parent = nullptr, - bool centerOnParent = true, - bool disableParentWhenSpinning = true); - - /*! Constructor - use this constructor to automatically create a modal - * ("blocking") spinner on top of the calling widget/window. If a valid - * parent widget is provided, "centreOnParent" will ensure that - * QtWaitingSpinner automatically centres itself on it, if not, - * "centreOnParent" is ignored. */ - WaitingSpinnerWidget(Qt::WindowModality modality, - QWidget *parent = nullptr, - bool centerOnParent = true, - bool disableParentWhenSpinning = true); - -public slots: - void start(); - void stop(); - -public: - void setColor(QColor color); - void setRoundness(qreal roundness); - void setMinimumTrailOpacity(qreal minimumTrailOpacity); - void setTrailFadePercentage(qreal trail); - void setRevolutionsPerSecond(qreal revolutionsPerSecond); - void setNumberOfLines(int lines); - void setLineLength(int length); - void setLineWidth(int width); - void setInnerRadius(int radius); - void setText(QString text); - - QColor color(); - qreal roundness(); - qreal minimumTrailOpacity(); - qreal trailFadePercentage(); - qreal revolutionsPersSecond(); - int numberOfLines(); - int lineLength(); - int lineWidth(); - int innerRadius(); - - bool isSpinning() const; - -private slots: - void rotate(); - -protected: - void paintEvent(QPaintEvent *paintEvent) override; - -private: - static int lineCountDistanceFromPrimary(int current, int primary, - int totalNrOfLines); - static QColor currentLineColor(int distance, int totalNrOfLines, - qreal trailFadePerc, qreal minOpacity, - QColor color); - - void initialize(); - void updateSize(); - void updateTimer(); - void updatePosition(); - -private: - QColor _color; - qreal _roundness; // 0..100 - qreal _minimumTrailOpacity; - qreal _trailFadePercentage; - qreal _revolutionsPerSecond; - int _numberOfLines; - int _lineLength; - int _lineWidth; - int _innerRadius; - -private: - WaitingSpinnerWidget(const WaitingSpinnerWidget&); - WaitingSpinnerWidget& operator=(const WaitingSpinnerWidget&); - - QTimer *_timer; - bool _centerOnParent; - bool _disableParentWhenSpinning; - int _currentCounter; - bool _isSpinning; -}; diff --git a/AUTHORS b/AUTHORS index 1c4d7aa24..4a66ebe0b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -20,30 +20,58 @@ and moral support from (alphabetically by first name or nickname): - Allen Welkie - AlmAck - Andrius Štikonas + - Anke Boersma + - Anubhav Choudhary + - Arjen Balfoort - Arnaud Ferraris + - Artem Grinev - artoo@cromnix.org + - benne-dee - Bernhard Landauer - Bezzy1999 - Bill Auger + - Bob van der Linden - Caio Jordão Carvalho + - Camilo Higuita - Collabora LTD + - Corey Lang - crispg72 - Dan Simmons - demmm + - Emmanuel Arias + - Enrique Medina Gremaldos + - Erik Dubois - Dominic Hayes + - El-Wumbus + - Evan James - Frede H - Gabriel Craciunescu - Harald Sitter + - Huang Jia Wen + - Jerrod Frost + - Jia Chao + - Joe Kamprad + - Jonas Strassel - Kai Dohmen - Kevin Kofler - Kyle Robertze - Lisa Vitolo - - Neal Gompa + - Matti Hyttinen - n3rdopolis + - Neal Gompa + - Nico 'dr460nf1r3' + - Omer I.S. - Philip Müller - Ramon Buldó - Raul Rodrigo Segura - Rohan Garg + - Santosh Mahto - Scott Harvey - Simon Quigley + - Taejun Park + - Victor Fuentes + - vtriolet - Walter Lapchynski + - Waneon Kim + + > This list was updated to revision 6e8d820737dea0f3e08f12b10768facef19be684 on May 28th 2022. diff --git a/CHANGES-3.2 b/CHANGES-3.2 index 973945730..13b806b26 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -1,4 +1,3 @@ - @@ -8,13 +7,27 @@ 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.59 (unreleased) # +# 3.2.59 (2022-05-29) # This release contains contributions from (alphabetically by first name): - Arjen Balfoort +This is the final release of Calamares 3.2 where the release is from +the *calamares* branch -- that is, where the primary development +branch is also the branch being released regularly. Future releases +of the 3.2 series are bugfix-only, and no new feature development +or translations are expected. This is also the final release done +*as work-work* by the current maintainer. + ## Core ## - - No core changes yet + - Prep-work for moving the *About Calamares* button to the panels, + rather than keeping it in the Welcome module. The about information + is somewhat more flexible now, so that a new maintainer can be added + easily without frustrating translators. + - The progress panels (both Widgets and QML) now have an About button + on them, showing the traditional *About Calamares* dialog. + - Translations for the (QML) slideshow were not being loaded correctly. + The log is now somewhat more informative when that fails. ## Modules ## - *fstab* can now be configured to put `/tmp` on a *tmpfs*, and this can @@ -24,6 +37,10 @@ This release contains contributions from (alphabetically by first name): (Thanks Arjen) - *partition* will cycle out a LUKS key if all the key slots are in use and a new key is added, rather than crashing the installer. (Thanks Arjen) + - *welcome* and *welcomeq* have no *About* button anymore; this is now + available from the progress panel, since it's also not-really about the + distro itself. + # 3.2.58.2 (2022-05-24) diff --git a/CHANGES-3.3 b/CHANGES-3.3 new file mode 100644 index 000000000..9debfc8d8 --- /dev/null +++ b/CHANGES-3.3 @@ -0,0 +1,55 @@ + + +This is the changelog for Calamares. For each release, the major changes and +contributors are listed. Note that Calamares does not have a historical +changelog -- this log starts with version 3.3.0. See CHANGES-3.2 for +the history of the 3.2 series (2018-05 - 2021-12). + +# 3.3.0 (unreleased) # + +This release contains contributions from (alphabetically by first name): + - Anubhav Choudhary + - Evan James + - Vitor Lopes + +This is a "minor" version change, but the size of the changes is very +large. Configuration files from previous versions of Calamares will +**certainly** need to be re-validated. Take heed of the many changes +in the *Modules* heading, below. + +## Project ## + - The C++ code in the project is now formatted with clang-format 12 or 13, + with the coding-style as found in `.clang-format`; there are minor + differences from the tool, compared to the clang-format 9 usually applied + to Calamares 3.2. + - The CMake code in the project is now formatted with gersemi 0.7.5. + +## Core ## + - CMake 3.16, Qt 5.15 are now required; the newer CMake is to support + new features (also for KDE Frameworks), Qt is the current LTS version. + - KDE Framework "DBusAddons" is now required, and is used to "activate" + Calamares; the KDAB Single Application Guard is no longer used. + KDSAG needed patching to chase Qt 5.15 deprecations, and the DBus + activation code is tried and tested in Frameworks (tier 1). + Running `calamares -d` no longer enforces a single-application + (it is for debugging purposes, after all). + - Python 3.6 or later is now required, to allow for F-strings in + Python code and allow other tidy-ups in the Python modules. + Boost::Python now requires 1.67 or later (for CMake support). + - The log file now **always** contains a debug-log, and the `-D` flag + primarily controls what is printed to stdout. By default, stdout + only gets errors; use `-D6` to match stdout with the file. Use `-D8` + to get a verbose log file **and** verbose stdout. + +## Modules ## + - *bootloader* now supports more options when building the kernel + command-line. (Thanks Evan) + - *displaymanager* no longer supports the discontinued *kdm* display manager. + - *grubcfg* changed the key *keepDistributor* to *keep_distributor*. + Please update configurations. + - *partition* requires KPMCore 21.12 (e.g. KPMCore 4.2 API, or later). + - *partition* can now skip installing the bootloader in more scenarios. + #1632 (Thanks Anubhav) + diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dcfb7632..817e7e0c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,10 +25,13 @@ # CMake once. These affect the ABI offered by Calamares. # - PYTHON (enable Python Job modules) # - QML (enable QML UI View modules) -# - PYTHONQT # TODO:3.3: remove +# The WITH_* options affect the ABI of Calamares: you must +# build (C++) modules for Calamares with the same WITH_* +# settings, or they may not load at all. # BUILD_ : choose additional things to build # - TESTING (standard CMake option) # - SCHEMA_TESTING (requires Python, see ci/configvalidator.py) +# - KF5Crash (uses KCrash, rather than Calamares internal, for crash reporting) # DEBUG_ : special developer flags for debugging # # Example usage: @@ -38,35 +41,39 @@ # One special target is "show-version", which can be built # to obtain the version number from here. -# TODO:3.3: Require CMake 3.12 -cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) -project( CALAMARES - VERSION 3.2.59 - LANGUAGES C CXX -) +cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development -if( CALAMARES_VERSION_RC EQUAL 1 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) - message( FATAL_ERROR "Do not build development versions in the source-directory." ) +set(CALAMARES_VERSION 3.3.0) +set(CALAMARES_RELEASE_MODE OFF) # Set to ON during a release + +if(CMAKE_SCRIPT_MODE_FILE) + include(${CMAKE_CURRENT_LIST_DIR}/CMakeModules/ExtendedVersion.cmake) + set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}) + extend_version( ${CALAMARES_VERSION} OFF _vshort _vlong ) + message("${_vlong}") + return() +endif() + +project(CALAMARES VERSION ${CALAMARES_VERSION} LANGUAGES C CXX HOMEPAGE_URL "https://calamares.io/") + +if(NOT CALAMARES_RELEASE_MODE AND CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) + message(FATAL_ERROR "Do not build development versions in the source-directory.") endif() ### OPTIONS # -option( INSTALL_CONFIG "Install configuration files" OFF ) -option( INSTALL_POLKIT "Install Polkit configuration" ON ) -option( INSTALL_COMPLETION "Install shell completions" OFF ) -# Options for the calamares executable -option( WITH_KF5Crash "Enable crash reporting with KCrash." ON ) # TODO:3.3: WITH->BUILD (this isn't an ABI thing) -option( WITH_KF5DBus "Use DBus service for unique-application." OFF ) # TODO:3.3: WITH->BUILD +option(INSTALL_CONFIG "Install configuration files" OFF) +option(INSTALL_POLKIT "Install Polkit configuration" ON) +option(INSTALL_COMPLETION "Install shell completions" OFF) # When adding WITH_* that affects the ABI offered by libcalamares, # also update libcalamares/CalamaresConfig.h.in -option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) -option( WITH_PYTHONQT "Enable Python view modules API (deprecated, requires PythonQt)." OFF ) # TODO:3.3: remove -option( WITH_QML "Enable QML UI options." ON ) +option(WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON) +option(WITH_QML "Enable QML UI options." ON) # -# Additional parts to build -option( BUILD_SCHEMA_TESTING "Enable schema-validation-tests" ON ) - +# Additional parts to build that do not affect ABI +option(BUILD_SCHEMA_TESTING "Enable schema-validation-tests" ON) +# Options for the calamares executable +option(BUILD_KF5Crash "Enable crash reporting with KCrash." ON) # Possible debugging flags are: # - DEBUG_TIMEZONES draws latitude and longitude lines on the timezone @@ -77,7 +84,6 @@ option( BUILD_SCHEMA_TESTING "Enable schema-validation-tests" ON ) # - DEBUG_PARTITION_UNSAFE (see partition/CMakeLists.txt) # - DEBUG_PARTITION_BAIL_OUT (see partition/CMakeLists.txt) - ### USE_* # # By convention, when there are multiple modules that implement similar @@ -101,15 +107,14 @@ option( BUILD_SCHEMA_TESTING "Enable schema-validation-tests" ON ) # - *services* picks one of the two service-configuration modules, # for either systemd or openrc. This defaults to empty so that # **both** modules are available. -set( USE_services "" CACHE STRING "Select the services module to use" ) +set(USE_services "" CACHE STRING "Select the services module to use") ### Calamares application info # -set( CALAMARES_ORGANIZATION_NAME "Calamares" ) -set( CALAMARES_ORGANIZATION_DOMAIN "github.com/calamares" ) -set( CALAMARES_APPLICATION_NAME "Calamares" ) -set( CALAMARES_DESCRIPTION_SUMMARY - "The distribution-independent installer framework" ) +set(CALAMARES_ORGANIZATION_NAME "Calamares") +set(CALAMARES_ORGANIZATION_DOMAIN "github.com/calamares") +set(CALAMARES_APPLICATION_NAME "Calamares") +set(CALAMARES_DESCRIPTION_SUMMARY "The distribution-independent installer framework") ### Transifex (languages) info # @@ -135,40 +140,42 @@ set( CALAMARES_DESCRIPTION_SUMMARY # `txstats.py -e`. See also # # Total 74 languages -set( _tx_complete az az_AZ ca es fi_FI he hi hr ja lt pt_BR pt_PT - sq sv uk zh_TW ) -set( _tx_good as be ca@valencia cs_CZ da de fa fr fur it_IT ko ml - nl ru si sk tg tr_TR vi zh_CN ) +set( _tx_complete az az_AZ ca es fi_FI he hi hr ja ko lt pt_BR + pt_PT sq sv tr_TR uk zh_TW ) +set( _tx_good as be ca@valencia cs_CZ da de fa fr fur it_IT ml nl + ru si sk tg vi zh_CN ) set( _tx_ok ar ast bg bn el en_GB es_MX et eu gl hu id is mr nb oc pl ro sl sr sr@latin th ) set( _tx_incomplete eo es_PR gu ie ja-Hira kk kn lo lv mk ne_NP ta_IN te ur zh zh_HK ) +# Total 74 languages ### Required versions # # See DEPENDENCIES section below. -set( QT_VERSION 5.9.0 ) -set( YAMLCPP_VERSION 0.5.1 ) -set( ECM_VERSION 5.18 ) -set( PYTHONLIBS_VERSION 3.3 ) -set( BOOSTPYTHON_VERSION 1.55.0 ) - +set(QT_VERSION 5.15.0) +set(YAMLCPP_VERSION 0.5.1) +set(ECM_VERSION 5.18) +set(PYTHONLIBS_VERSION 3.6) +set(BOOSTPYTHON_VERSION 1.72.0) ### CMAKE SETUP # -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" ) +set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules") # Enable IN_LIST -if( POLICY CMP0057 ) - cmake_policy( SET CMP0057 NEW ) +if(POLICY CMP0057) + cmake_policy(SET CMP0057 NEW) endif() # Let ``AUTOMOC`` and ``AUTOUIC`` process ``GENERATED`` files. -if( POLICY CMP0071 ) - cmake_policy( SET CMP0071 NEW ) +if(POLICY CMP0071) + cmake_policy(SET CMP0071 NEW) endif() # Recognize more macros to trigger automoc if(NOT CMAKE_VERSION VERSION_LESS "3.10.0") - list(APPEND CMAKE_AUTOMOC_MACRO_NAMES + list( + APPEND + CMAKE_AUTOMOC_MACRO_NAMES "K_PLUGIN_FACTORY_WITH_JSON" "K_EXPORT_PLASMA_DATAENGINE_WITH_JSON" "K_EXPORT_PLASMA_RUNNER" @@ -176,40 +183,50 @@ if(NOT CMAKE_VERSION VERSION_LESS "3.10.0") endif() # CMake Modules -include( CMakePackageConfigHelpers ) -include( CTest ) -include( FeatureSummary ) +include(CMakePackageConfigHelpers) +include(CTest) +include(FeatureSummary) # Calamares Modules -include( CMakeColors ) +include(CMakeColors) ### C++ SETUP # -set( CMAKE_CXX_STANDARD 17 ) -set( CMAKE_CXX_STANDARD_REQUIRED ON ) -set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror=return-type" ) -set( CMAKE_CXX_FLAGS_DEBUG "-Og -g ${CMAKE_CXX_FLAGS_DEBUG}" ) -set( CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG" ) -set( CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" ) -set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" ) +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror=return-type") +set(CMAKE_CXX_FLAGS_DEBUG "-Og -g ${CMAKE_CXX_FLAGS_DEBUG}") +set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG") +set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") +set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") -set( CMAKE_C_STANDARD 99 ) -set( CMAKE_C_STANDARD_REQUIRED ON ) -set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" ) -set( CMAKE_C_FLAGS_DEBUG "-Og -g" ) -set( CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG" ) -set( CMAKE_C_FLAGS_RELEASE "-O4 -DNDEBUG" ) -set( CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g" ) +set(CMAKE_C_STANDARD 99) +set(CMAKE_C_STANDARD_REQUIRED ON) +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") +set(CMAKE_C_FLAGS_DEBUG "-Og -g") +set(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG") +set(CMAKE_C_FLAGS_RELEASE "-O4 -DNDEBUG") +set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") -set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -Wl,--fatal-warnings" ) +set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -Wl,--fatal-warnings") -if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) - message( STATUS "Found Clang ${CMAKE_CXX_COMPILER_VERSION}, setting up Clang-specific compiler flags." ) +# If no build type is set, pick a reasonable one +if(NOT CMAKE_BUILD_TYPE) + if(CALAMARES_RELEASE_MODE) + set(CMAKE_BUILD_TYPE "RelWithDebInfo") + else() + set(CMAKE_BUILD_TYPE "Debug") + endif() +endif() + +if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + message(STATUS "Found Clang ${CMAKE_CXX_COMPILER_VERSION}, setting up Clang-specific compiler flags.") # Clang warnings: doing *everything* is counter-productive, since it warns # about things which we can't fix (e.g. C++98 incompatibilities, but # Calamares is C++17). - foreach( CLANG_WARNINGS + foreach( + CLANG_WARNINGS -Weverything -Wno-c++98-compat -Wno-c++98-compat-pedantic @@ -221,68 +238,69 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) -Wno-documentation-unknown-command -Wno-unknown-warning-option ) - string( APPEND CMAKE_CXX_FLAGS " ${CLANG_WARNINGS}" ) + string(APPEND CMAKE_CXX_FLAGS " ${CLANG_WARNINGS}") endforeach() # The dwarf-debugging flags are slightly different, too - string( APPEND CMAKE_CXX_FLAGS_DEBUG " -gdwarf" ) - string( APPEND CMAKE_C_FLAGS_DEBUG " -gdwarf" ) + string(APPEND CMAKE_CXX_FLAGS_DEBUG " -gdwarf") + string(APPEND CMAKE_C_FLAGS_DEBUG " -gdwarf") # Third-party code where we don't care so much about compiler warnings # (because it's uncomfortable to patch) get different flags; use # mark_thirdparty_code( [...] ) # to switch off warnings for those sources. - set( SUPPRESS_3RDPARTY_WARNINGS "-Wno-everything" ) + set(SUPPRESS_3RDPARTY_WARNINGS "-Wno-everything") - set( CMAKE_TOOLCHAIN_PREFIX "llvm-" ) + set(CMAKE_TOOLCHAIN_PREFIX "llvm-") # The path prefix is only relevant for CMake 3.16 and later, fixes #1286 - set( CMAKE_AUTOMOC_PATH_PREFIX OFF ) - set( CALAMARES_AUTOMOC_OPTIONS "-butils/moc-warnings.h" ) - set( CALAMARES_AUTOUIC_OPTIONS --include utils/moc-warnings.h ) + set(CMAKE_AUTOMOC_PATH_PREFIX OFF) + set(CALAMARES_AUTOMOC_OPTIONS "-butils/moc-warnings.h") + set(CALAMARES_AUTOUIC_OPTIONS --include utils/moc-warnings.h) else() - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual" ) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual") - set( SUPPRESS_3RDPARTY_WARNINGS "" ) + set(SUPPRESS_3RDPARTY_WARNINGS "") endif() # Use mark_thirdparty_code() to reduce warnings from the compiler # on code that we're not going to fix. Call this with a list of files. macro(mark_thirdparty_code) - set_source_files_properties( ${ARGV} - PROPERTIES - COMPILE_FLAGS "${SUPPRESS_3RDPARTY_WARNINGS}" - COMPILE_DEFINITIONS "THIRDPARTY" + set_source_files_properties( + ${ARGV} + PROPERTIES COMPILE_FLAGS "${SUPPRESS_3RDPARTY_WARNINGS}" COMPILE_DEFINITIONS "THIRDPARTY" ) endmacro() -if( CMAKE_COMPILER_IS_GNUCXX ) - if( CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9 OR - CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.9 ) - message( STATUS "Found GNU g++ ${CMAKE_CXX_COMPILER_VERSION}, enabling colorized error messages." ) - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=auto" ) +if(CMAKE_COMPILER_IS_GNUCXX) + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.9) + message(STATUS "Found GNU g++ ${CMAKE_CXX_COMPILER_VERSION}, enabling colorized error messages.") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=auto") endif() endif() +# API that was deprecated before Qt 5.15 causes a compile error +add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050f00) ### DEPENDENCIES # -find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Concurrent Core Gui LinguistTools Network Svg Widgets ) -if( WITH_QML ) - find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Quick QuickWidgets ) +find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Concurrent Core Gui LinguistTools Network Svg Widgets) +if(WITH_QML) + find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Quick QuickWidgets) endif() # Optional Qt parts -find_package( Qt5DBus CONFIG ) +find_package(Qt5DBus CONFIG) -find_package( YAMLCPP ${YAMLCPP_VERSION} REQUIRED ) -if( INSTALL_POLKIT ) - find_package( PolkitQt5-1 REQUIRED ) +find_package(YAMLCPP ${YAMLCPP_VERSION} REQUIRED) +if(INSTALL_POLKIT) + find_package(PolkitQt5-1 REQUIRED) else() # Find it anyway, for dependencies-reporting - find_package( PolkitQt5-1 ) + find_package(PolkitQt5-1) endif() set_package_properties( - PolkitQt5-1 PROPERTIES + PolkitQt5-1 + PROPERTIES DESCRIPTION "Qt5 support for Polkit" URL "https://cgit.kde.org/polkit-qt-1.git" PURPOSE "PolkitQt5-1 helps with installing Polkit configuration" @@ -293,115 +311,104 @@ set_package_properties( # find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE), # no need to mess with the module path after. find_package(ECM ${ECM_VERSION} NO_MODULE) -if( ECM_FOUND ) +if(ECM_FOUND) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) - if ( BUILD_TESTING ) + if(BUILD_TESTING) # ECM implies that we can build the tests, too - find_package( Qt5 COMPONENTS Test REQUIRED ) - include( ECMAddTests ) + find_package(Qt5 COMPONENTS Test REQUIRED) + include(ECMAddTests) endif() include(KDEInstallDirs) endif() -find_package( KF5 QUIET COMPONENTS CoreAddons Crash DBusAddons ) +find_package(KF5 QUIET COMPONENTS CoreAddons Crash DBusAddons) set_package_properties( - KF5::CoreAddons PROPERTIES + KF5::CoreAddons + PROPERTIES TYPE REQUIRED DESCRIPTION "Classes built on QtCore for About Data" URL "https://api.kde.org/frameworks/kcoreaddons/" PURPOSE "About Calamares" ) -if( NOT KF5Crash_FOUND ) - if( WITH_KF5Crash ) - message(WARNING "WITH_KF5Crash is set, but KF5::Crash is not available.") +set_package_properties( + KF5::DBusAddons + PROPERTIES + TYPE REQUIRED + DESCRIPTION "Classes for DBus activation" + URL "https://api.kde.org/frameworks/dbusaddons/" + PURPOSE "Unique instance of Calamares" +) +if(NOT KF5Crash_FOUND) + if(BUILD_KF5Crash) + message(WARNING "BUILD_KF5Crash is set, but KF5::Crash is not available.") endif() - set( WITH_KF5Crash OFF ) -endif() -if( NOT KF5DBusAddons_FOUND ) - if( WITH_KF5DBus ) - message(WARNING "WITH_KF5DBus is set, but KF5::DBusAddons is not available.") - endif() - set( WITH_KF5DBus OFF ) + set(BUILD_KF5Crash OFF) endif() -# TODO:3.3: Use FindPython3 instead -find_package( PythonInterp ${PYTHONLIBS_VERSION} ) +find_package(Python ${PYTHONLIBS_VERSION} COMPONENTS Interpreter Development) set_package_properties( - PythonInterp PROPERTIES - DESCRIPTION "Python 3 interpreter." + Python + PROPERTIES + DESCRIPTION "Python3 interpreter." URL "https://python.org" - PURPOSE "Python 3 interpreter for certain tests." + PURPOSE "Python3 interpreter for certain tests." ) -set( _schema_explanation "" ) -if ( PYTHONINTERP_FOUND ) - if ( BUILD_SCHEMA_TESTING ) +set(_schema_explanation "") +if(Python_Interpreter_FOUND) + if(BUILD_SCHEMA_TESTING) # The configuration validator script has some dependencies, # and if they are not installed, don't run. If errors out # with exit(1) on missing dependencies. - if ( CALAMARES_CONFIGVALIDATOR_CHECKED ) - set( _validator_deps ${CALAMARES_CONFIGVALIDATOR_RESULT} ) + if(CALAMARES_CONFIGVALIDATOR_CHECKED) + set(_validator_deps ${CALAMARES_CONFIGVALIDATOR_RESULT}) else() - exec_program( ${PYTHON_EXECUTABLE} ARGS "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" -x RETURN_VALUE _validator_deps ) - set( CALAMARES_CONFIGVALIDATOR_CHECKED TRUE CACHE INTERNAL "Dependencies for configvalidator checked" ) - set( CALAMARES_CONFIGVALIDATOR_RESULT ${_validator_deps} CACHE INTERNAL "Result of configvalidator dependency check" ) + exec_program( + ${Python_EXECUTABLE} + ARGS + "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" + -x + RETURN_VALUE + _validator_deps + ) + set(CALAMARES_CONFIGVALIDATOR_CHECKED TRUE CACHE INTERNAL "Dependencies for configvalidator checked") + set(CALAMARES_CONFIGVALIDATOR_RESULT ${_validator_deps} + CACHE INTERNAL "Result of configvalidator dependency check" + ) endif() # It should never succeed, but only returns 1 when the imports fail - if ( _validator_deps EQUAL 1 ) - set( _schema_explanation " Missing dependencies for configvalidator.py." ) - set( BUILD_SCHEMA_TESTING OFF ) + if(_validator_deps EQUAL 1) + set(_schema_explanation " Missing dependencies for configvalidator.py.") + set(BUILD_SCHEMA_TESTING OFF) endif() endif() else() # Can't run schema tests without Python3. - set( _schema_explanation " Missing Python3." ) - set( BUILD_SCHEMA_TESTING OFF ) + set(_schema_explanation " Missing Python3.") + set(BUILD_SCHEMA_TESTING OFF) endif() -add_feature_info( yaml-schema BUILD_SCHEMA_TESTING "Validate YAML (config files) with schema.${_schema_explanation}" ) +add_feature_info(yaml-schema BUILD_SCHEMA_TESTING "Validate YAML (config files) with schema.${_schema_explanation}") -find_package( PythonLibs ${PYTHONLIBS_VERSION} ) -set_package_properties( - PythonLibs PROPERTIES - DESCRIPTION "C interface libraries for the Python 3 interpreter." - URL "https://python.org" - PURPOSE "Python 3 is used for Python job modules." -) - -if ( PYTHONLIBS_FOUND ) - # TODO:3.3: Require Boost + CMake; sort out Boost::Python - # Since Boost provides CMake config files (starting with Boost 1.70. - # or so) the mess that is the Calamares find code picks the wrong - # bits. Suppress those CMake config files, as suggested by @jmrcpn - set(Boost_NO_BOOST_CMAKE ON) - include( BoostPython3 ) - find_boost_python3( ${BOOSTPYTHON_VERSION} ${PYTHONLIBS_VERSION_STRING} CALAMARES_BOOST_PYTHON3_FOUND ) - set_package_properties( - Boost PROPERTIES - PURPOSE "Boost.Python is used for Python job modules." - ) - # TODO:3.3: Remove PythonQt support - find_package( PythonQt ) - set_package_properties( PythonQt PROPERTIES - DESCRIPTION "A Python embedding solution for Qt applications." - URL "http://pythonqt.sourceforge.net" - PURPOSE "PythonQt is used for Python view modules." - ) +if(Python_Development_FOUND) + find_package(boost_python) + if(NOT TARGET Boost::python) + find_package(Boost ${BOOSTPYTHON_VERSION} COMPONENTS python) + set_package_properties(Boost PROPERTIES PURPOSE "Boost.Python is used for Python job modules.") + else() + message(STATUS "Found boost_python with target Boost::python") + set(Boost_FOUND ON) + endif() endif() -if( NOT PYTHONLIBS_FOUND OR NOT CALAMARES_BOOST_PYTHON3_FOUND ) +if(NOT Python_Development_FOUND OR NOT Boost_FOUND) message(STATUS "Disabling Boost::Python modules") - set( WITH_PYTHON OFF ) -endif() -if( NOT PYTHONLIBS_FOUND OR NOT PYTHONQT_FOUND ) - message(STATUS "Disabling PythonQt modules") - set( WITH_PYTHONQT OFF ) + set(WITH_PYTHON OFF) endif() # Now we know the state of the ABI-options, copy them into "Calamares_" # prefixed variables, to match how the variables would-be-named # when building out-of-tree. set(Calamares_WITH_PYTHON ${WITH_PYTHON}) -set(Calamares_WITH_PYTHONQT ${WITH_PYTHONQT}) set(Calamares_WITH_QML ${WITH_QML}) ### Transifex Translation status @@ -411,39 +418,39 @@ set(Calamares_WITH_QML ${WITH_QML}) # for some obvious error. The actual work of compiling translations # is done in the lang/ directory. # -if( Qt5_VERSION VERSION_GREATER 5.12.1 ) +if(Qt5_VERSION VERSION_GREATER 5.12.1) # At least Qt 5.12.2 seems to support Esperanto in QLocale - if( "eo" IN_LIST _tx_incomplete ) + if("eo" IN_LIST _tx_incomplete) message(STATUS "Esperanto support since Qt 5.12.2, enabling Esperanto locale") - list( REMOVE_ITEM _tx_incomplete "eo" ) - list( APPEND _tx_ok "eo" ) + list(REMOVE_ITEM _tx_incomplete "eo") + list(APPEND _tx_ok "eo") endif() endif() -set( curr_tx ${_tx_complete} ${_tx_good} ${_tx_ok} ${_tx_incomplete} ) -set( tx_errors OFF ) -if ( curr_tx ) +set(curr_tx ${_tx_complete} ${_tx_good} ${_tx_ok} ${_tx_incomplete}) +set(tx_errors OFF) +if(curr_tx) # New in list - foreach( l ${curr_tx} ) - set( p_l "lang/calamares_${l}.ts" ) - if( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${p_l} ) + foreach(l ${curr_tx}) + set(p_l "lang/calamares_${l}.ts") + if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${p_l}) message(WARNING "Language ${l} has no .ts file yet.") - set( tx_errors ON ) + set(tx_errors ON) endif() endforeach() - unset( p_l ) - unset( l ) + unset(p_l) + unset(l) endif() -unset( curr_tx ) -if( tx_errors ) - message( FATAL_ERROR "Translation warnings, see above." ) +unset(curr_tx) +if(tx_errors) + message(FATAL_ERROR "Translation warnings, see above.") endif() -set( CALAMARES_TRANSLATION_LANGUAGES en ${_tx_complete} ${_tx_good} ${_tx_ok} ) -list( SORT CALAMARES_TRANSLATION_LANGUAGES ) +set(CALAMARES_TRANSLATION_LANGUAGES en ${_tx_complete} ${_tx_good} ${_tx_ok}) +list(SORT CALAMARES_TRANSLATION_LANGUAGES) -add_subdirectory( lang ) # i18n tools +add_subdirectory(lang) # i18n tools ### Example Distro # @@ -462,22 +469,22 @@ add_subdirectory( lang ) # i18n tools # # make example-distro # -find_program( mksquashfs_PROGRAM mksquashfs ) -if( mksquashfs_PROGRAM ) - set( mksquashfs_FOUND ON ) - set( src_fs ${CMAKE_SOURCE_DIR}/data/example-root/ ) - set( dst_fs ${CMAKE_BINARY_DIR}/example.sqfs ) - if( EXISTS ${src_fs} ) +find_program(mksquashfs_PROGRAM mksquashfs) +if(mksquashfs_PROGRAM) + set(mksquashfs_FOUND ON) + set(src_fs ${CMAKE_SOURCE_DIR}/data/example-root/) + set(dst_fs ${CMAKE_BINARY_DIR}/example.sqfs) + if(EXISTS ${src_fs}) # based on the build host. If /lib64 exists, assume it is needed. # Collect directories needed for a minimal binary distro, # Note that the last path component is added to the root, so # if you add /usr/sbin here, it will be put into /sbin_1. # Add such paths to /etc/profile under ${src_fs}. - set( candidate_fs /sbin /bin /lib /lib64 ) - set( host_fs "" ) - foreach( c_fs ${candidate_fs} ) - if( EXISTS ${c_fs} ) - list( APPEND host_fs ${c_fs} ) + set(candidate_fs /sbin /bin /lib /lib64) + set(host_fs "") + foreach(c_fs ${candidate_fs}) + if(EXISTS ${c_fs}) + list(APPEND host_fs ${c_fs}) endif() endforeach() add_custom_command( @@ -488,105 +495,89 @@ if( mksquashfs_PROGRAM ) add_custom_target(example-distro DEPENDS ${dst_fs}) endif() else() - set( mksquashfs_FOUND OFF ) + set(mksquashfs_FOUND OFF) endif() # Doesn't list mksquashfs as an optional dep, though, because it # hasn't been sent through the find_package() scheme. # # "http://tldp.org/HOWTO/SquashFS-HOWTO/creatingandusing.html" -add_feature_info( ExampleDistro ${mksquashfs_FOUND} "Create example-distro target.") - +add_feature_info(ExampleDistro ${mksquashfs_FOUND} "Create example-distro target.") ### CALAMARES PROPER # -set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} ) +set(CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH}) # In rare cases we have hotfix-releases with a tweak -if( CALAMARES_VERSION_TWEAK ) - set( CALAMARES_VERSION "${CALAMARES_VERSION}.${CALAMARES_VERSION_TWEAK}" ) +if(CALAMARES_VERSION_TWEAK) + set(CALAMARES_VERSION "${CALAMARES_VERSION}.${CALAMARES_VERSION_TWEAK}") endif() -set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" ) +set(CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}") # Additional info for non-release builds. The "extended" version information # with date and git information (commit, dirty status) is used only # by CalamaresVersionX.h, which is included by consumers that need a full # version number with all that information; normal consumers can include # CalamaresVersion.h with more stable numbers. -if( NOT BUILD_RELEASE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" ) - include( ExtendedVersion ) +if(NOT BUILD_RELEASE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/") + include(ExtendedVersion) extend_version( "${CALAMARES_VERSION}" OFF CALAMARES_VERSION_SHORT CALAMARES_VERSION ) endif() -# Special target for not-RC (e.g. might-be-release) builds. -# This is used by the release script to get the version. -if ( CALAMARES_VERSION_RC EQUAL 0 ) - add_custom_target(show-version - ${CMAKE_COMMAND} -E echo CALAMARES_VERSION=${CALAMARES_VERSION_SHORT} - USES_TERMINAL - ) +# Special define for RC (e.g. not-a-release) builds. +# This is consumed via the CalamaresConfig.h header. +if(NOT CALAMARES_RELEASE_MODE) + set(CALAMARES_VERSION_RC 1) endif() # enforce using constBegin, constEnd for const-iterators -add_definitions( - -DQT_STRICT_ITERATORS - -DQT_SHARED - -DQT_SHAREDPOINTER_TRACK_POINTERS -) +add_definitions(-DQT_STRICT_ITERATORS -DQT_SHARED -DQT_SHAREDPOINTER_TRACK_POINTERS) # set paths -set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) -set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) -set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}") # Better default installation paths: GNUInstallDirs defines # CMAKE_INSTALL_FULL_SYSCONFDIR to be CMAKE_INSTALL_PREFIX/etc by default # but we really want /etc -if( NOT DEFINED CMAKE_INSTALL_SYSCONFDIR ) - set( CMAKE_INSTALL_SYSCONFDIR "/etc" ) +if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR) + set(CMAKE_INSTALL_SYSCONFDIR "/etc") endif() # make predefined install dirs available everywhere -include( GNUInstallDirs ) +include(GNUInstallDirs) # This is used by CalamaresAddLibrary; once Calamares is installed, # the CalamaresConfig.cmake module sets this variable to the IMPORTED # libraries for Calamares. -set( Calamares_LIBRARIES calamares ) +set(Calamares_LIBRARIES calamares) -add_subdirectory( src ) +add_subdirectory(src) add_feature_info(Python ${WITH_PYTHON} "Python job modules") -add_feature_info(PythonQt ${WITH_PYTHONQT} "Python view modules") +add_feature_info(Qml ${WITH_QML} "QML UI support") add_feature_info(Config ${INSTALL_CONFIG} "Install Calamares configuration") -add_feature_info(KCrash ${WITH_KF5Crash} "Crash dumps via KCrash") -add_feature_info(KDBusAddons ${WITH_KF5DBus} "Unique-application via DBus") +add_feature_info(Polkit ${INSTALL_POLKIT} "Install Polkit files") +add_feature_info(KCrash ${BUILD_KF5Crash} "Crash dumps via KCrash") ### CMake infrastructure installation # # -set( CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Calamares" CACHE PATH "Installation directory for CMake files" ) -set( CMAKE_INSTALL_FULL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}" ) +set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Calamares" CACHE PATH "Installation directory for CMake files") +set(CMAKE_INSTALL_FULL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}") -export( PACKAGE Calamares ) +export(PACKAGE Calamares) configure_package_config_file( "CalamaresConfig.cmake.in" "${PROJECT_BINARY_DIR}/CalamaresConfig.cmake" INSTALL_DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" - PATH_VARS - CMAKE_INSTALL_INCLUDEDIR - CMAKE_INSTALL_LIBDIR - CMAKE_INSTALL_DATADIR + PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_DATADIR ) write_basic_package_version_file( ${PROJECT_BINARY_DIR}/CalamaresConfigVersion.cmake VERSION ${PROJECT_VERSION} COMPATIBILITY SameMajorVersion ) -install( - EXPORT Calamares - DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" - FILE "CalamaresTargets.cmake" - NAMESPACE Calamares:: -) +install(EXPORT Calamares DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" FILE "CalamaresTargets.cmake" NAMESPACE Calamares::) # Install the cmake files install( @@ -603,69 +594,48 @@ install( "CMakeModules/CalamaresCheckModuleSelection.cmake" "CMakeModules/CMakeColors.cmake" "CMakeModules/FindYAMLCPP.cmake" - DESTINATION - "${CMAKE_INSTALL_CMAKEDIR}" + DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" ) ### Miscellaneous installs # # -if( INSTALL_CONFIG ) - install( - FILES settings.conf - DESTINATION share/calamares - ) +if(INSTALL_CONFIG) + install(FILES settings.conf DESTINATION share/calamares) endif() -if( INSTALL_POLKIT ) - install( - FILES com.github.calamares.calamares.policy - DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" - ) +if(INSTALL_POLKIT) + install(FILES com.github.calamares.calamares.policy DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}") endif() -if ( INSTALL_COMPLETION ) - if( NOT CMAKE_INSTALL_BASHCOMPLETIONDIR ) - set( CMAKE_INSTALL_BASHCOMPLETIONDIR "${CMAKE_INSTALL_DATADIR}/bash-completion/completions" ) +if(INSTALL_COMPLETION) + if(NOT CMAKE_INSTALL_BASHCOMPLETIONDIR) + set(CMAKE_INSTALL_BASHCOMPLETIONDIR "${CMAKE_INSTALL_DATADIR}/bash-completion/completions") endif() - install( FILES ${CMAKE_SOURCE_DIR}/data/completion/bash/calamares DESTINATION "${CMAKE_INSTALL_BASHCOMPLETIONDIR}" ) + install(FILES ${CMAKE_SOURCE_DIR}/data/completion/bash/calamares DESTINATION "${CMAKE_INSTALL_BASHCOMPLETIONDIR}") endif() -install( - FILES calamares.desktop - DESTINATION ${CMAKE_INSTALL_DATADIR}/applications -) +install(FILES calamares.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) -install( - FILES man/calamares.8 - DESTINATION ${CMAKE_INSTALL_MANDIR}/man8/ -) +install(FILES man/calamares.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8/) # uninstall target configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY + IMMEDIATE + @ONLY ) -add_custom_target( uninstall - COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake -) +add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) ### CMAKE SUMMARY REPORT # -get_directory_property( SKIPPED_MODULES - DIRECTORY src/modules - DEFINITION LIST_SKIPPED_MODULES -) +get_directory_property(SKIPPED_MODULES DIRECTORY src/modules DEFINITION LIST_SKIPPED_MODULES) calamares_explain_skipped_modules( ${SKIPPED_MODULES} ) -feature_summary( - WHAT DISABLED_FEATURES - DESCRIPTION "The following features have been disabled:" - QUIET_ON_EMPTY -) +feature_summary(WHAT DISABLED_FEATURES DESCRIPTION "The following features have been disabled:" QUIET_ON_EMPTY) feature_summary( WHAT OPTIONAL_PACKAGES_NOT_FOUND DESCRIPTION "The following OPTIONAL packages were not found:" @@ -682,11 +652,11 @@ feature_summary( # # Note: most distro's will do distro-specific packaging rather than # using CPack, and this duplicates information in the AppStream, too. -# TODO:3.3 With newer CMake, move HOMEPAGE_URL to the project()call set(CPACK_PACKAGE_VENDOR calamares) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A Linux system installer") -set(CPACK_PACKAGE_DESCRIPTION "Calamares is a Linux system installer, intended for Linux distributions to use on their ISOs and other bootable media to install the distribution to the end-user's computer. Calamares can also be used as an OEM configuration tool. It is modular, extensible and highly-configurable for Linux distributions from all five major Linux families.") -set(CPACK_PACKAGE_HOMEPAGE_URL "https://calamares.io") +set(CPACK_PACKAGE_DESCRIPTION + "Calamares is a Linux system installer, intended for Linux distributions to use on their ISOs and other bootable media to install the distribution to the end-user's computer. Calamares can also be used as an OEM configuration tool. It is modular, extensible and highly-configurable for Linux distributions from all five major Linux families." +) set(CPACK_PACKAGE_ICON "data/images/squid.png") include(CPack) diff --git a/CMakeModules/BoostPython3.cmake b/CMakeModules/BoostPython3.cmake deleted file mode 100644 index bd1d24e0e..000000000 --- a/CMakeModules/BoostPython3.cmake +++ /dev/null @@ -1,97 +0,0 @@ -# === This file is part of Calamares - === -# -# SPDX-FileCopyrightText: 2014 Aurélien Gâteau -# SPDX-FileCopyrightText: 2017 Adriaan de Groot -# SPDX-FileCopyrightText: 2019 Kevin Kofler -# SPDX-License-Identifier: BSD-2-Clause -# -### -# -# Handles the mess that Boost::Python is before CMake 3.16 and -# Boost 1.70 or so. -# -### -# -# On Ubuntu 14.04, the libboost-python1.54-dev package comes with one library -# for each Python version: -# libboost_python-py27.so -# libboost_python-py33.so -# libboost_python-py34.so -# -# Boost upstream however installs Boost.Python3 libboost_python3.so, which is -# what FindBoost.cmake is looking for. It looks for a library named -# "libboost_${component}.so". -# -# On Gentoo instead, the >=dev-libs/boost-1.54 package provides boost library -# with a name like: -# libboost_python-2.7.so -# libboost_python-3.3.so -# 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. -# One can supply a custom component name by setting the -# `CALAMARES_BOOST_PYTHON3_COMPONENT` variable at CMake time. -set( CALAMARES_BOOST_PYTHON3_COMPONENT python3 CACHE STRING - "Name of the Boost.Python component. If Boost.Python is installed as - libboost_python-foo.so then this variable should be set to 'python-foo'." -) - -include(FindPackageHandleStandardArgs) - -macro( _find_boost_python3_int boost_version componentname found_var ) - foreach( _fbp_name ${CALAMARES_BOOST_PYTHON3_COMPONENT} ${componentname} ) - find_package( Boost ${boost_version} QUIET COMPONENTS ${_fbp_name} ) - string( TOUPPER ${_fbp_name} _fbp_uc_name ) - if( Boost_${_fbp_uc_name}_FOUND ) - if( CMAKE_SYSTEM_NAME MATCHES "FreeBSD" ) - # No upcasing - set( ${found_var} ${_fbp_name} ) - else() - set( ${found_var} ${_fbp_uc_name} ) - endif() - break() - endif() - endforeach() -endmacro() - -macro( find_boost_python3 boost_version python_version found_var ) - set( ${found_var} OFF ) - set( _fbp_found OFF ) - - # turns "3.4.123abc" into "34" - 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" - string( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\..*" "\\1.\\2" _fbp_python_short_version ${python_version} ) - _find_boost_python3_int( ${boost_version} python-${_fbp_python_short_version} _fbp_found ) - endif() - - set( ${found_var} ${_fbp_found} ) - - # This is superfluous, but allows proper reporting in the features list - if ( _fbp_found ) - find_package( Boost ${boost_version} COMPONENTS ${_fbp_found} ) - else() - find_package( Boost ${boost_version} COMPONENTS Python ) - endif() - set_package_properties( - Boost PROPERTIES - DESCRIPTION "A C++ library which enables seamless interoperability between C++ and Python 3." - URL "http://www.boost.org" - ) -endmacro() diff --git a/CMakeModules/CalamaresAddModuleSubdirectory.cmake b/CMakeModules/CalamaresAddModuleSubdirectory.cmake index 91524a09e..e0eed223e 100644 --- a/CMakeModules/CalamaresAddModuleSubdirectory.cmake +++ b/CMakeModules/CalamaresAddModuleSubdirectory.cmake @@ -121,7 +121,8 @@ function( _calamares_add_module_subdirectory_impl ) # _mod_testing boolean if the module should be added to the loadmodule tests file(STRINGS "${_mod_dir}/module.desc" MODULE_INTERFACE REGEX "^interface") if ( MODULE_INTERFACE MATCHES "pythonqt" ) - set( _mod_enabled ${Calamares_WITH_PYTHONQT} ) + message( FATAL_ERROR "PythonQt is no longer supported" ) + set( _mod_enabled OFF ) set( _mod_reason "No PythonQt support" ) set( _mod_testing OFF ) elseif ( MODULE_INTERFACE MATCHES "python" ) diff --git a/CMakeModules/CalamaresAddTest.cmake b/CMakeModules/CalamaresAddTest.cmake index cd757bb88..b40e92939 100644 --- a/CMakeModules/CalamaresAddTest.cmake +++ b/CMakeModules/CalamaresAddTest.cmake @@ -18,19 +18,17 @@ # SOURCES # ) -include( CMakeParseArguments ) -include( CalamaresAutomoc ) +include(CMakeParseArguments) +include(CalamaresAutomoc) -function( calamares_add_test ) - # parse arguments (name needs to be saved before passing ARGN into the macro) - set( NAME ${ARGV0} ) - set( options GUI ) - set( oneValueArgs NAME RESOURCES ) - set( multiValueArgs SOURCES LIBRARIES DEFINITIONS ) - cmake_parse_arguments( TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) - set( TEST_NAME ${NAME} ) +function(calamares_add_test name) + set(options GUI) + set(oneValueArgs RESOURCES) + set(multiValueArgs SOURCES LIBRARIES DEFINITIONS) + cmake_parse_arguments(TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + set(TEST_NAME ${name}) - if( ECM_FOUND AND BUILD_TESTING ) + if(ECM_FOUND AND BUILD_TESTING) ecm_add_test( ${TEST_SOURCES} ${TEST_RESOURCES} TEST_NAME @@ -40,15 +38,18 @@ function( calamares_add_test ) ${TEST_LIBRARIES} Qt5::Core Qt5::Test - ) + ) calamares_automoc( ${TEST_NAME} ) # We specifically pass in the source directory of the test-being- # compiled, so that it can find test-files in that source dir. - target_compile_definitions( ${TEST_NAME} PRIVATE -DBUILD_AS_TEST="${CMAKE_CURRENT_SOURCE_DIR}" ${TEST_DEFINITIONS} ) - if( TEST_GUI ) - target_link_libraries( ${TEST_NAME} Calamares::calamaresui Qt5::Gui ) + target_compile_definitions( + ${TEST_NAME} + PRIVATE -DBUILD_AS_TEST="${CMAKE_CURRENT_SOURCE_DIR}" ${TEST_DEFINITIONS} + ) + if(TEST_GUI) + target_link_libraries(${TEST_NAME} Calamares::calamaresui Qt5::Gui) endif() - if( TEST_RESOURCES ) + if(TEST_RESOURCES) calamares_autorcc( ${TEST_NAME} ${TEST_RESOURCES} ) endif() endif() diff --git a/CMakeModules/FindPythonQt.cmake b/CMakeModules/FindPythonQt.cmake deleted file mode 100644 index 81208a86e..000000000 --- a/CMakeModules/FindPythonQt.cmake +++ /dev/null @@ -1,185 +0,0 @@ -# === This file is part of Calamares - === -# -# SPDX-FileCopyrightText: 2016 Teo Mrnjavac -# SPDX-FileCopyrightText: 2017 Adriaan de Groot -# SPDX-License-Identifier: BSD-2-Clause -# -### -# -# Find PythonQt -# -# Sets PYTHONQT_FOUND, PYTHONQT_INCLUDE_DIR, PYTHONQT_LIBRARY, PYTHONQT_LIBRARIES -# -# Also sets PYTHONQT_INCLUDE_DIRS to add whatever directories -# that are needed for extensions. -# - -# Python is required -find_package(PythonLibs) -if(NOT PYTHONLIBS_FOUND) - message(FATAL_ERROR "error: Python is required to build PythonQt") -endif() - -# Cut X.Y[.Z] down to just X.Y -string(REGEX REPLACE - "^([0-9][0-9]*)\.([0-9][0-9]*)" - "\\1.\\2@" - _PYTHONLIBS_MAJMIN - ${PYTHONLIBS_VERSION_STRING} -) -string(REGEX REPLACE - "@.*" - "" - PYTHONLIBS_MAJMIN - ${_PYTHONLIBS_MAJMIN} -) - -if(NOT EXISTS "${PYTHONQT_INSTALL_DIR}") - find_path(PYTHONQT_INSTALL_DIR - NAMES - include/PythonQt/PythonQt.h - include/PythonQt5/PythonQt.h - DOC "Directory where PythonQt was installed.") -endif() - -# XXX Since PythonQt 3.0 is not yet cmakeified, depending -# on how PythonQt is built, headers will not always be -# installed in "include/PythonQt". That is why "src" -# is added as an option. See [1] for more details. -# [1] https://github.com/commontk/CTK/pull/538#issuecomment-86106367 -find_path(PYTHONQT_INCLUDE_DIR PythonQt.h - PATHS - "${PYTHONQT_INSTALL_DIR}/include/PythonQt" - "${PYTHONQT_INSTALL_DIR}/include/PythonQt5" - "${PYTHONQT_INSTALL_DIR}/src" - DOC "Path to the PythonQt include directory") -find_path(PYTHONQT_ALL_INCLUDE_DIR PythonQt_QtAll.h - PATHS - "${PYTHONQT_INCLUDE_DIR}" - "${PYTHONQT_INSTALL_DIR}" - PATH_SUFFIXES - "extensions/PythonQt_QtAll" - "src" - DOC "Path to the PythonQt 'all' header") - -if ( NOT PythonQt_FIND_QUIETLY ) - message( STATUS "Searching for PythonQt (PythonLibs ${PYTHONLIBS_MAJMIN}) .." ) - if ( PYTHONQT_INCLUDE_DIR ) - message( STATUS " .. found include ${PYTHONQT_INCLUDE_DIR}" ) - message( STATUS " .. found all include ${PYTHONQT_ALL_INCLUDE_DIR}" ) - endif() -endif() - -# Minimum v3.1 is needed -find_library(PYTHONQT_LIBRARY_RELEASE - NAMES - PythonQt-Qt5-Python${PYTHONLIBS_MAJMIN} - PythonQt-Qt5-Python3 - PythonQt - PATHS "${PYTHONQT_INSTALL_DIR}/lib" - DOC "The PythonQt library." -) -find_library(PYTHONQT_LIBRARY_DEBUG - NAMES - PythonQt-Qt5-Python${PYTHONLIBS_MAJMIN}JMIN${CTK_CMAKE_DEBUG_POSTFIX} - PythonQt-Qt5-Python${PYTHONLIBS_MAJMIN}${CMAKE_DEBUG_POSTFIX} - PythonQt-Qt5-Python${PYTHONLIBS_MAJMIN} - PythonQt-Qt5-Python3${CTK_CMAKE_DEBUG_POSTFIX} - PythonQt-Qt5-Python3${CMAKE_DEBUG_POSTFIX} - PythonQt-Qt5-Python3 - PythonQt${CTK_CMAKE_DEBUG_POSTFIX} - PythonQt${CMAKE_DEBUG_POSTFIX} - PythonQt - PATHS "${PYTHONQT_INSTALL_DIR}/lib" - DOC "The PythonQt library (debug build)." -) -find_library(PYTHONQT_QTALL_LIBRARY_RELEASE - NAMES - PythonQt_QtAll-Qt5-Python${PYTHONLIBS_MAJMIN} - PythonQt_QtAll-Qt5-Python3 - PythonQt_QtAll - PATHS "${PYTHONQT_INSTALL_DIR}/lib" - DOC "Full Qt bindings for the PythonQt library." -) -find_library(PYTHONQT_QTALL_LIBRARY_DEBUG - NAMES - PythonQt_QtAll-Qt5-Python${PYTHONLIBS_MAJMIN}${CTK_CMAKE_DEBUG_POSTFIX} - PythonQt_QtAll-Qt5-Python${PYTHONLIBS_MAJMIN}${CMAKE_DEBUG_POSTFIX} - PythonQt_QtAll-Qt5-Python${PYTHONLIBS_MAJMIN} - PythonQt_QtAll-Qt5-Python3${CTK_CMAKE_DEBUG_POSTFIX} - PythonQt_QtAll-Qt5-Python3${CMAKE_DEBUG_POSTFIX} - PythonQt_QtAll-Qt5-Python3 - PythonQt_QtAll${CTK_CMAKE_DEBUG_POSTFIX} - PythonQt_QtAll${CMAKE_DEBUG_POSTFIX} - PythonQt_QtAll - PATHS "${PYTHONQT_INSTALL_DIR}/lib" - DOC "Full Qt bindings for the PythonQt library (debug build)." -) - -set(PYTHONQT_LIBRARY) -if(PYTHONQT_LIBRARY_RELEASE) - list(APPEND PYTHONQT_LIBRARY optimized ${PYTHONQT_LIBRARY_RELEASE}) -endif() -if(PYTHONQT_LIBRARY_DEBUG) - list(APPEND PYTHONQT_LIBRARY debug ${PYTHONQT_LIBRARY_DEBUG}) -endif() - -set(PYTHONQT_QTALL_LIBRARY) -if(PYTHONQT_QTALL_LIBRARY_RELEASE) - list(APPEND PYTHONQT_QTALL_LIBRARY optimized ${PYTHONQT_QTALL_LIBRARY_RELEASE}) -endif() -if(PYTHONQT_QTALL_LIBRARY_DEBUG) - list(APPEND PYTHONQT_QTALL_LIBRARY debug ${PYTHONQT_QTALL_LIBRARY_DEBUG}) -endif() - -if ( NOT PythonQt_FIND_QUIETLY ) - if ( PYTHONQT_LIBRARY ) - message( STATUS " .. found library ${PYTHONQT_LIBRARY}" ) - endif() - if ( PYTHONQT_QTALL_LIBRARY ) - message( STATUS " .. found qtall ${PYTHONQT_QTALL_LIBRARY}" ) - endif() -endif() - - -mark_as_advanced(PYTHONQT_INSTALL_DIR) -mark_as_advanced(PYTHONQT_INCLUDE_DIR) -mark_as_advanced(PYTHONQT_LIBRARY_RELEASE) -mark_as_advanced(PYTHONQT_LIBRARY_DEBUG) -mark_as_advanced(PYTHONQT_QTALL_LIBRARY_RELEASE) -mark_as_advanced(PYTHONQT_QTALL_LIBRARY_DEBUG) - -# On linux, also find libutil -if(UNIX AND NOT APPLE) - find_library(PYTHONQT_LIBUTIL util) - mark_as_advanced(PYTHONQT_LIBUTIL) -endif() - -# All upper case _FOUND variable is maintained for backwards compatibility. -set(PYTHONQT_FOUND 0) -set(PythonQt_FOUND 0) - -if(PYTHONQT_INCLUDE_DIR AND PYTHONQT_LIBRARY AND PYTHONQT_QTALL_LIBRARY) - # Currently CMake'ified PythonQt only supports building against a python Release build. - # This applies independently of CTK build type (Release, Debug, ...) - add_definitions(-DPYTHONQT_USE_RELEASE_PYTHON_FALLBACK) - set(PYTHONQT_FOUND 1) - set(PythonQt_FOUND ${PYTHONQT_FOUND}) - set(PYTHONQT_LIBRARIES ${PYTHONQT_LIBRARY} ${PYTHONQT_LIBUTIL} ${PYTHONQT_QTALL_LIBRARY}) - set(PYTHONQT_INCLUDE_DIRS ${PYTHONQT_INCLUDE_DIR}) - if(PYTHONQT_ALL_INCLUDE_DIR) - list(APPEND PYTHONQT_INCLUDE_DIRS ${PYTHONQT_ALL_INCLUDE_DIR}) - endif() -elseif(NOT PythonQt_FIND_QUIETLY) - set(_missing "") - if (NOT PYTHONQT_INCLUDE_DIR) - list(APPEND _missing "includes") - endif() - if (NOT PYTHONQT_LIBRARY) - list(APPEND _missing "library") - endif() - if (NOT PYTHONQT_QTALL_LIBRARY) - list(APPEND _missing "qtall") - endif() - message(STATUS "PythonQt not found, missing components ${_missing}") -endif() diff --git a/CMakeModules/KPMcoreHelper.cmake b/CMakeModules/KPMcoreHelper.cmake index 6aacfc95c..05dff18dd 100644 --- a/CMakeModules/KPMcoreHelper.cmake +++ b/CMakeModules/KPMcoreHelper.cmake @@ -10,7 +10,7 @@ if ( NOT KPMcore_searched_for ) set( KPMcore_searched_for TRUE ) - find_package( KPMcore 3.3 ) + find_package( KPMcore 21.12.0 ) set_package_properties( KPMcore PROPERTIES URL "https://invent.kde.org/kde/kpmcore" @@ -21,18 +21,6 @@ if ( NOT KPMcore_searched_for ) if( KPMcore_FOUND ) set( KPMcore_API_DEFINITIONS "" ) - if( KPMcore_VERSION VERSION_GREATER "3.3.70" AND KPMcore_VERSION VERSION_LESS "4.0" ) - message( FATAL_ERROR "KPMCore beta versions ${KPMcore_VERSION} not supported" ) - endif() - if ( KPMcore_VERSION VERSION_GREATER "3.3.0") - list( APPEND KPMcore_API_DEFINITIONS WITH_KPMCORE331API) # kpmcore > 3.3.0 with deprecations - endif() - if ( KPMcore_VERSION VERSION_GREATER_EQUAL "4.0") - list( APPEND KPMcore_API_DEFINITIONS WITH_KPMCORE4API) # kpmcore 4 with new API - endif() - if( KPMcore_VERSION VERSION_GREATER_EQUAL "4.2" ) - list( APPEND KPMcore_API_DEFINITIONS WITH_KPMCORE42API) # kpmcore 4.2 with new API - endif() else() set( KPMcore_API_DEFINITIONS WITHOUT_KPMcore ) endif() diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0be408ba0..0eaf4d00f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -77,16 +77,15 @@ instructions are on the wiki. ### Dependencies Main: -* Compiler with C++17 support: GCC >= 7 or Clang >= 5 -* CMake >= 3.3 -* Qt >= 5.9 +* Compiler with C++17 support +* CMake >= 3.16 +* Qt >= 5.15 * yaml-cpp >= 0.5.1 -* Python >= 3.3 (required for some modules) -* Boost.Python >= 1.55.0 (required for some modules) +* Python >= 3.6 (required for some modules) +* Boost.Python >= 1.67.0 (required for some modules) * KDE extra-cmake-modules >= 5.18 (recommended; required for some modules; required for some tests) * KDE Frameworks KCoreAddons (>= 5.58 recommended) -* PythonQt (optional, deprecated) Individual modules may have their own requirements; these are listed in CMake output. diff --git a/CalamaresConfig.cmake.in b/CalamaresConfig.cmake.in index 4fb9621ca..7b7f5aff9 100644 --- a/CalamaresConfig.cmake.in +++ b/CalamaresConfig.cmake.in @@ -87,5 +87,4 @@ include(CalamaresAddPlugin) # This list should match the one in libcalamares/CalamaresConfig.h, # which is the C++-language side of the same configuration. set(Calamares_WITH_PYTHON @WITH_PYTHON@) -set(Calamares_WITH_PYTHONQT @WITH_PYTHONQT@) set(Calamares_WITH_QML @WITH_QML@) diff --git a/LICENSES/LGPL-2.0-only.txt b/LICENSES/LGPL-2.0-only.txt deleted file mode 100644 index df942b1ff..000000000 --- a/LICENSES/LGPL-2.0-only.txt +++ /dev/null @@ -1,488 +0,0 @@ - - The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB. - - You may use, distribute and copy the KD Tools Library under the terms of - GNU Library General Public License version 2, which is displayed below. - -------------------------------------------------------------------------- - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - c) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - d) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/ci/abicheck.sh b/ci/abicheck.sh new file mode 100755 index 000000000..6bf8f9b54 --- /dev/null +++ b/ci/abicheck.sh @@ -0,0 +1,73 @@ +#! /bin/sh +# +# SPDX-FileCopyrightText: 2021 Adriaan de Groot +# SPDX-License-Identifier: BSD-2-Clause +# +# Compares the ABI of the current working tree with the ABI +# from a base-version. Uses libabigail for the actual comparison. +# +# To use the tool, just run the script. It will build Calamares at +# least once, maybe twice (if it needs the base-version ABI information +# and hasn't cached it). + +# The base version can be a tag or git-hash; it will be checked-out +# in a worktree. +# +# Note that the hash here now is the very start of 3.3, when ABI +# compatibility was not expected yet at **all**. +BASE_VERSION=419be4df25bc6fcc1958cb6e44afc1b9e64fce71 + +### Build a tree and cache the ABI info into ci/ +# +# +do_build() { + LABEL=$1 + SOURCE_DIR=$2 + + BUILD_DIR=build-abi-$LABEL + rm -rf $BUILD_DIR + mkdir $BUILD_DIR + + if ( cd $BUILD_DIR && cmake $SOURCE_DIR -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-Og -g -gdwarf" -DCMAKE_C_FLAGS="-Og -g -gdwarf" && make -j12 ) > /dev/null 2>&1 + then + ls -1 $BUILD_DIR/libcalamares*.so.* + # Copy the un-versioned files; .so is a symlink to the just-built one + for lib in $BUILD_DIR/libcalamares*.so + do + cp $lib ci/`basename $lib`.$LABEL + done + else + echo "! failed to build $LABEL" + exit 1 + fi +} + +### Build current tree and get ABI info +# +# +do_build current `pwd -P` + +### Build ABI base version +# +# We cache this to save on some build time, if we are chasing a +# single branch from an unchanging base version. +# +if test -f ci/libcalamares.so.$BASE_VERSION +then + # The ABI version is cached, so we're good + : +else + git worktree remove --force tree-abi-$BASE_VERSION + git worktree add tree-abi-$BASE_VERSION $BASE_VERSION > /dev/null 2>&1 || { echo "! could not create worktree for $BASE_VERSION" ; exit 1 ; } + do_build $BASE_VERSION $( cd tree-abi-$BASE_VERSION && pwd -P ) +fi + +### Compare & Report +# +# abidiff compares the Application Binary Interfaces (ABI) of two +# shared libraries in ELF format. It emits a meaningful report describing +# the differences between the two ABIs. +# +# -l prints only the leaf changes, leaving out explanations of why. +# +abidiff -l ci/libcalamares.so.$BASE_VERSION ci/libcalamares.so.current diff --git a/ci/txstats.py b/ci/txstats.py index 69a34f89e..696a4b828 100755 --- a/ci/txstats.py +++ b/ci/txstats.py @@ -97,10 +97,12 @@ class EditingOutputter(object): lines = f.readlines() mark = None + mark_text = None for l in lines: # Note that we didn't strip the lines, so need the \n here if l.startswith("# Total ") and l.endswith(" languages\n"): mark = lines.index(l) + mark_text = l break if mark is None: raise TXError("No CMakeLists.txt lines for TX stats found") @@ -108,18 +110,17 @@ class EditingOutputter(object): nextmark = mark + 1 for l in lines[mark+1:]: - if l.startswith("set( _tx_"): - nextmark += 1 - continue - if l.startswith(" "): - nextmark += 1 - continue - break - if nextmark > mark + 12 or nextmark > len(lines) - 4: + nextmark += 1 + if l.startswith(mark_text): + break + if nextmark > mark + 100 or nextmark > len(lines) - 4: # Try to catch runaway nextmarks: we know there should # be four set-lines, which are unlikely to be 3 lines each; # similarly the CMakeLists.txt is supposed to end with # some boilerplate. + # + # However, gersemi will reformat to one-language-per-line, + # so we can get really long sections, that's why we use 100 as a limit. raise TXError("Could not find end of TX settings in CMakeLists.txt") self.post_lines = lines[nextmark:] @@ -185,7 +186,8 @@ def get_tx_stats(languages, outputter, verbose): ) all_langs = [] - outputter.print("# Total %d languages" % len(languages)) + mark_text = "# Total %d languages" % len(languages) + outputter.print(mark_text) for lang_name in languages: stats = languages[lang_name]["translated"]["percentage"] # Make the by-definition-incomplete languages have a percentage @@ -202,6 +204,7 @@ def get_tx_stats(languages, outputter, verbose): output_langs(all_langs, outputter, "good", lambda s : 1.0 > s >= 0.75) output_langs(all_langs, outputter, "ok", lambda s : 0.75 > s >= 0.05) output_langs(all_langs, outputter, "incomplete", lambda s : 0.05 > s) + outputter.print(mark_text) # Audit the languages that are in TX, mapped to git for lang_name in languages: diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt index 72aae9588..7494692c6 100644 --- a/lang/CMakeLists.txt +++ b/lang/CMakeLists.txt @@ -13,15 +13,15 @@ # - defines an OBJECT LIBRARY calamares-i18n for linking the compiled # translations into an executable. -include( CalamaresAddTranslations ) +include(CalamaresAddTranslations) find_package(Qt5 COMPONENTS Xml) -if( Qt5Xml_FOUND ) +if(Qt5Xml_FOUND) add_executable(txload txload.cpp) target_link_libraries(txload Qt5::Xml) endif() -install_calamares_gettext_translations( python +install_calamares_gettext_translations(python SOURCE_DIR ${CMAKE_SOURCE_DIR}/lang/python FILENAME python.mo RENAME calamares-python.mo @@ -30,25 +30,25 @@ install_calamares_gettext_translations( python ### TRANSLATIONS # # -set( TS_FILES "" ) -set( calamares_i18n_qrc_content "" ) +set(TS_FILES "") +set(calamares_i18n_qrc_content "") # calamares and qt language files -foreach( lang ${CALAMARES_TRANSLATION_LANGUAGES} ) - foreach( tlsource "calamares_${lang}" "tz_${lang}" "kb_${lang}" ) - if( EXISTS "${CMAKE_SOURCE_DIR}/lang/${tlsource}.ts" ) - string( APPEND calamares_i18n_qrc_content "${tlsource}.qm\n" ) - list( APPEND TS_FILES "${CMAKE_SOURCE_DIR}/lang/${tlsource}.ts" ) +foreach(lang ${CALAMARES_TRANSLATION_LANGUAGES}) + foreach(tlsource "calamares_${lang}" "tz_${lang}" "kb_${lang}") + if(EXISTS "${CMAKE_SOURCE_DIR}/lang/${tlsource}.ts") + string(APPEND calamares_i18n_qrc_content "${tlsource}.qm\n") + list(APPEND TS_FILES "${CMAKE_SOURCE_DIR}/lang/${tlsource}.ts") endif() endforeach() endforeach() -set( trans_file calamares_i18n ) -set( trans_infile ${CMAKE_CURRENT_BINARY_DIR}/${trans_file}.qrc ) -set( trans_outfile ${CMAKE_CURRENT_BINARY_DIR}/calamares-i18n.cxx ) -set( CALAMARES_TRANSLATIONS_SOURCE ${trans_outfile} ) +set(trans_file calamares_i18n) +set(trans_infile ${CMAKE_CURRENT_BINARY_DIR}/${trans_file}.qrc) +set(trans_outfile ${CMAKE_CURRENT_BINARY_DIR}/calamares-i18n.cxx) +set(CALAMARES_TRANSLATIONS_SOURCE ${trans_outfile}) -configure_file( ${CMAKE_SOURCE_DIR}/lang/calamares_i18n.qrc.in ${trans_infile} @ONLY ) +configure_file(${CMAKE_SOURCE_DIR}/lang/calamares_i18n.qrc.in ${trans_infile} @ONLY) qt5_add_translation(QM_FILES ${TS_FILES}) diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts index ddd52d74e..7d12a26b4 100644 --- a/lang/calamares_ar.ts +++ b/lang/calamares_ar.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information معلومات التّنقيح @@ -171,7 +190,7 @@ Calamares::JobThread - + Done انتهى @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -273,7 +292,7 @@ - + (%n second(s)) @@ -285,7 +304,7 @@ - + System-requirements checking is complete. @@ -492,12 +511,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 المثبت @@ -536,149 +555,149 @@ The installer will quit and all changes will be lost. نموذج - + Select storage de&vice: اختر &جهاز التّخزين: - - - - + + + + Current: الحاليّ: - + After: بعد: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>تقسيم يدويّ</strong><br/>يمكنك إنشاء أو تغيير حجم الأقسام بنفسك. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>اختر قسمًا لتقليصه، ثمّ اسحب الشّريط السّفليّ لتغيير حجمه </strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: مكان محمّل الإقلاع: - + <strong>Select a partition to install on</strong> <strong>اختر القسم حيث سيكون التّثبيت عليه</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. تعذّر إيجاد قسم النّظام EFI في أيّ مكان. فضلًا ارجع واستخدم التّقسيم اليدويّ لإعداد %1. - + The EFI system partition at %1 will be used for starting %2. قسم النّظام EFI على %1 سيُستخدم لبدء %2. - + EFI system partition: قسم نظام EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. لا يبدو أن في جهاز التّخزين أيّ نظام تشغيل. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>مسح القرص</strong><br/>هذا س<font color="red">يمسح</font> كلّ البيانات الموجودة في جهاز التّخزين المحدّد. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>ثبّت جنبًا إلى جنب</strong><br/>سيقلّص المثبّت قسمًا لتفريغ مساحة لِ‍ %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>استبدل قسمًا</strong><br/>يستبدل قسمًا مع %1 . - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. على جهاز التّخزين %1. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. على جهاز التّخزين هذا نظام تشغيل ذأصلًا. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. على جهاز التّخزين هذا عدّة أنظمة تشغيل. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -766,27 +785,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> اضبط طراز لوحة المفتاتيح ليكون %1.<br/> - + Set keyboard layout to %1/%2. اضبط تخطيط لوحة المفاتيح إلى %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -821,97 +840,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> لا يستوفِ هذا الحاسوب أدنى متطلّبات تثبيت %1.<br/>لا يمكن متابعة التّثبيت. <a href="#details">التّفاصيل...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. لا يستوفِ هذا الحاسوب بعض المتطلّبات المستحسنة لتثبيت %1.<br/>يمكن للمثبّت المتابعة، ولكن قد تكون بعض الميزات معطّلة. - + This program will ask you some questions and set up %2 on your computer. سيطرح البرنامج بعض الأسئلة عليك ويعدّ %2 على حاسوبك. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. اسم المستخدم طويل جدًّا. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. اسم المضيف قصير جدًّا. - + Your hostname is too long. اسم المضيف طويل جدًّا. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! لا يوجد تطابق في كلمات السر! - + OK! @@ -967,11 +986,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1430,6 +1454,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1459,8 +1493,8 @@ The installer will quit and all changes will be lost. أكّد عبارة المرور - - + + Please enter the same passphrase in both boxes. @@ -1549,32 +1583,32 @@ The installer will quit and all changes will be lost. أ&عد التّشغيل الآن - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>انتهينا.</h1><br/>لقد ثُبّت %1 على حاسوبك.<br/>يمكنك إعادة التّشغيل وفتح النّظام الجديد، أو متابعة استخدام بيئة %2 الحيّة. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1608,12 +1642,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. يهيّء القسم %1 بنظام الملفّات %2. - + The installer failed to format partition %1 on disk '%2'. فشل المثبّت في تهيئة القسم %1 على القرص '%2'. @@ -1621,12 +1661,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1666,27 +1706,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. المثبّت لا يعمل بصلاحيّات المدير. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1986,35 +2026,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2040,12 +2080,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2055,98 +2095,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2197,24 +2249,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2525,7 +2577,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2563,22 +2615,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3104,7 +3140,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3427,12 +3463,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: لأفضل النّتائج، تحقّق من أن الحاسوب: - + System requirements متطلّبات النّظام @@ -3860,22 +3896,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4063,44 +4099,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - <h1>مرحبًا بك في مثبّت %1.</h1> - - - %1 support %1 الدعم - + About %1 setup - + About %1 installer حول 1% المثبت - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4165,23 +4176,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4281,17 +4276,17 @@ Output: طراز لوحة المفاتيح: - + Layouts - + Type here to test your keyboard اكتب هنا لتجرّب لوحة المفاتيح - + Variants @@ -4418,102 +4413,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? ما اسم هذا الحاسوب؟ - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. اختر كلمة مرور لإبقاء حسابك آمنًا. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. استخدم نفس كلمة المرور لحساب المدير. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_as.ts b/lang/calamares_as.ts index fad150096..da7b42ec0 100644 --- a/lang/calamares_as.ts +++ b/lang/calamares_as.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ ৱিজেত্ ত্ৰি - + Debug information ডিবাগ তথ্য @@ -171,7 +190,7 @@ Calamares::JobThread - + Done হৈ গ'ল @@ -261,7 +280,7 @@ <i>%1</i> মডিউল পৰীক্ষণৰ বাবে আৱশ্যকতাবোৰ সম্পূৰ্ণ হ'ল। - + Waiting for %n module(s). Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. চিছ্তেমৰ বাবে প্রয়োজনীয় পৰীক্ষণ সম্পূর্ণ হ'ল। @@ -484,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 চেত্ আপ প্ৰোগ্ৰেম - + %1 Installer %1 ইনস্তলাৰ @@ -528,149 +547,149 @@ The installer will quit and all changes will be lost. ৰূপ - + Select storage de&vice: স্তোৰেজ ডিভাইচ চয়ণ কৰক (&v): - - - - + + + + Current: বর্তমান: - + After: পিছত: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>মেনুৱেল বিভাজন</strong><br/>আপুনি নিজে বিভাজন বনাব বা বিভজনৰ আয়তন সলনি কৰিব পাৰে। - + Reuse %1 as home partition for %2. %1ক %2ৰ গৃহ বিভাজন হিচাপে পুনৰ ব্যৱহাৰ কৰক। - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>আয়তন সলনি কৰিবলৈ বিভাজন বাচনি কৰক, তাৰ পিছত তলৰ "বাৰ্" ডালৰ সহায়ত আয়তন চেত্ কৰক</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 বিভজনক সৰু কৰি %2MiB কৰা হ'ব আৰু %4ৰ বাবে %3MiBৰ নতুন বিভজন বনোৱা হ'ব। - + Boot loader location: বুত্ লোডাৰৰ অৱস্থান: - + <strong>Select a partition to install on</strong> <strong>ইনস্তল​ কৰিবলৈ এখন বিভাজন চয়ন কৰক</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. এই চিছটেমত এখনো EFI চিছটেম বিভাজন কতো পোৱা নগ'ল। অনুগ্ৰহ কৰি উভতি যাওক আৰু মেনুৱেল বিভাজন প্ৰক্ৰিয়া দ্বাৰা %1 চেত্ আপ কৰক। - + The EFI system partition at %1 will be used for starting %2. %1ত থকা EFI চিছটেম বিভাজনটো %2ক আৰম্ভ কৰাৰ বাবে ব্যৱহাৰ কৰা হ'ব। - + EFI system partition: EFI চিছটেম বিভাজন: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. এইটো ষ্টোৰেজ ডিভাইচত কোনো অপাৰেটিং চিছটেম নাই যেন লাগে। আপুনি কি কৰিব বিচাৰে?<br/>আপুনি ষ্টোৰেজ ডিভাইচটোত কিবা সলনি কৰাৰ আগতে পুনৰীক্ষণ আৰু চয়ন নিশ্চিত কৰিব পাৰিব। - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>ডিস্কত থকা গোটেই ডাটা আতৰাওক।</strong><br/> ইয়াৰ দ্ৱাৰা ষ্টোৰেজ ডিভাইছত বৰ্তমান থকা সকলো ডাটা <font color="red">বিলোপ</font> কৰা হ'ব। - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>সমান্তৰালভাৱে ইনস্তল কৰক</strong><br/> ইনস্তলাৰটোৱে %1ক ইনস্তল​ কৰাৰ বাবে এখন বিভাজন সৰু কৰি দিব। - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>বিভাজন সলনি কৰক</strong> <br/>এখন বিভাজনক % ৰ্ সৈতে সলনি কৰক। - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. এইটো ষ্টোৰেজ ডিভাইচত %1 আছে। <br/> আপুনি কি কৰিব বিচাৰে? ষ্টোৰেজ ডিভাইচটোত যিকোনো সলনি কৰাৰ আগত আপুনি পুনৰীক্ষণ আৰু সলনি কৰিব পাৰিব। - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. এইটো ষ্টোৰেজ ডিভাইচত ইতিমধ্যে এটা অপাৰেটিং চিছটেম আছে। আপুনি কি কৰিব বিচাৰে? <br/>ষ্টোৰেজ ডিভাইচটোত যিকোনো সলনি কৰাৰ আগত আপুনি পুনৰীক্ষণ আৰু সলনি কৰিব পাৰিব। - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. এইটো ষ্টোৰেজ ডিভাইচত একাধিক এটা অপাৰেটিং চিছটেম আছে। আপুনি কি কৰিব বিচাৰে? 1ষ্টোৰেজ ডিভাইচটোত যিকোনো সলনি কৰাৰ আগত আপুনি পুনৰীক্ষণ আৰু সলনি কৰিব পাৰিব। - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap কোনো স্ৱেপ নাই - + Reuse Swap স্ৱেপ পুনৰ ব্যৱহাৰ কৰক - + Swap (no Hibernate) স্ৱেপ (হাইবাৰনেট নোহোৱাকৈ) - + Swap (with Hibernate) স্ৱোআপ (হাইবাৰনেটৰ সৈতে) - + Swap to file ফাইললৈ স্ৱোআপ কৰক। @@ -758,27 +777,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> কিবোৰ্ডৰ মডেল %1ত চেট্ কৰক।<br/> - + Set keyboard layout to %1/%2. কিবোৰ্ডৰ লেআউট %1/%2 চেট্ কৰক। - + Set timezone to %1/%2. সময় অঞ্চলৰ সিদ্ধান্ত কৰক %`1%2 - + The system language will be set to %1. চিছটেমৰ ভাষা %1লৈ সলনি কৰা হ'ব। - + The numbers and dates locale will be set to %1. সংখ্যা আৰু তাৰিখ স্থানীয় %1লৈ সলনি কৰা হ'ব। @@ -813,97 +832,97 @@ The installer will quit and all changes will be lost. নেটৱৰ্ক্ ইনস্তলেচন। (নিস্ক্ৰিয়: পেকেজ সুচী বিচাৰি পোৱা নগ'ল, আপোনাৰ নেটৱৰ্ক্ সংযোগ পৰীক্ষা কৰক) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> %1 চেত্ আপৰ বাবে নিম্নতম আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। <br/>স্থাপন প্ৰক্ৰিয়া অবিৰত ৰাখিব নোৱাৰিব। <a href="#details">বিৱৰণ...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> %1 ইনস্তলচেন​ৰ বাবে নিম্নতম আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। <br/>ইনস্তলচেন​ প্ৰক্ৰিয়া অবিৰত ৰাখিব নোৱাৰিব। <a href="#details">বিৱৰণ...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. %1 চেত্ আপৰ বাবে পৰামৰ্শ দিয়া আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। <br/>স্থাপন প্ৰক্ৰিয়া অবিৰত ৰাখিব পাৰিব, কিন্তু কিছুমান সুবিধা নিষ্ক্রিয় হৈ থাকিব। - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. %1 ইনস্তলচেন​ৰ বাবে পৰামৰ্শ দিয়া আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। ইনস্তলচেন​ অবিৰত ৰাখিব পাৰিব, কিন্তু কিছুমান সুবিধা নিষ্ক্রিয় হৈ থাকিব। - + This program will ask you some questions and set up %2 on your computer. এইটো প্ৰগ্ৰেমে অপোনাক কিছুমান প্ৰশ্ন সুধিব আৰু অপোনাৰ কম্পিউটাৰত %2 স্থাপন কৰিব। - + <h1>Welcome to the Calamares setup program for %1</h1> %1ৰ Calamares চেত্ আপ প্ৰগ্ৰামলৈ আদৰণি জনাইছো। - + <h1>Welcome to %1 setup</h1> <h1> %1 চেত্ আপলৈ আদৰণি জনাইছো।</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>%1ৰ কেলামাৰেচ ইনস্তলাৰলৈ আদৰণি জনাইছো।</h1> - + <h1>Welcome to the %1 installer</h1> <h1>%1 ইনস্তলাৰলৈ আদৰণি জনাইছো।</h1> - + Your username is too long. আপোনাৰ ইউজাৰ নাম বহুত দীঘল। - + '%1' is not allowed as username. '%1'ক ব্যৱহাৰকাৰীৰ নাম হিচাপে ব্যৱহাৰ কৰা অবধ্য | - + Your username must start with a lowercase letter or underscore. আপোনাৰ ব্যৱহাৰকাৰী নাম lowercase বৰ্ণ বা underscoreৰে আৰম্ভ হ'ব লাগিব। - + Only lowercase letters, numbers, underscore and hyphen are allowed. কেৱল lowercase বৰ্ণ, সংখ্যা, underscore আৰু hyphenৰ হে মাত্ৰ অনুমতি আছে। - + Your hostname is too short. আপোনাৰ হ'স্ট্ নাম বহুত ছুটি। - + Your hostname is too long. আপোনাৰ হ'স্ট্ নাম বহুত দীঘল। - + '%1' is not allowed as hostname. '%1'ক আয়োজকৰ নাম হিচাপে ব্যৱহাৰ কৰা অবধ্য | - + Only letters, numbers, underscore and hyphen are allowed. কেৱল বৰ্ণ, সংখ্যা, underscore আৰু hyphenৰ হে মাত্ৰ অনুমতি আছে। - + Your passwords do not match! আপোনাৰ পাছৱৰ্ডকেইটাৰ মিল নাই! - + OK! @@ -959,11 +978,16 @@ The installer will quit and all changes will be lost. + Packages + পেকেজ + + + Install option: <strong>%1</strong> - + None @@ -1422,6 +1446,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1451,8 +1485,8 @@ The installer will quit and all changes will be lost. পাছফ্ৰেছ নিশ্ৱিত কৰক - - + + Please enter the same passphrase in both boxes. অনুগ্ৰহ কৰি দুয়োটা বাকচত একে পাছফ্ৰেছ প্রবিষ্ট কৰক। @@ -1541,32 +1575,32 @@ The installer will quit and all changes will be lost. পুনৰাৰম্ভ কৰক (&R) - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>সকলো কৰা হ'ল।</h1> <br/>আপোনাৰ কম্পিউটাৰত %1 স্থাপন কৰা হ'ল। <br/>আপুনি এতিয়া নতুন চিছটেম ব্যৱহাৰ কৰা আৰম্ভ কৰিব পাৰিব। - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>এইটো বিকল্পত ক্লিক কৰাৰ লগে লগে আপোনাৰ চিছটেম পুনৰাৰম্ভ হ'ব যেতিয়া আপুনি <span style="font-style:italic;">হৈ গ'ল</span>ত ক্লিক কৰে বা চেত্ আপ প্ৰগ্ৰেম বন্ধ কৰে।</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>সকলো কৰা হ'ল।</h1> আপোনাৰ কম্পিউটাৰত %1 ইনস্তল কৰা হ'ল। <br/>আপুনি এতিয়া নতুন চিছটেম পুনৰাৰম্ভ কৰিব পাৰিব অথবা %2 লাইভ বাতাৱৰণ ব্যৱহাৰ কৰা অবিৰত ৰাখিব পাৰে। - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>এইটো বিকল্পত ক্লিক কৰাৰ লগে লগে আপোনাৰ চিছটেম পুনৰাৰম্ভ হ'ব যেতিয়া আপুনি <span style="font-style:italic;">হৈ গ'ল</span>ত ক্লিক কৰে বা ইনস্তলাৰ বন্ধ কৰে।</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>স্থাপন প্ৰক্ৰিয়া বিফল হ'ল।</h1> <br/>আপোনাৰ কম্পিউটাৰত %1 স্থাপন নহ'ল্। <br/>ক্ৰুটি বাৰ্তা আছিল: %2। - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>ইনস্তলচেন প্ৰক্ৰিয়া বিফল হ'ল।</h1> <br/>আপোনাৰ কম্পিউটাৰত %1 ইনস্তল নহ'ল্। <br/>ক্ৰুটি বাৰ্তা আছিল: %2। @@ -1600,12 +1634,18 @@ The installer will quit and all changes will be lost. <strong>%3MiB</strong> ৰ <strong>%1 %</strong> বিভাজন <strong>%2</strong> ফাইল চিছটেমৰ সৈতে ফৰ্মেট কৰক। - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. %1 ফৰ্মেট বিভাজনৰ সৈতে %2 ফাইল চিছটেম। - + The installer failed to format partition %1 on disk '%2'. ইনস্তলাৰটো '%2' ডিস্কত %1 বিভাজন​ ফৰ্মেট কৰাত বিফল হ'ল। @@ -1613,12 +1653,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space অতি কমেও %1 GiB খালী ঠাই ড্ৰাইভত উপলব্ধ আছে - + There is not enough drive space. At least %1 GiB is required. ড্ৰাইভত পৰ্য্যাপ্ত খালী ঠাই নাই। অতি কমেও %1 GiB আৱশ্যক। @@ -1658,27 +1698,27 @@ The installer will quit and all changes will be lost. ইনস্তলাৰটো প্ৰসাশনক (ৰুট) হিছাবে চলি আছে নেকি - + The setup program is not running with administrator rights. চেত্ আপ প্ৰগ্ৰেমটো প্ৰসাশনীয় অধিকাৰৰ সৈতে চলি থকা নাই। - + The installer is not running with administrator rights. ইনস্তলাৰটো প্ৰসাশনীয় অধিকাৰৰ সৈতে চলি থকা নাই। - + has a screen large enough to show the whole installer সম্পূৰ্ণ ইনস্তলাৰটো দেখাবলৈ প্ৰয়োজনীয় ডাঙৰ স্ক্ৰীণ আছে নেকি? - + The screen is too small to display the setup program. চেত্ আপ প্ৰগ্ৰেমটো প্ৰদৰ্শন কৰিবলৈ স্ক্ৰিনখনৰ আয়তন যথেস্ট সৰু। - + The screen is too small to display the installer. ইনস্তলাৰটো প্ৰদৰ্শন কৰিবলৈ স্ক্ৰিনখনৰ আয়তন যথেস্ট সৰু। @@ -1978,35 +2018,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. LUKS কি ফাইল কনফিগাৰ কৰক। - - + + No partitions are defined. কোনো বিভাজনৰ বৰ্ণনা দিয়া নাই। - - - + + + Encrypted rootfs setup error এনক্ৰিপছন থকা rootfs চেত্ আপত ত্ৰুটি - + Root partition %1 is LUKS but no passphrase has been set. ৰুট বিভাজন %1 LUKS, কিন্তু পাসফ্রেজ ছেট কৰা হোৱা নাই। - + Could not create LUKS key file for root partition %1. %1 ৰুট বিভাজনৰ বাবে LUKS কি বনাৱ পৰা নগ'ল। - + Could not configure LUKS key file on partition %1. %1 বিভাজনত LUKS কি ফাইল কনফিগাৰ কৰিব পৰা নগ'ল। @@ -2032,12 +2072,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 সময় অঞ্চল: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2049,100 +2089,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection পেকেজ বাচনি - + Office software কাৰ্যালয়ৰ ছফটৱেৰ - + Office package কাৰ্যালয়ৰ পেকেজ - + Browser software ব্ৰাউজাৰৰ ছফটৱেৰ - + Browser package ব্ৰাউজাৰৰ পেকেজ - + Web browser ৱেব ব্ৰাউজাৰ - + Kernel + label for netinstall module, Linux kernel কাৰ্ণেল - + Services + label for netinstall module, system services সেৰ্ৱিচেস - + Login + label for netinstall module, choose login manager পৰীক্ষণ কৰক - + Desktop + label for netinstall module, choose desktop environment দেস্কেতোপ - - Applications - এপ্লীকেছ্নচ - - - + Communication + label for netinstall module যোগাযোগ - + Development + label for netinstall module প্রবৃদ্ধি - + Office + label for netinstall module কাৰ্যালয় - + Multimedia + label for netinstall module মাল্টিমিডিয়া - + Internet + label for netinstall module ইণ্টাৰনেট - + Theming + label for netinstall module থিমীং - + Gaming + label for netinstall module খেলা - + Utilities + label for netinstall module সঁজুলি + + + Applications + এপ্লীকেছ্নচ + NotesQmlViewStep @@ -2191,24 +2243,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 সময় অঞ্চল: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2483,7 +2535,7 @@ The installer will quit and all changes will be lost. অজ্ঞাত ক্ৰুটি - + Password is empty খালী পাছৱৰ্ড @@ -2521,22 +2573,6 @@ The installer will quit and all changes will be lost. সুচীৰ পৰা পণ্য এটা বাচনি কৰক। বাচনি কৰা পণ্যটো ইনস্তল হ'ব। - - PackageChooserQmlViewStep - - - Packages - পেকেজ - - - - PackageChooserViewStep - - - Packages - পেকেজ - - PackageModel @@ -3065,7 +3101,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3389,12 +3425,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: উত্কৃষ্ট ফলাফলৰ বাবে অনুগ্ৰহ কৰি নিশ্চিত কৰক যে এইটো কম্পিউটাৰ হয়: - + System requirements চিছটেমৰ আৱশ্যকতাবোৰ @@ -3822,22 +3858,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">ব্যৱহাৰকাৰীৰ অধিক তথ্য পাবলৈ ইয়াত ক্লিক কৰক</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. এইটো বাচনি কৰি আপুনি ইনস্তলচেন​ আৰু হাৰ্ডৱেৰৰ বিষয়ে তথ্য পঠাব। ইনস্তলচেন​ৰ পিছত <b>এই তথ্য এবাৰ পঠোৱা হ'ব</b>। - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. এইটো বাচনি কৰি আপুনি ইনস্তলচেন​, হাৰ্ডৱেৰ আৰু এপ্লিকেচনৰ বিষয়ে <b>মেচিন</b> %1লৈ তথ্য পঠাব। - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. এইটো বাচনি কৰি আপুনি ইনস্তলচেন​, হাৰ্ডৱেৰ আৰু এপ্লিকেচনৰ বিষয়ে <b>ব্যৱহাৰকৰ্তা</b> %1লৈ তথ্য পঠাব। @@ -4025,44 +4061,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>%1ৰ কেলামাৰেচ চেত্ আপ প্ৰগ্ৰামলৈ আদৰণি জনাইছো।</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1> %1 চেত্ আপলৈ আদৰণি জনাইছো।</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>%1ৰ কেলামাৰেচ ইনস্তলাৰলৈ আদৰণি জনাইছো।</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>%1 ইনস্তলাৰলৈ আদৰণি জনাইছো।</h1> - - - %1 support %1 সহায় - + About %1 setup %1 চেত্ আপ প্ৰগ্ৰামৰ বিষয়ে - + About %1 installer %1 ইনস্তলাৰৰ বিষয়ে - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>ৰ বাবে %3</strong><br/><br/> মালিকিস্বত্ত 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>মালিকিস্বত্ত 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/><a href="https://calamares.io/team/">Calamares দল</a> আৰু <a href="https://www.transifex.com/calamares/calamares/">কেলামাৰেচ অনুবাদক দল</a>ক ধন্যবাদ জনাইছো।<br/><br/><a href="https://calamares.io/">Calamares</a>ৰ বিকাশ<br/><a href="http://www.blue-systems.com/">Blue Systems</a>- Liberating Softwareৰ দ্বাৰা প্ৰযোজিত। - WelcomeQmlViewStep @@ -4127,23 +4138,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back পাছলৈ @@ -4245,17 +4240,17 @@ Output: কিবোৰ্ড মডেল: - + Layouts লেআউট - + Type here to test your keyboard আপোনাৰ কিবোৰ্ড পৰীক্ষা কৰিবলৈ ইয়াত টাইপ কৰক - + Variants ভিন্ন ৰুপ @@ -4383,102 +4378,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. কেৱল lowercase বৰ্ণ, সংখ্যা, underscore আৰু hyphenৰ হে মাত্ৰ অনুমতি আছে। - + root is not allowed as username. - + What is the name of this computer? এইটো কম্পিউটাৰৰ নাম কি? - + Computer Name কম্পিউটাৰৰ নাম - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. আপোনাৰ একাউণ্ট সুৰক্ষিত ৰাখিবলৈ পাছৱৰ্ড এটা বাছনি কৰক। - + Password পাছৱৰ্ড - + Repeat Password পাছৱৰ্ড পুনৰ লিখক। - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. এই বাকচটো চিহ্নিত কৰিলে পাছ্ৱৰ্ডৰ প্ৰৱলতা কৰা হ'ব আৰু আপুনি দুৰ্বল পাছৱৰ্ড ব্যৱহাৰ কৰিব নোৱাৰিব। - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. প্ৰশাসনীয় একাউন্টৰ বাবে একে পাছৱৰ্ড্ ব্যৱহাৰ কৰক। - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts index cef63bb3e..1a510b3f5 100644 --- a/lang/calamares_ast.ts +++ b/lang/calamares_ast.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information Información de la depuración @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Fecho @@ -261,7 +280,7 @@ Completóse la comprobación de requirimientos del módulu <i>%1</i> - + Waiting for %n module(s). Esperando por %n módulu @@ -269,7 +288,7 @@ - + (%n second(s)) (%n segundu) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. Completóse la comprobación de los requirimientos del sistema. @@ -484,12 +503,12 @@ L'instalador va colar y van perdese tolos cambeos. CalamaresWindow - + %1 Setup Program Programa de configuración de %1 - + %1 Installer Instalador de %1 @@ -528,149 +547,149 @@ L'instalador va colar y van perdese tolos cambeos. Formulariu - + Select storage de&vice: Esbilla un preséu d'al&macenamientu: - - - - + + + + Current: Anguaño: - + After: Dempués: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Particionáu manual</strong><br/>Vas poder crear o redimensionar particiones. - + Reuse %1 as home partition for %2. Reusu de %s como partición d'aniciu pa %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Esbilla una partición a redimensionar, dempués arrastra la barra baxera pa facelo</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 va redimensionase a %2MB y va crease una partición de %3MB pa %4. - + Boot loader location: Allugamientu del xestor d'arrinque: - + <strong>Select a partition to install on</strong> <strong>Esbilla una partición na qu'instalar</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. 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. - + The EFI system partition at %1 will be used for starting %2. La partición del sistema EFI en %1 va usase p'aniciar %2. - + EFI system partition: Partición del sistema EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Esti preséu d'almacenamientu nun paez que tenga un sistema operativu nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Desaniciu d'un discu</strong><br/>Esto va <font color="red">desaniciar</font> tolos datos presentes nel preséu d'almacenamientu esbilláu. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instalación anexa</strong><br/>L'instalador va redimensionar una partición pa dexar sitiu a %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Troquéu d'una partición</strong><br/>Troca una parción con %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Esti preséu d'almacenamientu tien %1 nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Esti preséu d'almacenamientu yá tien un sistema operativu nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Esti preséu d'almacenamientu tien varios sistemes operativos nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap Ensin intercambéu - + Reuse Swap Reusar un intercambéu - + Swap (no Hibernate) Intercambéu (ensin ivernación) - + Swap (with Hibernate) Intercambéu (con ivernación) - + Swap to file Intercambéu nun ficheru @@ -758,27 +777,27 @@ L'instalador va colar y van perdese tolos cambeos. Config - + Set keyboard model to %1.<br/> Va afitase'l modelu del tecláu a %1.<br/> - + Set keyboard layout to %1/%2. Va afitase la distrubución del tecláu a %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. La llingua del sistema va afitase a %1. - + The numbers and dates locale will be set to %1. La númberación y data van afitase en %1. @@ -813,97 +832,97 @@ L'instalador va colar y van perdese tolos cambeos. Instalación per rede. (Desactivada: Nun pue dise en cata de les llistes de paquetes, comprueba la conexón a internet) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Esti ordenador nun satisfaz dalgún de los requirimientos mínimos pa configurar %1.<br/>La configuración nun pue siguir. <a href="#details">Detalles...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Esti ordenador nun satisfaz los requirimientos mínimos pa instalar %1.<br/>La instalación nun pue siguir. <a href="#details">Detalles...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Esti ordenador nun satisfaz dalgún de los requirimientos aconseyaos pa configurar %1.<br/>La configuración pue siguir pero dalgunes carauterístiques podríen desactivase. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Esti ordenador nun satisfaz dalgún requirimientu aconseyáu pa instalar %1.<br/>La instalación pue siguir pero podríen desactivase dalgunes carauterístiques. - + This program will ask you some questions and set up %2 on your computer. Esti programa va facete dalgunes entrugues y va configurar %2 nel ordenador. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Afáyate nel programa de configuración de Calamares pa %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Afáyate na configuración de %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Afáyate nel instalador Calamares pa %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Afáyate nel instalador de %1</h1> - + Your username is too long. El nome d'usuariu ye perllargu. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. El nome d'agospiu ye percurtiu. - + Your hostname is too long. El nome d'agospiu ye perllargu. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! ¡Les contraseñes nun concasen! - + OK! @@ -959,11 +978,16 @@ L'instalador va colar y van perdese tolos cambeos. + Packages + Paquetes + + + Install option: <strong>%1</strong> - + None @@ -1422,6 +1446,16 @@ L'instalador va colar y van perdese tolos cambeos. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1451,8 +1485,8 @@ L'instalador va colar y van perdese tolos cambeos. Confirmación de la fras de pasu - - + + Please enter the same passphrase in both boxes. Introduz la mesma fras de pasu en dambes caxes, por favor. @@ -1541,32 +1575,32 @@ L'instalador va colar y van perdese tolos cambeos. &Reaniciar agora - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Too fecho.</h1><br/>%1 configuróse nel ordenador.<br/>Agora pues usar el sistema nuevu. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Cuando se conseña esti caxellu, el sistema va reaniciase nel intre cuando calques en <span style="font-style:italic;">Fecho</span> o zarres el programa de configuración.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Too fecho.</h1><br/>%1 instalóse nel ordenador.<br/>Agora pues renaiciar nel sistema nuevu o siguir usando l'entornu live de %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Cuando se conseña esti caxellu, el sistema va reaniciase nel intre cuando calques en <span style="font-style:italic;">Fecho</span> o zarres l'instalador.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Falló la configuración</h1><br/>%1 nun se configuró nel ordenador.<br/>El mensaxe de fallu foi: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Falló la instalación</h1><br/>%1 nun s'instaló nel ordenador.<br/>El mensaxe de fallu foi: %2. @@ -1600,12 +1634,18 @@ L'instalador va colar y van perdese tolos cambeos. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formatiando la partición %1 col sistema de ficheros %2. - + The installer failed to format partition %1 on disk '%2'. L'instalador falló al formatiar la partición %1 nel discu «%2». @@ -1613,12 +1653,12 @@ L'instalador va colar y van perdese tolos cambeos. GeneralRequirements - + has at least %1 GiB available drive space tien polo menos %1 GiB d'espaciu disponible nel discu - + There is not enough drive space. At least %1 GiB is required. Nun hai espaciu abondu nel discu. Ríquense polo menos %1 GiB. @@ -1658,27 +1698,27 @@ L'instalador va colar y van perdese tolos cambeos. ta executando l'instalador como alministrador (root) - + The setup program is not running with administrator rights. El programa de configuración nun ta executándose con drechos alministrativos. - + The installer is not running with administrator rights. L'instalador nun ta executándose con drechos alministrativos. - + has a screen large enough to show the whole installer tien una pantalla abondo grande como p'amosar tol instalador - + The screen is too small to display the setup program. La pantalla ye mui pequeña como p'amosar el programa de configuración. - + The screen is too small to display the installer. La pantalla ye mui pequeña como p'amosar l'instalador. @@ -1978,35 +2018,35 @@ L'instalador va colar y van perdese tolos cambeos. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2032,12 +2072,12 @@ L'instalador va colar y van perdese tolos cambeos. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2047,100 +2087,112 @@ L'instalador va colar y van perdese tolos cambeos. NetInstallViewStep - + Package selection Esbilla de paquetes - + Office software Software ofimáticu - + Office package Paquete ofimáticu - + Browser software - + Browser package - + Web browser Restolador web - + Kernel + label for netinstall module, Linux kernel Kernel - + Services + label for netinstall module, system services Servicios - - - Login - - - Desktop - Escritoriu + Login + label for netinstall module, choose login manager + - Applications - Aplicaciones - - - - Communication - Comunicación + Desktop + label for netinstall module, choose desktop environment + Escritoriu - Development - Desendolcu + Communication + label for netinstall module + Comunicación - Office - Oficina + Development + label for netinstall module + Desendolcu - Multimedia - Multimedia + Office + label for netinstall module + Oficina - Internet - Internet + Multimedia + label for netinstall module + Multimedia - Theming - Estilu + Internet + label for netinstall module + Internet - Gaming - + Theming + label for netinstall module + Estilu + Gaming + label for netinstall module + + + + Utilities + label for netinstall module Utilidaes + + + Applications + Aplicaciones + NotesQmlViewStep @@ -2189,24 +2241,24 @@ L'instalador va colar y van perdese tolos cambeos. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2481,7 +2533,7 @@ L'instalador va colar y van perdese tolos cambeos. Desconozse'l fallu - + Password is empty La contraseña ta balera @@ -2519,22 +2571,6 @@ L'instalador va colar y van perdese tolos cambeos. - - PackageChooserQmlViewStep - - - Packages - Paquetes - - - - PackageChooserViewStep - - - Packages - Paquetes - - PackageModel @@ -3063,7 +3099,7 @@ Salida: QObject - + %1 (%2) %1 (%2) @@ -3389,12 +3425,12 @@ Salida: ResultsListDialog - + For best results, please ensure that this computer: Pa los meyores resultaos, asegúrate qu'esti ordenador: - + System requirements Requirimientos del sistema @@ -3822,22 +3858,22 @@ Salida: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Calca equí pa más información tocante al siguimientu d'usuarios</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Al esbillar esto vas unviar información tocante a la instalación y el hardware. Esta información va unviase namás <b>una vegada</b> dempués de finar la instalación. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4025,44 +4061,19 @@ Salida: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Afáyate nel programa de configuración de Calamares pa %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Afáyate na configuración de %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Afáyate nel instalador Calamares de %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Afáyate nel instalador de %1.</h1> - - - %1 support Sofitu de %1 - + About %1 setup Tocante a la configuración de %1 - + About %1 installer Tocante al instalador de %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4127,23 +4138,7 @@ Salida: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4243,17 +4238,17 @@ Salida: Modelu del tecláu: - + Layouts - + Type here to test your keyboard Teclexa equí pa probar el tecláu - + Variants Variantes @@ -4380,102 +4375,102 @@ Salida: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? ¿Cómo va llamase esti ordenador? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Escueyi una contraseña pa caltener segura la cuenta. - + Password Contraseña - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. Usar la mesma contraseña pa la cuenta d'alministrador. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts index 15e4532a6..3954fdcef 100644 --- a/lang/calamares_az.ts +++ b/lang/calamares_az.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Vidjetlər ağacı - + Debug information Sazlama məlumatları @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Quraşdırılma başa çatdı @@ -261,7 +280,7 @@ <i>%1</i>üçün tələblərin yoxlanılması başa çatdı. - + Waiting for %n module(s). %n modul üçün gözləmə. @@ -269,7 +288,7 @@ - + (%n second(s)) (%n saniyə(lər)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. Sistem uyğunluqları yoxlaması başa çatdı. @@ -488,12 +507,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CalamaresWindow - + %1 Setup Program %1 Quraşdırıcı proqram - + %1 Installer %1 Quraşdırıcı @@ -532,149 +551,149 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Format - + Select storage de&vice: Yaddaş ci&hazını seçmək: - - - - + + + + Current: Cari: - + After: Sonra: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Əl ilə bölmək</strong><br/>Siz bölməni özünüz yarada və ölçüsünü dəyişə bilərsiniz. - + Reuse %1 as home partition for %2. %1 Ev bölməsi olaraq %2 üçün istifadə edilsin. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Kiçiltmək üçün bir bölmə seçərək altdakı çübüğü sürüşdürərək ölçüsünü verin</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 %2MB-a qədər azalacaq və %4 üçün yeni bölmə %3MB disk bölməsi yaradılacaq. - + Boot loader location: Ön yükləyici (boot) yeri: - + <strong>Select a partition to install on</strong> <strong>Quraşdırılacaq disk bölməsini seçin</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. EFI sistem bölməsi tapılmadı. Geriyə qayıdın və %1 bölməsini əllə yaradın. - + The EFI system partition at %1 will be used for starting %2. %1 EFI sistemi %2 başlatmaq üçün istifadə olunacaqdır. - + EFI system partition: EFI sistem bölməsi: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Bu cihazıda əməliyyat sistemi görünmür. Nə etmək istəyərdiniz?<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Diski təmizləmək</strong><br/> <font color="red">Silmək</font>seçimi hal-hazırda, seçilmiş diskdəki bütün verilənləri siləcəkdir. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Yanına quraşdırın</strong><br/>Quraşdırıcı, bölməni kiçildərək %1 üçün boş disk sahəsi yaradacaqdır. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Bölməni başqası ilə əvəzləmək</strong><br/>Bölməni %1 ilə əvəzləyir. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Bu cihazda %1 var. Nə etmək istəyirsiniz?<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Bu cihazda artıq bir əməliyyat sistemi var. Nə etmək istərdiniz?.<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Bu cihazda bir neçə əməliyyat sistemi mövcuddur. Nə etmək istərdiniz? Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Bu yaddaş qurğusunda artıq əməliyyat sistemi var, lakin, bölmə cədvəli <strong>%1</strong>, lazım olan <strong>%2</strong> ilə fərqlidir.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Bu yaddaş qurğusunda bölmələrdən biri <strong>quraşdırılmışdır</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Bu yaddaş qurğusu <strong>qeyri-aktiv RAİD</strong> qurğusunun bir hissəsidir. - + No Swap Mübadilə bölməsi olmadan - + Reuse Swap Mövcud mübadilə bölməsini istifadə etmək - + Swap (no Hibernate) Mübadilə bölməsi (yuxu rejimi olmadan) - + Swap (with Hibernate) Mübadilə bölməsi (yuxu rejimi ilə) - + Swap to file Mübadilə faylı @@ -762,27 +781,27 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Config - + Set keyboard model to %1.<br/> Klaviatura modelini %1 olaraq təyin etmək.<br/> - + Set keyboard layout to %1/%2. Klaviatura qatını %1/%2 olaraq təyin etmək. - + Set timezone to %1/%2. Saat quraşağını təyin etmək %1/%2 - + The system language will be set to %1. Sistem dili %1 təyin ediləcək. - + The numbers and dates locale will be set to %1. Yerli say və tarix formatı %1 təyin olunacaq. @@ -817,97 +836,97 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Şəbəkə üzərindən quraşdırmaq (Söndürüldü: paket siyahıları qəbul edilmir, şəbəkə bağlantınızı yoxlayın) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər. - + This program will ask you some questions and set up %2 on your computer. Bu proqram sizə bəzi suallar verəcək və %2 əməliyyat sistemini sizin komputerinizə qurmağa kömək edəcək. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>%1 üçün Calamares quraşdırma proqramına xoş gəldiniz!</h1> - + <h1>Welcome to %1 setup</h1> <h1>%1 quraşdırmaq üçün xoş gəldiniz</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>%1 üçün Calamares quraşdırıcısına xoş gəldiniz!</h1> - + <h1>Welcome to the %1 installer</h1> <h1>%1 quraşdırıcısına xoş gəldiniz</h1> - + Your username is too long. İstifadəçi adınız çox uzundur. - + '%1' is not allowed as username. İstifadəçi adı '%1' ola bilməz - + Your username must start with a lowercase letter or underscore. İstifadəçi adınız yalnız kiçik və ya alt cizgili hərflərdən ibarət olmalıdır. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Yalnız kiçik hərflərdən, simvollardan, alt cizgidən və defisdən istifadə oluna bilər. - + Your hostname is too short. Host adınız çox qısadır. - + Your hostname is too long. Host adınız çox uzundur. - + '%1' is not allowed as hostname. Host_adı '%1' ola bilməz - + Only letters, numbers, underscore and hyphen are allowed. Yalnız kiçik hərflərdən, saylardan, alt cizgidən və defisdən istifadə oluna bilər. - + Your passwords do not match! Şifrənizin təkrarı eyni deyil! - + OK! OLDU! @@ -963,11 +982,16 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. + Packages + Paketlər + + + Install option: <strong>%1</strong> Quraşdırma seçimi: <strong>%1</strong> - + None Heç biri @@ -1426,6 +1450,16 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.FS Label: FS yarlığı: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1455,8 +1489,8 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Şifrəni təsdiq edin - - + + Please enter the same passphrase in both boxes. Lütfən, hər iki sahəyə eyni şifrəni daxil edin. @@ -1545,32 +1579,32 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.&Yenidən başlatmaq - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Hər şey hazırdır.</h1><br/>%1 kompyuterinizə qurulub.<br/>Siz indi yeni sisteminizi başlada bilərsiniz. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Bu çərçivə işarələnərsə siz <span style="font-style:italic;">Hazır</span> düyməsinə vurduğunuz və ya quraşdırıcı proqramı bağlatdığınız zaman sisteminiz dərhal yenidən başladılacaqdır.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Hər şey hazırdır.</h1><br/>%1 kompyuterinizə quraşdırıldı.<br/>Siz yenidən başladaraq yeni sisteminizə daxil ola və ya %2 Canlı mühitini istifadə etməyə davam edə bilərsiniz. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Bu çərçivə işarələnərsə siz <span style="font-style:italic;">Hazır</span> düyməsinə vurduğunuz və ya quraşdırıcınıı bağladığınız zaman sisteminiz dərhal yenidən başladılacaqdır.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Quraşdırılma alınmadı</h1><br/>%1 kompyuterinizə quraşdırıla bilmədi.<br/>Baş vermiş xəta: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Quraşdırılma alınmadı</h1><br/>%1 kompyuterinizə quraşdırıla bilmədi.<br/>Baş vermiş xəta: %2. @@ -1604,12 +1638,18 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.<strong>%3MB</strong> bölməsini <strong>%2</strong> fayl sistemi ilə <strong>%1</strong> formatlamaq. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. %1 bölməsini %2 fayl sistemi ilə formatlamaq. - + The installer failed to format partition %1 on disk '%2'. Quraşdırıcı '%2' diskində %1 bölməsini formatlaya bilmədi. @@ -1617,12 +1657,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. GeneralRequirements - + has at least %1 GiB available drive space ən az %1 QB disk boş sahəsi var - + There is not enough drive space. At least %1 GiB is required. Kifayət qədər disk sahəsi yoxdur. Ən azı %1 QB tələb olunur. @@ -1662,27 +1702,27 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.quraşdırıcını adminstrator (root) imtiyazları ilə başladılması - + The setup program is not running with administrator rights. Quraşdırıcı adminstrator imtiyazları ilə başladılmayıb. - + The installer is not running with administrator rights. Quraşdırıcı adminstrator imtiyazları ilə başladılmayıb. - + has a screen large enough to show the whole installer quraşdırıcını tam göstərmək üçün ekran kifayət qədər genişdir - + The screen is too small to display the setup program. Quraşdırıcı proqramı göstərmək üçün ekran çox kiçikdir. - + The screen is too small to display the installer. Bu quarşdırıcını göstərmək üçün ekran çox kiçikdir. @@ -1982,35 +2022,35 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. LuksBootKeyFileJob - + Configuring LUKS key file. LUKS düymə faylını ayarlamaq. - - + + No partitions are defined. Heç bir bölmə müəyyən edilməyib. - - - + + + Encrypted rootfs setup error Kök fayl sisteminin şifrələnməsi xətası - + Root partition %1 is LUKS but no passphrase has been set. %1 Kök bölməsi LUKS-dur lakin, şifrə təyin olunmayıb. - + Could not create LUKS key file for root partition %1. %1 kök bölməsi üçün LUKS düymə faylı yaradılmadı. - + Could not configure LUKS key file on partition %1. %1 bölməsində LUKS düymə faylı tənzimlənə bilmədi. @@ -2036,12 +2076,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Map - + Timezone: %1 Saat qurşağı: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2053,100 +2093,112 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. NetInstallViewStep - + Package selection Paket seçimi - + Office software Ofis proqramı - + Office package Ofis paketi - + Browser software Veb bələdçi proqramı - + Browser package Veb bələdçi paketi - + Web browser Veb bələdçi - + Kernel + label for netinstall module, Linux kernel Nüvə - + Services + label for netinstall module, system services Xidmətlər - + Login + label for netinstall module, choose login manager Giriş - + Desktop + label for netinstall module, choose desktop environment İş Masası - - Applications - Tətbiqlər - - - + Communication + label for netinstall module Rabitə - + Development + label for netinstall module Tərtibat - + Office + label for netinstall module Ofis - + Multimedia + label for netinstall module Multimediya - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Mövzular, Temalar - + Gaming + label for netinstall module Oyun - + Utilities + label for netinstall module Vasitələr, Alətlər + + + Applications + Tətbiqlər + NotesQmlViewStep @@ -2195,24 +2247,24 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Üstünlük verdiyiniz Bölgənizi seçin və ilkin ayarlardan istifadə edin. - - - + + + Timezone: %1 Saat qurşağı: %1 - + Select your preferred Zone within your Region. Bölgənizlə birlikdə üstünlük verdiyiniz zonanı seçin. - + Zones Zonalar - + You can fine-tune Language and Locale settings below. Dil və Yer ayarlarını aşağıda dəqiq tənzimləyə bilərsiniz. @@ -2487,7 +2539,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Naməlum xəta - + Password is empty Şifrə böşdur @@ -2525,22 +2577,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Lütfən məhsulu siyahıdan seçin. Seçilmiş məhsul quraşdırılacaqdır. - - PackageChooserQmlViewStep - - - Packages - Paketlər - - - - PackageChooserViewStep - - - Packages - Paketlər - - PackageModel @@ -3070,7 +3106,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3396,12 +3432,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: Ən yaşxı nəticə üçün lütfən, əmin olun ki, bu kompyuter: - + System requirements Sistem tələbləri @@ -3829,22 +3865,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">İstifadəçi hesabatı haqqında daha çox məlumat üçün buraya klikləyin</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. İzləmə %1ə, cihazın neçə dəfə quraşdırıldığını, hansı cihazda quraşdırıldığını və hansı tətbiqlərdən istifadə olunduğunu görməyə kömək edir. Göndərilənləri görmək üçün hər sahənin yanındakı yardım işarəsini vurun. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Bunu seçərək quraşdırma və kompyuteriniz haqqında məlumat göndərəcəksiniz. Quraşdırma başa çatdıqdan sonra, bu məlumat yalnız <b>bir dəfə</b> göndəriləcəkdir. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Bu seçimdə siz vaxtaşırı <b>kompyuter</b> qurğularınız, avadanlıq və tətbiqləriniz haqqında %1-ə məlumat göndərəcəksiniz. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Bu seçimdə siz vaxtaşırı <b>istifadəçi</b> qurğularınız, avadanlıq və tətbiqləriniz haqqında %1-ə məlumat göndərəcəksiniz. @@ -4032,44 +4068,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>%1 üçün Calamares quraşdırma proqramına Xoş Gəldiniz.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>%1 quraşdırmaq üçün Xoş Gəldiniz.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1> %1 üçün Calamares quraşdırıcısına Xoş Gəldiniz.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>%1 quraşdırıcısına Xoş Gəldiniz.</h1> - - - %1 support %1 dəstəyi - + About %1 setup %1 quraşdırması haqqında - + About %1 installer %1 quraşdırıcısı haqqında - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>%3 üçün</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Təşəkkür edirik, <a href="https://calamares.io/team/">Calamares komandasına</a> və <a href="https://www.transifex.com/calamares/calamares/">Calamares tərcüməçilər komandasına</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> tərtibatçılarının sponsoru: <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4134,32 +4145,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - %3 üçün</strong><br/><br/> - Müəliff hüquqları 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt; - Müəliff hüquqları 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;8<br/> - <a href='https://calamares.io/team/'>Calamares komandasına</a> və - <a href='https://www.transifex.com/calamares/calamares/'>Calamares tərcümə komandasına</a> təşəkkürlər.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> tərtibatı <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software - tərəfindən dəstəklənir. - - - + Back Geriyə @@ -4264,17 +4250,17 @@ Output: Klaviatura modeli: - + Layouts Qatlar - + Type here to test your keyboard Buraya yazaraq klaviaturanı yoxlayın - + Variants Variantlar @@ -4423,102 +4409,102 @@ Output: Əgər bu komputeri bir neçə şəxs istifadə ediləcəksə o zaman quraşdırmadan sonra birdən çox hesab yarada bilərsiniz. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Yalnız kiçik hərflərdən, simvollardan, alt cizgidən və defisdən istifadə oluna bilər. - + root is not allowed as username. kökə istifadəçi_adı kimi icazə verilmir. - + What is the name of this computer? Bu kompyuterin adı nədir? - + Computer Name Kompyuterin adı - + This name will be used if you make the computer visible to others on a network. Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək. - + localhost is not allowed as hostname. yerli hosta host_adı kimi icazə verilmir. - + Choose a password to keep your account safe. Hesabınızın təhlükəsizliyi üçün şifrə seçin. - + Password Şifrə - + Repeat Password Şifrənin təkararı - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. Güclü şifrə üçün rəqəm, hərf və durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı və müntəzəm olaraq dəyişdirilməlidir. - + Validate passwords quality Şifrənin keyfiyyətini yoxlamaq - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Bu qutu işarələndikdə, şifrənin etibarlıq səviyyəsi yoxlanılır və siz zəif şifrədən istifadə edə bilməyəcəksiniz. - + Log in automatically without asking for the password Şifrə soruşmadan sistemə daxil olmaq - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Yalnız hərflərə, saylara, alt cizgisinə və tire işarəsinə icazə verilir, ən az iki simvol. - + Reuse user password as root password İstifadəçi şifrəsini kök şifrəsi kimi istifadə etmək - + Use the same password for the administrator account. İdarəçi hesabı üçün eyni şifrədən istifadə etmək. - + Choose a root password to keep your account safe. Hesabınızı qorumaq üçün kök şifrəsini seçin. - + Root Password Kök Şifrəsi - + Repeat Root Password Kök Şifrəsini təkrar yazın - + Enter the same password twice, so that it can be checked for typing errors. Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts index 9187001eb..98b3dbb2c 100644 --- a/lang/calamares_az_AZ.ts +++ b/lang/calamares_az_AZ.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Vidjetlər ağacı - + Debug information Sazlama məlumatları @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Quraşdırılma başa çatdı @@ -261,7 +280,7 @@ <i>%1</i>üçün tələblərin yoxlanılması başa çatdı. - + Waiting for %n module(s). %n modul üçün gözləmə. @@ -269,7 +288,7 @@ - + (%n second(s)) (%n saniyə(lər)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. Sistem uyğunluqları yoxlaması başa çatdı. @@ -488,12 +507,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CalamaresWindow - + %1 Setup Program %1 Quraşdırıcı proqram - + %1 Installer %1 Quraşdırıcı @@ -532,149 +551,149 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Format - + Select storage de&vice: Yaddaş ci&hazını seçmək: - - - - + + + + Current: Cari: - + After: Sonra: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Əl ilə bölmək</strong><br/>Siz bölməni özünüz yarada və ölçüsünü dəyişə bilərsiniz. - + Reuse %1 as home partition for %2. %1 Ev bölməsi olaraq %2 üçün istifadə edilsin. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Kiçiltmək üçün bir bölmə seçərək altdakı çübüğü sürüşdürərək ölçüsünü verin</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 %2MB-a qədər azalacaq və %4 üçün yeni bölmə %3MB disk bölməsi yaradılacaq. - + Boot loader location: Ön yükləyici (boot) yeri: - + <strong>Select a partition to install on</strong> <strong>Quraşdırılacaq disk bölməsini seçin</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. EFI sistem bölməsi tapılmadı. Geriyə qayıdın və %1 bölməsini əllə yaradın. - + The EFI system partition at %1 will be used for starting %2. %1 EFI sistemi %2 başlatmaq üçün istifadə olunacaqdır. - + EFI system partition: EFI sistem bölməsi: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Bu cihazıda əməliyyat sistemi görünmür. Nə etmək istəyərdiniz?<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Diski təmizləmək</strong><br/> <font color="red">Silmək</font>seçimi hal-hazırda, seçilmiş diskdəki bütün verilənləri siləcəkdir. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Yanına quraşdırın</strong><br/>Quraşdırıcı, bölməni kiçildərək %1 üçün boş disk sahəsi yaradacaqdır. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Bölməni başqası ilə əvəzləmək</strong><br/>Bölməni %1 ilə əvəzləyir. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Bu cihazda %1 var. Nə etmək istəyirsiniz?<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Bu cihazda artıq bir əməliyyat sistemi var. Nə etmək istərdiniz?.<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Bu cihazda bir neçə əməliyyat sistemi mövcuddur. Nə etmək istərdiniz? Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Bu yaddaş qurğusunda artıq əməliyyat sistemi var, lakin, bölmə cədvəli <strong>%1</strong>, lazım olan <strong>%2</strong> ilə fərqlidir.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Bu yaddaş qurğusunda bölmələrdən biri <strong>quraşdırılmışdır</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Bu yaddaş qurğusu <strong>qeyri-aktiv RAİD</strong> qurğusunun bir hissəsidir. - + No Swap Mübadilə bölməsi olmadan - + Reuse Swap Mövcud mübadilə bölməsini istifadə etmək - + Swap (no Hibernate) Mübadilə bölməsi (yuxu rejimi olmadan) - + Swap (with Hibernate) Mübadilə bölməsi (yuxu rejimi ilə) - + Swap to file Mübadilə faylı @@ -762,27 +781,27 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Config - + Set keyboard model to %1.<br/> Klaviatura modelini %1 olaraq təyin etmək.<br/> - + Set keyboard layout to %1/%2. Klaviatura qatını %1/%2 olaraq təyin etmək. - + Set timezone to %1/%2. Saat quraşağını təyin etmək %1/%2 - + The system language will be set to %1. Sistem dili %1 təyin ediləcək. - + The numbers and dates locale will be set to %1. Yerli say və tarix formatı %1 təyin olunacaq. @@ -817,97 +836,97 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Şəbəkə üzərindən quraşdırmaq (Söndürüldü: paket siyahıları qəbul edilmir, şəbəkə bağlantınızı yoxlayın) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər. - + This program will ask you some questions and set up %2 on your computer. Bu proqram sizə bəzi suallar verəcək və %2 əməliyyat sistemini sizin komputerinizə qurmağa kömək edəcək. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>%1 üçün Calamares quraşdırma proqramına xoş gəldiniz!</h1> - + <h1>Welcome to %1 setup</h1> <h1>%1 quraşdırmaq üçün xoş gəldiniz</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>%1 üçün Calamares quraşdırıcısına xoş gəldiniz!</h1> - + <h1>Welcome to the %1 installer</h1> <h1>%1 quraşdırıcısına xoş gəldiniz</h1> - + Your username is too long. İstifadəçi adınız çox uzundur. - + '%1' is not allowed as username. İstifadəçi adı '%1' ola bilməz - + Your username must start with a lowercase letter or underscore. İstifadəçi adınız yalnız kiçik və ya alt cizgili hərflərdən ibarət olmalıdır. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Yalnız kiçik hərflərdən, simvollardan, alt cizgidən və defisdən istifadə oluna bilər. - + Your hostname is too short. Host adınız çox qısadır. - + Your hostname is too long. Host adınız çox uzundur. - + '%1' is not allowed as hostname. Host_adı '%1' ola bilməz - + Only letters, numbers, underscore and hyphen are allowed. Yalnız kiçik hərflərdən, saylardan, alt cizgidən və defisdən istifadə oluna bilər. - + Your passwords do not match! Şifrənizin təkrarı eyni deyil! - + OK! OLDU! @@ -963,11 +982,16 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. + Packages + Paketlər + + + Install option: <strong>%1</strong> Quraşdırma seçimi: <strong>%1</strong> - + None Heç biri @@ -1426,6 +1450,16 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.FS Label: FS yarlığı: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1455,8 +1489,8 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Şifrəni təsdiq edin - - + + Please enter the same passphrase in both boxes. Lütfən, hər iki sahəyə eyni şifrəni daxil edin. @@ -1545,32 +1579,32 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.&Yenidən başlatmaq - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Hər şey hazırdır.</h1><br/>%1 kompyuterinizə qurulub.<br/>Siz indi yeni sisteminizi başlada bilərsiniz. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Bu çərçivə işarələnərsə siz <span style="font-style:italic;">Hazır</span> düyməsinə vurduğunuz və ya quraşdırıcı proqramı bağlatdığınız zaman sisteminiz dərhal yenidən başladılacaqdır.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Hər şey hazırdır.</h1><br/>%1 kompyuterinizə quraşdırıldı.<br/>Siz yenidən başladaraq yeni sisteminizə daxil ola və ya %2 Canlı mühitini istifadə etməyə davam edə bilərsiniz. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Bu çərçivə işarələnərsə siz <span style="font-style:italic;">Hazır</span> düyməsinə vurduğunuz və ya quraşdırıcınıı bağladığınız zaman sisteminiz dərhal yenidən başladılacaqdır.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Quraşdırılma alınmadı</h1><br/>%1 kompyuterinizə quraşdırıla bilmədi.<br/>Baş vermiş xəta: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Quraşdırılma alınmadı</h1><br/>%1 kompyuterinizə quraşdırıla bilmədi.<br/>Baş vermiş xəta: %2. @@ -1604,12 +1638,18 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.<strong>%3MB</strong> bölməsini <strong>%2</strong> fayl sistemi ilə <strong>%1</strong> formatlamaq. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. %1 bölməsini %2 fayl sistemi ilə formatlamaq. - + The installer failed to format partition %1 on disk '%2'. Quraşdırıcı '%2' diskində %1 bölməsini formatlaya bilmədi. @@ -1617,12 +1657,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. GeneralRequirements - + has at least %1 GiB available drive space ən az %1 QB disk boş sahəsi var - + There is not enough drive space. At least %1 GiB is required. Kifayət qədər disk sahəsi yoxdur. Ən azı %1 QB tələb olunur. @@ -1662,27 +1702,27 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.quraşdırıcını adminstrator (root) imtiyazları ilə başladılması - + The setup program is not running with administrator rights. Quraşdırıcı adminstrator imtiyazları ilə başladılmayıb. - + The installer is not running with administrator rights. Quraşdırıcı adminstrator imtiyazları ilə başladılmayıb. - + has a screen large enough to show the whole installer quraşdırıcını tam göstərmək üçün ekran kifayət qədər genişdir - + The screen is too small to display the setup program. Quraşdırıcı proqramı göstərmək üçün ekran çox kiçikdir. - + The screen is too small to display the installer. Bu quarşdırıcını göstərmək üçün ekran çox kiçikdir. @@ -1982,35 +2022,35 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. LuksBootKeyFileJob - + Configuring LUKS key file. LUKS düymə faylını ayarlamaq. - - + + No partitions are defined. Heç bir bölmə müəyyən edilməyib. - - - + + + Encrypted rootfs setup error Kök fayl sisteminin şifrələnməsi xətası - + Root partition %1 is LUKS but no passphrase has been set. %1 Kök bölməsi LUKS-dur lakin, şifrə təyin olunmayıb. - + Could not create LUKS key file for root partition %1. %1 kök bölməsi üçün LUKS düymə faylı yaradılmadı. - + Could not configure LUKS key file on partition %1. %1 bölməsində LUKS düymə faylı tənzimlənə bilmədi. @@ -2036,12 +2076,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Map - + Timezone: %1 Saat qurşağı: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2053,100 +2093,112 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. NetInstallViewStep - + Package selection Paket seçimi - + Office software Ofis proqramı - + Office package Ofis paketi - + Browser software Veb bələdçi proqramı - + Browser package Veb bələdçi paketi - + Web browser Veb bələdçi - + Kernel + label for netinstall module, Linux kernel Nüvə - + Services + label for netinstall module, system services Xidmətlər - + Login + label for netinstall module, choose login manager Giriş - + Desktop + label for netinstall module, choose desktop environment İş Masası - - Applications - Tətbiqlər - - - + Communication + label for netinstall module Rabitə - + Development + label for netinstall module Tərtibat - + Office + label for netinstall module Ofis - + Multimedia + label for netinstall module Multimediya - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Mövzular, Temalar - + Gaming + label for netinstall module Oyun - + Utilities + label for netinstall module Vasitələr, Alətlər + + + Applications + Tətbiqlər + NotesQmlViewStep @@ -2195,24 +2247,24 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Üstünlük verdiyiniz Bölgənizi seçin və ilkin ayarlardan istifadə edin. - - - + + + Timezone: %1 Saat qurşağı: %1 - + Select your preferred Zone within your Region. Bölgənizlə birlikdə üstünlük verdiyiniz zonanı seçin. - + Zones Zonalar - + You can fine-tune Language and Locale settings below. Dil və Yer ayarlarını aşağıda dəqiq tənzimləyə bilərsiniz. @@ -2487,7 +2539,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Naməlum xəta - + Password is empty Şifrə böşdur @@ -2525,22 +2577,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Lütfən məhsulu siyahıdan seçin. Seçilmiş məhsul quraşdırılacaqdır. - - PackageChooserQmlViewStep - - - Packages - Paketlər - - - - PackageChooserViewStep - - - Packages - Paketlər - - PackageModel @@ -3070,7 +3106,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3396,12 +3432,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: Ən yaşxı nəticə üçün lütfən, əmin olun ki, bu kompyuter: - + System requirements Sistem tələbləri @@ -3829,22 +3865,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">İstifadəçi hesabatı haqqında daha çox məlumat üçün buraya klikləyin</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. İzləmə %1ə, cihazın neçə dəfə quraşdırıldığını, hansı cihazda quraşdırıldığını və hansı tətbiqlərdən istifadə olunduğunu görməyə kömək edir. Göndərilənləri görmək üçün hər sahənin yanındakı yardım işarəsini vurun. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Bunu seçərək quraşdırma və kompyuteriniz haqqında məlumat göndərəcəksiniz. Quraşdırma başa çatdıqdan sonra, bu məlumat yalnız <b>bir dəfə</b> göndəriləcəkdir. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Bu seçimdə siz vaxtaşırı <b>kompyuter</b> qurğularınız, avadanlıq və tətbiqləriniz haqqında %1-ə məlumat göndərəcəksiniz. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Bu seçimdə siz vaxtaşırı <b>istifadəçi</b> qurğularınız, avadanlıq və tətbiqləriniz haqqında %1-ə məlumat göndərəcəksiniz. @@ -4032,44 +4068,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>%1 üçün Calamares quraşdırma proqramına Xoş Gəldiniz.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>%1 quraşdırmaq üçün Xoş Gəldiniz.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1> %1 üçün Calamares quraşdırıcısına Xoş Gəldiniz.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>%1 quraşdırıcısına Xoş Gəldiniz.</h1> - - - %1 support %1 dəstəyi - + About %1 setup %1 quraşdırması haqqında - + About %1 installer %1 quraşdırıcısı haqqında - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>%3 üçün</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Təşəkkür edirik, <a href="https://calamares.io/team/">Calamares komandasına</a> və <a href="https://www.transifex.com/calamares/calamares/">Calamares tərcüməçilər komandasına</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> tərtibatçılarının sponsoru: <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4134,32 +4145,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - %3 üçün</strong><br/><br/> - Müəliff hüquqları 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt; - Müəliff hüquqları 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;8<br/> - <a href='https://calamares.io/team/'>Calamares komandasına</a> və - <a href='https://www.transifex.com/calamares/calamares/'>Calamares tərcümə komandasına</a> təşəkkürlər.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> tərtibatı <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software - tərəfindən dəstəklənir. - - - + Back Geriyə @@ -4264,17 +4250,17 @@ Output: Klaviatura modeli: - + Layouts Qatlar - + Type here to test your keyboard Buraya yazaraq klaviaturanı yoxlayın - + Variants Variantlar @@ -4423,102 +4409,102 @@ Output: Əgər bu komputeri bir neçə şəxs istifadə ediləcəksə o zaman quraşdırmadan sonra birdən çox hesab yarada bilərsiniz. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Yalnız kiçik hərflərdən, simvollardan, alt cizgidən və defisdən istifadə oluna bilər. - + root is not allowed as username. kökə istifadəçi_adı kimi icazə verilmir. - + What is the name of this computer? Bu kompyuterin adı nədir? - + Computer Name Kompyuterin adı - + This name will be used if you make the computer visible to others on a network. Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək. - + localhost is not allowed as hostname. yerli hosta host_adı kimi icazə verilmir. - + Choose a password to keep your account safe. Hesabınızın təhlükəsizliyi üçün şifrə seçin. - + Password Şifrə - + Repeat Password Şifrənin təkararı - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. Güclü şifrə üçün rəqəm, hərf və durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı və müntəzəm olaraq dəyişdirilməlidir. - + Validate passwords quality Şifrənin keyfiyyətini yoxlamaq - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Bu qutu işarələndikdə, şifrənin etibarlıq səviyyəsi yoxlanılır və siz zəif şifrədən istifadə edə bilməyəcəksiniz. - + Log in automatically without asking for the password Şifrə soruşmadan sistemə daxil olmaq - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Yalnız hərflərə, saylara, alt cizgisinə və tire işarəsinə icazə verilir, ən az iki simvol. - + Reuse user password as root password İstifadəçi şifrəsini kök şifrəsi kimi istifadə etmək - + Use the same password for the administrator account. İdarəçi hesabı üçün eyni şifrədən istifadə etmək. - + Choose a root password to keep your account safe. Hesabınızı qorumaq üçün kök şifrəsini seçin. - + Root Password Kök Şifrəsi - + Repeat Root Password Kök Şifrəsini təkrar yazın - + Enter the same password twice, so that it can be checked for typing errors. Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts index 3aef95876..ceade48f3 100644 --- a/lang/calamares_be.ts +++ b/lang/calamares_be.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Дрэва віджэтаў - + Debug information Адладачная інфармацыя @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Завершана @@ -261,7 +280,7 @@ Праверка патрабаванняў да модуля <i>%1</i> выкананая. - + Waiting for %n module(s). Чакаецца %n модуль. @@ -271,7 +290,7 @@ - + (%n second(s)) (%n секунда) @@ -281,7 +300,7 @@ - + System-requirements checking is complete. Праверка адпаведнасці сістэмным патрабаванням завершаная. @@ -486,12 +505,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Праграма ўсталёўкі %1 - + %1 Installer Праграма ўсталёўкі %1 @@ -530,149 +549,149 @@ The installer will quit and all changes will be lost. Форма - + Select storage de&vice: Абраць &прыладу захоўвання: - - - - + + + + Current: Бягучы: - + After: Пасля: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Уласнаручная разметка</strong><br/>Вы можаце самастойна ствараць раздзелы або змяняць іх памеры. - + Reuse %1 as home partition for %2. Выкарыстаць %1 як хатні раздзел для %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Абярыце раздзел для памяншэння і цягніце паўзунок, каб змяніць памер</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 будзе паменшаны да %2MiB і новы раздзел %3MiB будзе створаны для %4. - + Boot loader location: Размяшчэнне загрузчыка: - + <strong>Select a partition to install on</strong> <strong>Абярыце раздзел для ўсталёўкі </strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Не выяўлена сістэмнага раздзела EFI. Калі ласка, вярніцеся назад і зрабіце разметку %1. - + The EFI system partition at %1 will be used for starting %2. Сістэмны раздзел EFI на %1 будзе выкарыстаны для запуску %2. - + EFI system partition: Сістэмны раздзел EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Здаецца, на гэтай прыладзе няма аперацыйнай сістэмы. Што будзеце рабіць?<br/>Вы зможаце змяніць альбо пацвердзіць свой выбар да таго як на прыладзе ўжывуцца змены. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Сцерці дыск</strong><br/>Гэта <font color="red">выдаліць</font> усе даныя на абранай прыладзе. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Усталяваць побач</strong><br/>Праграма ўсталёўкі паменшыць раздзел, каб вызваліць месца для %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Замяніць раздзел </strong><br/>Заменіць раздзел на %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. На гэтай прыладзе ёсць %1. Што будзеце рабіць?<br/>Вы зможаце змяніць альбо пацвердзіць свой выбар да таго як на прыладзе ўжывуцца змены. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. На гэтай прыладзе ўжо ёсць аперацыйная сістэма. Што будзеце рабіць?<br/>Вы зможаце змяніць альбо пацвердзіць свой выбар да таго як на прыладзе ўжывуцца змены. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. На гэтай прыладзе ўжо ёсць некалькі аперацыйных сістэм. Што будзеце рабіць?<br/>Вы зможаце змяніць альбо пацвердзіць свой выбар да таго як на прыладзе ўжывуцца змены. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> На гэтай прыладзе ўжо ўсталяваная аперацыйная сістэма, але табліца раздзелаў <strong>%1</strong> не такая, як патрэбна <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Адзін з раздзелаў гэтай назапашвальнай прылады<strong>прымантаваны</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Гэтая назапашвальная прылада ёсць часткай<strong>неактыўнага RAID</strong>. - + No Swap Без раздзела падпампоўкі - + Reuse Swap Выкарыстаць існы раздзел падпампоўкі - + Swap (no Hibernate) Раздзел падпампоўкі (без усыплення) - + Swap (with Hibernate) Раздзел падпампоўкі (з усыпленнем) - + Swap to file Раздзел падпампоўкі ў файле @@ -760,27 +779,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Вызначыць мадэль клавіятуры %1.<br/> - + Set keyboard layout to %1/%2. Вызначыць раскладку клавіятуры %1/%2. - + Set timezone to %1/%2. Вызначыць часавы пояс %1/%2. - + The system language will be set to %1. Сістэмнай мовай будзе зроблена %1. - + The numbers and dates locale will be set to %1. Рэгіянальным фарматам лічбаў і датаў будзе %1. @@ -815,97 +834,97 @@ The installer will quit and all changes will be lost. Сеткавая ўсталёўка. (Адключана: немагчыма атрымаць спіс пакункаў, праверце ваша сеткавае злучэнне) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Гэты камп’ютар не адпавядае мінімальным патрэбам для ўсталёўкі %1.<br/>Немагчыма працягнуць. <a href="#details">Падрабязней...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Гэты камп’ютар не адпавядае мінімальным патрэбам для ўсталёўкі %1.<br/>Немагчыма працягнуць. <a href="#details">Падрабязней...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Гэты камп’ютар адпавядае не ўсім патрэбам для ўсталёўкі %1.<br/>Можна працягнуць усталёўку, але некаторыя магчымасці могуць быць недаступнымі. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Гэты камп’ютар адпавядае не ўсім патрэбам для ўсталёўкі %1.<br/>Можна працягнуць усталёўку, але некаторыя магчымасці могуць быць недаступнымі. - + This program will ask you some questions and set up %2 on your computer. Гэтая праграма задасць вам некалькі пытанняў і дапаможа ўсталяваць %2 на ваш камп’ютар. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Вітаем у праграме ўсталёўкі Calamares для %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Вітаем у праграме ўсталёўкі %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Вітаем у праграме ўсталёўкі Calamares для %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Вітаем у праграме ўсталёўкі %1</h1> - + Your username is too long. Імя карыстальніка занадта доўгае. - + '%1' is not allowed as username. '%1' немагчыма выкарыстаць як імя карыстальніка. - + Your username must start with a lowercase letter or underscore. Імя карыстальніка павінна пачынацца з малой літары альбо сімвала падкрэслівання. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Дазваляюцца толькі літары, лічбы, знакі падкрэслівання, працяжнікі. - + Your hostname is too short. Назва вашага камп’ютара занадта кароткая. - + Your hostname is too long. Назва вашага камп’ютара занадта доўгая. - + '%1' is not allowed as hostname. '%1' немагчыма выкарыстаць як назву хоста. - + Only letters, numbers, underscore and hyphen are allowed. Толькі літары, лічбы, знакі падкрэслівання, працяжнікі. - + Your passwords do not match! Вашыя паролі не супадаюць! - + OK! @@ -961,11 +980,16 @@ The installer will quit and all changes will be lost. + Packages + Пакункі + + + Install option: <strong>%1</strong> - + None @@ -1424,6 +1448,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1453,8 +1487,8 @@ The installer will quit and all changes will be lost. Пацвердзіце парольную фразу - - + + Please enter the same passphrase in both boxes. Калі ласка, увядзіце адную і тую парольную фразу ў абодва радкі. @@ -1543,32 +1577,32 @@ The installer will quit and all changes will be lost. &Перазапусціць - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Гатова.</h1><br/>Сістэма %1 усталяваная на ваш камп’ютар.<br/> Вы ўжо можаце пачаць выкарыстоўваць вашу новую сістэму. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Калі адзначана, то сістэма перазапусціцца адразу пасля націскання кнопкі <span style="font-style:italic;">Завершана</span> альбо закрыцця праграмы ўсталёўкі.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Завершана.</h1><br/>Сістэма %1 усталяваная на ваш камп’ютар.<br/>Вы можаце перазапусціць камп’ютар і ўвайсці ў яе, альбо працягнуць працу ў Live-асяроддзі %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Калі адзначана, то сістэма перазапусціцца адразу пасля націскання кнопкі <span style="font-style:italic;">Завершана</span> альбо закрыцця праграмы ўсталёўкі.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Адбыўся збой</h1><br/>Сістэму %1 не атрымалася ўсталяваць на ваш камп’ютар.<br/>Паведамленне памылкі: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Адбыўся збой</h1><br/>Сістэму %1 не атрымалася ўсталяваць на ваш камп’ютар.<br/>Паведамленне памылкі: %2. @@ -1602,12 +1636,18 @@ The installer will quit and all changes will be lost. Фарматаваць раздзел <strong>%3MiB</strong> <strong>%1</strong> у файлавую сістэму <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Фарматаванне раздзела %1 ў файлавую сістэму %2. - + The installer failed to format partition %1 on disk '%2'. У праграмы ўсталёўкі не атрымалася адфарматаваць раздзел %1 на дыску '%2'. @@ -1615,12 +1655,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space даступна прынамсі %1 Гб вольнага месца - + There is not enough drive space. At least %1 GiB is required. Недастаткова месца. Неабходна прынамсі %1 Гб. @@ -1660,27 +1700,27 @@ The installer will quit and all changes will be lost. праграма ўсталёўкі запушчаная ад імя адміністратара (root) - + The setup program is not running with administrator rights. Праграма ўсталёўкі запушчаная без правоў адміністратара. - + The installer is not running with administrator rights. Праграма ўсталёўкі запушчаная без правоў адміністратара. - + has a screen large enough to show the whole installer ёсць экран, памераў якога дастаткова, каб адлюстраваць акно праграмы ўсталёўкі - + The screen is too small to display the setup program. Экран занадта малы для таго, каб адлюстраваць акно праграмы ўсталёўкі. - + The screen is too small to display the installer. Экран занадта малы для таго, каб адлюстраваць акно праграмы ўсталёўкі. @@ -1980,35 +2020,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. Наладка файла ключа LUKS. - - + + No partitions are defined. Раздзелаў не вызначана. - - - + + + Encrypted rootfs setup error Не атрымалася зашыфраваць rootfs - + Root partition %1 is LUKS but no passphrase has been set. Каранёвы раздзел %1 зашыфраваны як LUKS, але парольная фраза не была вызначаная. - + Could not create LUKS key file for root partition %1. Не атрымалася стварыць файл ключа LUKS для каранёвага раздзела %1. - + Could not configure LUKS key file on partition %1. Не атрымалася наладзіць файл ключа LUKS на каранёвым раздзеле %1. @@ -2034,12 +2074,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 Часавы пояс: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2051,100 +2091,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection Выбар пакункаў - + Office software Офіс - + Office package Офісны пакунак - + Browser software Браўзер - + Browser package Пакунак браўзера - + Web browser Вэб-браўзер - + Kernel + label for netinstall module, Linux kernel Ядро - + Services + label for netinstall module, system services Службы - + Login + label for netinstall module, choose login manager Лагін - + Desktop + label for netinstall module, choose desktop environment Працоўнае асяроддзе - - Applications - Праграмы - - - + Communication + label for netinstall module Стасункі - + Development + label for netinstall module Распрацоўка - + Office + label for netinstall module Офіс - + Multimedia + label for netinstall module Медыя - + Internet + label for netinstall module Інтэрнэт - + Theming + label for netinstall module Афармленне - + Gaming + label for netinstall module Гульні - + Utilities + label for netinstall module Утыліты + + + Applications + Праграмы + NotesQmlViewStep @@ -2193,24 +2245,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 Часавы пояс: %1 - + Select your preferred Zone within your Region. Абярыце часавы пояс для вашага рэгіёна. - + Zones Часавыя паясы - + You can fine-tune Language and Locale settings below. Ніжэй вы можаце наладзіць мову і мясцовасць. @@ -2503,7 +2555,7 @@ The installer will quit and all changes will be lost. Невядомая памылка - + Password is empty Пароль пусты @@ -2541,22 +2593,6 @@ The installer will quit and all changes will be lost. Калі ласка, абярыце прадукт са спіса. Абраны прадукт будзе ўсталяваны. - - PackageChooserQmlViewStep - - - Packages - Пакункі - - - - PackageChooserViewStep - - - Packages - Пакункі - - PackageModel @@ -3085,7 +3121,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3411,12 +3447,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: Для дасягнення найлепшых вынікаў пераканайцеся, што гэты камп’ютар: - + System requirements Сістэмныя патрабаванні @@ -3844,22 +3880,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Пстрыкніце сюды, каб праглядзець больш звестак зваротнай сувязі ад карыстальнікаў</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Адсочванне дапамагае праекту %1 бачыць, як часта ён усталёўваецца, на якім абсталяванні ён усталёўваецца, якія праграмы выкарыстоўваюцца. Каб убачыць, што будзе адпраўлена, пстрыкніце па значку ля кожнай вобласці. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Абраўшы гэты пункт вы адправіце звесткі пра сваю канфігурацыю ўсталёўкі і ваша абсталяванне. Звесткі адправяцца <b>адзін раз</b> пасля завяршэння ўсталёўкі. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Абраўшы гэты пункт вы будзеце перыядычна адпраўляць звесткі пра усталёўку, абсталяванне і праграмы вашага <b>камп'ютара</b> на %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Абраўшы гэты пункт вы будзеце перыядычна адпраўляць звесткі пра усталёўку, абсталяванне, праграмы <b>карыстальніка</b> і вобласці іх выкарыстання на %1. @@ -4047,44 +4083,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Вітаем у праграме ўсталёўкі Calamares для %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Вітаем у праграме ўсталёўкі %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Вітаем у Calamares для %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Вітаем у праграме ўсталёўкі %1.</h1> - - - %1 support падтрымка %1 - + About %1 setup Пра ўсталёўку %1 - + About %1 installer Пра %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Аўтарскія правы 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Аўтарскія правы 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Шчырыя падзякі <a href="https://calamares.io/team/">камандзе распрацоўкі Calamares</a> і <a href="https://www.transifex.com/calamares/calamares/">камандзе перакладчыкаў Calamares</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> распрацоўваецца пры падтрымцы<br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4149,33 +4160,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Аўтарскія правы 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Аўтарскія правы 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Шчырыя падзякі <a href='https://calamares.io/team/'>камандзе распрацоўкі Calamares </a> - і <a href='https://www.transifex.com/calamares/calamares/'> перакладчыкам Calamares</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - распрацоўваецца пры падтрымцы <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back Назад @@ -4277,17 +4262,17 @@ Output: Мадэль клавіятуры: - + Layouts Раскладкі - + Type here to test your keyboard Радок уводу для праверкі вашай клавіятуры - + Variants Варыянты @@ -4436,102 +4421,102 @@ Output: Калі камп’ютарам карыстаецца некалькі чалавек, то вы можаце стварыць для іх акаўнты пасля завяршэння ўсталёўкі. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Дазваляюцца толькі літары, лічбы, знакі падкрэслівання, працяжнікі. - + root is not allowed as username. - + What is the name of this computer? Якая назва гэтага камп’ютара? - + Computer Name Назва камп’ютара - + This name will be used if you make the computer visible to others on a network. Назва будзе выкарыстоўвацца для пазначэння камп’ютара ў сетцы. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Абярыце пароль для абароны вашага акаўнта. - + Password Пароль - + Repeat Password Паўтарыце пароль - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Увядзіце двойчы аднолькавы пароль. Гэта неабходна для таго, каб пазбегнуць памылак. Надзейны пароль павінен складацца з літар, лічбаў, знакаў пунктуацыі. Ён павінен змяшчаць прынамсі 8 знакаў, яго перыядычна трэба змяняць. - + Validate passwords quality Праверка якасці пароляў - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Калі адзначана, будзе выконвацца праверка надзейнасці пароля, таму вы не зможаце выкарыстаць слабы пароль. - + Log in automatically without asking for the password Аўтаматычна ўваходзіць без уводу пароля - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password Выкарыстоўваць пароль карыстальніка як пароль адміністратара - + Use the same password for the administrator account. Выкарыстоўваць той жа пароль для акаўнта адміністратара. - + Choose a root password to keep your account safe. Абярыце пароль адміністратара для абароны вашага акаўнта. - + Root Password Пароль адміністратара - + Repeat Root Password Паўтарыце пароль адміністратара - + Enter the same password twice, so that it can be checked for typing errors. Увядзіце пароль двойчы, каб пазбегнуць памылак уводу. diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts index dee1642f5..56dd18d6e 100644 --- a/lang/calamares_bg.ts +++ b/lang/calamares_bg.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information Информация за отстраняване на грешки @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Готово @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -483,12 +502,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Инсталатор @@ -527,149 +546,149 @@ The installer will quit and all changes will be lost. Форма - + Select storage de&vice: Изберете ус&тройство за съхранение: - - - - + + + + Current: Сегашен: - + After: След: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Самостоятелно поделяне</strong><br/>Можете да създадете или преоразмерите дяловете сами. - + Reuse %1 as home partition for %2. Използване на %1 като домашен дял за %2 - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Изберете дял за смаляване, после влачете долната лента за преоразмеряване</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Локация на програмата за начално зареждане: - + <strong>Select a partition to install on</strong> <strong>Изберете дял за инсталацията</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. EFI системен дял не е намерен. Моля, опитайте пак като използвате ръчно поделяне за %1. - + The EFI system partition at %1 will be used for starting %2. EFI системен дял в %1 ще бъде използван за стартиране на %2. - + EFI system partition: EFI системен дял: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Това устройство за съхранение няма инсталирана операционна система. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Изтриване на диска</strong><br/>Това ще <font color="red">изтрие</font> всички данни върху устройството за съхранение. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Инсталирайте покрай</strong><br/>Инсталатора ще раздроби дяла за да направи място за %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Замени дял</strong><br/>Заменя този дял с %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Това устройство за съхранение има инсталиран %1. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Това устройство за съхранение има инсталирана операционна система. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Това устройство за съхранение има инсталирани операционни системи. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -757,27 +776,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Постави модел на клавиатурата на %1.<br/> - + Set keyboard layout to %1/%2. Постави оформлението на клавиатурата на %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. Системният език ще бъде %1. - + The numbers and dates locale will be set to %1. Форматът на цифрите и датата ще бъде %1. @@ -812,98 +831,98 @@ The installer will quit and all changes will be lost. Мрежова инсталация. (Изключена: Списъкът с пакети не може да бъде извлечен, проверете Вашата Интернет връзка) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Този компютър не отговаря на минималните изисквания за инсталиране %1.<br/>Инсталацията не може да продължи. <a href="#details">Детайли...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Този компютър не отговаря на някои от препоръчителните изисквания за инсталиране %1.<br/>Инсталацията може да продължи, но някои свойства могат да бъдат недостъпни. - + This program will ask you some questions and set up %2 on your computer. Тази програма ще ви зададе няколко въпроса и ще конфигурира %2 на вашия компютър. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. Вашето потребителско име е твърде дълго. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Вашето име на хоста е твърде кратко. - + Your hostname is too long. Вашето име на хоста е твърде дълго. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Паролите Ви не съвпадат! - + OK! @@ -959,11 +978,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1422,6 +1446,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1451,8 +1485,8 @@ The installer will quit and all changes will be lost. Потвърди паролата - - + + Please enter the same passphrase in both boxes. Моля, въведете еднаква парола в двете полета. @@ -1541,32 +1575,32 @@ The installer will quit and all changes will be lost. &Рестартирай сега - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Завършено.</h1><br/>%1 беше инсталирана на вашият компютър.<br/>Вече можете да рестартирате в новата си система или да продължите да използвате %2 Живата среда. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Инсталацията е неуспешна</h1><br/>%1 не е инсталиран на Вашия компютър.<br/>Съобщението с грешката е: %2. @@ -1600,12 +1634,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Форматирай дял %1 с файлова система %2. - + The installer failed to format partition %1 on disk '%2'. Инсталатора не успя да форматира дял %1 на диск '%2'. @@ -1613,12 +1653,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1658,27 +1698,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Инсталаторът не е стартиран с права на администратор. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Екранът е твърде малък за инсталатора. @@ -1978,35 +2018,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2032,12 +2072,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2047,98 +2087,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection Избор на пакети - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2189,24 +2241,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2481,7 +2533,7 @@ The installer will quit and all changes will be lost. Неизвестна грешка - + Password is empty @@ -2519,22 +2571,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3062,7 +3098,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3385,12 +3421,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: За най-добри резултати, моля бъдете сигурни че този компютър: - + System requirements Системни изисквания @@ -3818,22 +3854,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4021,44 +4057,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Добре дошли в инсталатора Calamares за %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Добре дошли в инсталатора на %1.</h1> - - - %1 support %1 поддръжка - + About %1 setup - + About %1 installer Относно инсталатор %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4123,23 +4134,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4239,17 +4234,17 @@ Output: Модел на клавиатура: - + Layouts - + Type here to test your keyboard Пишете тук за да тествате вашата клавиатура - + Variants @@ -4376,102 +4371,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? Какво е името на този компютър? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Изберете парола за да държите вашият акаунт в безопасност. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. Използвайте същата парола за администраторския акаунт. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts index 8a814f659..0e4db5869 100644 --- a/lang/calamares_bn.ts +++ b/lang/calamares_bn.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information তথ্য ডিবাগ করুন @@ -171,7 +190,7 @@ Calamares::JobThread - + Done সম্পন্ন @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -483,12 +502,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 ইনস্টল @@ -527,149 +546,149 @@ The installer will quit and all changes will be lost. ফর্ম - + Select storage de&vice: স্টোরেজ ডিএবংভাইস নির্বাচন করুন: - - - - + + + + Current: বর্তমান: - + After: পরে: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>সংকুচিত করার জন্য একটি পার্টিশন নির্বাচন করুন, তারপর নিচের বারটি পুনঃআকারের জন্য টেনে আনুন</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: বুট লোডার অবস্থান: - + <strong>Select a partition to install on</strong> <strong>ইনস্টল করতে একটি পার্টিশন নির্বাচন করুন</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. %1 এ EFI সিস্টেম পার্টিশন %2 শুরু করার জন্য ব্যবহার করা হবে। - + EFI system partition: EFI সিস্টেম পার্টিশন: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. এই স্টোরেজ ডিভাইসে কোন অপারেটিং সিস্টেম আছে বলে মনে হয় না। তুমি কি করতে চাও? <br/>স্টোরেজ ডিভাইসে কোন পরিবর্তন করার আগে আপনি আপনার পছন্দপর্যালোচনা এবং নিশ্চিত করতে সক্ষম হবেন। - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>ডিস্ক মুছে ফেলুন</strong> <br/>এটি বর্তমানে নির্বাচিত স্টোরেজ ডিভাইসে উপস্থিত সকল উপাত্ত <font color="red">মুছে ফেলবে</font>। - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>ইনস্টল করুন পাশাপাশি</strong> <br/>ইনস্টলার %1 এর জন্য জায়গা তৈরি করতে একটি পার্টিশন সংকুচিত করবে। - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>একটি পার্টিশন প্রতিস্থাপন করুন</strong><br/>%1-এর সাথে একটি পার্টিশন প্রতিস্থাপন করে। - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. এই সঞ্চয় যন্ত্রটিতে %1 আছে। তুমি কি করতে চাও? <br/>স্টোরেজ ডিভাইসে কোন পরিবর্তন করার আগে আপনি আপনার পছন্দপর্যালোচনা এবং নিশ্চিত করতে সক্ষম হবেন। - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. এই স্টোরেজ ডিভাইসে ইতোমধ্যে একটি অপারেটিং সিস্টেম আছে। তুমি কি করতে চাও? <br/>স্টোরেজ ডিভাইসে কোন পরিবর্তন করার আগে আপনি আপনার পছন্দপর্যালোচনা এবং নিশ্চিত করতে সক্ষম হবেন. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. এই স্টোরেজ ডিভাইসে একাধিক অপারেটিং সিস্টেম আছে। তুমি কি করতে চাও? <br/>স্টোরেজ ডিভাইসে কোন পরিবর্তন করার আগে আপনি আপনার পছন্দপর্যালোচনা এবং নিশ্চিত করতে সক্ষম হবেন. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -757,27 +776,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> %1-এ কীবোর্ড নকশা নির্ধারণ করুন। - + Set keyboard layout to %1/%2. %1/%2 এ কীবোর্ড বিন্যাস নির্ধারণ করুন। - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -812,97 +831,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! আপনার পাসওয়ার্ড মেলে না! - + OK! @@ -958,11 +977,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1421,6 +1445,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1450,8 +1484,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1540,32 +1574,32 @@ The installer will quit and all changes will be lost. এবংএখন আবার চালু করুন - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>সব শেষ।</h1><br/>%1 আপনার কম্পিউটারে সংস্থাপন করা হয়েছে।<br/>আপনি এখন আপনার নতুন সিস্টেমে পুনর্সূচনা করতে পারেন, অথবা %2 লাইভ পরিবেশ ব্যবহার চালিয়ে যেতে পারেন। - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1599,12 +1633,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. ফাইল সিস্টেম %2 দিয়ে পার্টিশন %1 বিন্যাস করা হচ্ছে। - + The installer failed to format partition %1 on disk '%2'. ইনস্টলার '%2' ডিস্কে %1 পার্টিশন বিন্যাস করতে ব্যর্থ হয়েছে। @@ -1612,12 +1652,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1657,27 +1697,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1977,35 +2017,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2031,12 +2071,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2046,98 +2086,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2188,24 +2240,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2480,7 +2532,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2518,22 +2570,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3059,7 +3095,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3382,12 +3418,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3815,22 +3851,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4018,44 +4054,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - <h1>%1 ইনস্টলারে স্বাগতম।</h1> - - - %1 support %1 সহায়তা - + About %1 setup - + About %1 installer %1 ইনস্টলার সম্পর্কে - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4120,23 +4131,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4236,17 +4231,17 @@ Output: কীবোর্ড নকশা: - + Layouts - + Type here to test your keyboard আপনার কীবোর্ড পরীক্ষা করতে এখানে টাইপ করুন - + Variants @@ -4373,102 +4368,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? এই কম্পিউটারের নাম কি? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. আপনার অ্যাকাউন্ট সুরক্ষিত রাখতে একটি পাসওয়ার্ড নির্বাচন করুন। - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. প্রশাসক হিসাবের জন্য একই গুপ্ত-সংকেত ব্যবহার করুন। - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts index af0a900f7..a6597868a 100644 --- a/lang/calamares_ca.ts +++ b/lang/calamares_ca.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + <h1>%1</h1><br/><strong>%2<br/> per a %3</strong><br/><br/> + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + Gràcies a <a href="https://calamares.io/team/">l'equip del Calamares</a> i <a href="https://www.transifex.com/calamares/calamares/">l'equip de traductors del Calamares</a>.<br/><br/>El desenvolupament del <a href="https://calamares.io/">Calamares</a> està patrocinat per<br/> <a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + Drets d'autor %1-%2 %3 &lt;%4&gt;<br/> + + AutoMountManagementJob @@ -137,7 +156,7 @@ Arbre de ginys - + Debug information Informació de depuració @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Fet @@ -261,7 +280,7 @@ S'ha completat la comprovació dels requeriments per al mòdul <i>%1</i>. - + Waiting for %n module(s). S'espera %n mòdul. @@ -269,7 +288,7 @@ - + (%n second(s)) (%n segon) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. S'ha completat la comprovació dels requeriments del sistema. @@ -488,12 +507,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. CalamaresWindow - + %1 Setup Program Programa de configuració %1 - + %1 Installer Instal·lador de %1 @@ -532,149 +551,149 @@ L'instal·lador es tancarà i tots els canvis es perdran. Formulari - + Select storage de&vice: Seleccioneu un dispositiu d'e&mmagatzematge: - - - - + + + + Current: Actual: - + After: Després: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Particions manuals</strong><br/>Podeu crear o canviar la mida de les particions vosaltres mateixos. - + Reuse %1 as home partition for %2. Reutilitza %1 com a partició de l'usuari per a %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Seleccioneu una partició per encongir i arrossegueu-la per redimensinar-la</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 s'encongirà a %2 MiB i es crearà una partició nova de %3 MB per a %4. - + Boot loader location: Ubicació del gestor d'arrencada: - + <strong>Select a partition to install on</strong> <strong>Seleccioneu una partició per fer-hi la instal·lació.</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. No s'ha pogut trobar enlloc una partició EFI en aquest sistema. Si us plau, torneu enrere i use les particions manuals per configurar %1. - + The EFI system partition at %1 will be used for starting %2. La partició EFI de sistema a %1 s'usarà per iniciar %2. - + EFI system partition: Partició EFI del sistema: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Aquest dispositiu d'emmagatzematge no sembla que tingui un sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Esborra el disc</strong><br/>Això <font color="red">suprimirà</font> totes les dades del dispositiu seleccionat. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instal·la'l al costat</strong><br/>L'instal·lador reduirà una partició per fer espai per a %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Reemplaça una partició</strong><br/>Reemplaça una partició per %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Aquest dispositiu d'emmagatzematge té %1. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Aquest dispositiu d'emmagatzematge ja té un sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Aquest dispositiu d'emmagatzematge ja múltiples sistemes operatius. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Aquest dispositiu d'emmagatzematge ja té un sistema operatiu, però la taula de particions <strong>%1</strong> és diferent de la necessària: <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Aquest dispositiu d'emmagatzematge té una de les particions <strong>muntada</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Aquest sistema d'emmagatzematge forma part d'un dispositiu de <strong>RAID inactiu</strong>. - + No Swap Sense intercanvi - + Reuse Swap Reutilitza l'intercanvi - + Swap (no Hibernate) Intercanvi (sense hibernació) - + Swap (with Hibernate) Intercanvi (amb hibernació) - + Swap to file Intercanvi en fitxer @@ -762,27 +781,27 @@ L'instal·lador es tancarà i tots els canvis es perdran. Config - + Set keyboard model to %1.<br/> Establirà el model del teclat a %1.<br/> - + Set keyboard layout to %1/%2. Establirà la distribució del teclat a %1/%2. - + Set timezone to %1/%2. Estableix la zona horària a %1/%2. - + The system language will be set to %1. La llengua del sistema s'establirà a %1. - + The numbers and dates locale will be set to %1. Els números i les dates de la configuració local s'establiran a %1. @@ -817,97 +836,97 @@ L'instal·lador es tancarà i tots els canvis es perdran. Instal·lació per xarxa. (Inhabilitada: no es poden obtenir les llistes de paquets, comproveu la connexió.) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Aquest ordinador no satisfà els requisits mínims per configurar-hi %1.<br/> La configuració no pot continuar. <a href="#details">Detalls...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Aquest ordinador no satisfà els requisits mínims per instal·lar-hi %1.<br/> La instal·lació no pot continuar. <a href="#details">Detalls...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Aquest ordinador no satisfà alguns dels requisits recomanats per configurar-hi %1.<br/>La configuració pot continuar, però algunes característiques podrien estar inhabilitades. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Aquest ordinador no satisfà alguns dels requisits recomanats per instal·lar-hi %1.<br/>La instal·lació pot continuar, però algunes característiques podrien estar inhabilitades. - + This program will ask you some questions and set up %2 on your computer. Aquest programa us farà unes preguntes i instal·larà %2 a l'ordinador. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Benvingut/da al programa de configuració del Calamares per a %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Benvingut/da a la configuració per a %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Benvingut/da a l'instal·lador Calamares per a %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Benvingut/da a l'instal·lador per a %1</h1> - + Your username is too long. El nom d'usuari és massa llarg. - + '%1' is not allowed as username. No es permet %1 com a nom d'usuari. - + Your username must start with a lowercase letter or underscore. El nom d'usuari ha de començar amb una lletra en minúscula o una ratlla baixa. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Només es permeten lletres en minúscula, números, ratlles baixes i guions. - + Your hostname is too short. El nom d'amfitrió és massa curt. - + Your hostname is too long. El nom d'amfitrió és massa llarg. - + '%1' is not allowed as hostname. No es permet %1 com a nom d'amfitrió. - + Only letters, numbers, underscore and hyphen are allowed. Només es permeten lletres, números, ratlles baixes i guions. - + Your passwords do not match! Les contrasenyes no coincideixen! - + OK! D'acord! @@ -963,11 +982,16 @@ L'instal·lador es tancarà i tots els canvis es perdran. + Packages + Paquets + + + Install option: <strong>%1</strong> Opció d'instal·lació: <strong>%1</strong> - + None Cap @@ -1426,6 +1450,16 @@ L'instal·lador es tancarà i tots els canvis es perdran. FS Label: Etiqueta del sistema de fitxers: + + + Passphrase for existing partition + Contrasenya per a la partició existent + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + La partició %1 no s'ha pogut desencriptar amb la frase de contrasenya proporcionada. <br/><br/> Torneu a editar la partició i proporcioneu la contrasenya correcta o suprimiu-la i creeu una partició encriptada nova. + EncryptWidget @@ -1455,8 +1489,8 @@ L'instal·lador es tancarà i tots els canvis es perdran. Confirmeu la contrasenya - - + + Please enter the same passphrase in both boxes. Si us plau, escriviu la mateixa contrasenya a les dues caselles. @@ -1545,32 +1579,32 @@ L'instal·lador es tancarà i tots els canvis es perdran. &Reinicia ara - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Tot fet.</h1><br/>%1 s'ha configurat a l'ordinador.<br/>Ara podeu començar a usar el nou sistema. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Quan aquesta casella està marcada, el sistema es reiniciarà immediatament quan cliqueu a <span style="font-style:italic;">Fet</span> o tanqueu el programa de configuració.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Tot fet.</h1><br/>%1 s'ha instal·lat a l'ordinador.<br/>Ara podeu reiniciar-lo per tal d'accedir al sistema operatiu nou o bé continuar usant l'entorn autònom per a %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Quan aquesta casella està marcada, el sistema es reiniciarà immediatament quan cliqueu a <span style=" font-style:italic;">Fet</span> o tanqueu l'instal·lador.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>La configuració ha fallat.</h1><br/>No s'ha configurat %1 a l'ordinador.<br/>El missatge d'error ha estat el següent: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>La instal·lació ha fallat</h1><br/>No s'ha instal·lat %1 a l'ordinador.<br/>El missatge d'error ha estat el següent: %2. @@ -1604,12 +1638,18 @@ L'instal·lador es tancarà i tots els canvis es perdran. Formata la partició de <strong>%3 MiB</strong> <strong>%1</strong> amb el sistema de fitxers <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Es formata la partició %1 amb el sistema de fitxers %2. - + The installer failed to format partition %1 on disk '%2'. L'instal·lador no ha pogut formatar la partició %1 del disc '%2'. @@ -1617,12 +1657,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. GeneralRequirements - + has at least %1 GiB available drive space tingui com a mínim %1 GiB d'espai de disc disponible. - + There is not enough drive space. At least %1 GiB is required. No hi ha prou espai de disc disponible. Com a mínim hi ha d'haver %1 GiB. @@ -1662,27 +1702,27 @@ L'instal·lador es tancarà i tots els canvis es perdran. executi l'instal·lador com a administrador (arrel). - + The setup program is not running with administrator rights. El programa de configuració no s'executa amb privilegis d'administrador. - + The installer is not running with administrator rights. L'instal·lador no s'executa amb privilegis d'administrador. - + has a screen large enough to show the whole installer tingui una pantalla prou grossa per mostrar completament l'instal·lador. - + The screen is too small to display the setup program. La pantalla és massa petita per mostrar el programa de configuració. - + The screen is too small to display the installer. La pantalla és massa petita per mostrar l'instal·lador. @@ -1982,35 +2022,35 @@ L'instal·lador es tancarà i tots els canvis es perdran. LuksBootKeyFileJob - + Configuring LUKS key file. Es configura el fitxer de clau LUKS. - - + + No partitions are defined. No s'ha definit cap partició. - - - + + + Encrypted rootfs setup error Error de configuració de rootfs encriptat. - + Root partition %1 is LUKS but no passphrase has been set. La partició d'arrel %1 és LUKS però no se n'ha establert cap contrasenya. - + Could not create LUKS key file for root partition %1. No s'ha pogut crear el fitxer de clau de LUKS per a la partició d'arrel %1. - + Could not configure LUKS key file on partition %1. No s'ha pogut configurar el fitxer de clau de LUKS a la partició %1. @@ -2036,12 +2076,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. Map - + Timezone: %1 Zona horària: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2053,100 +2093,112 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé NetInstallViewStep - + Package selection Selecció de paquets - + Office software Programari d'oficina - + Office package Paquet d'oficina - + Browser software Programari de navegador - + Browser package Paquet de navegador - + Web browser Navegador web - + Kernel + label for netinstall module, Linux kernel Nucli - + Services + label for netinstall module, system services Serveis - + Login + label for netinstall module, choose login manager Entrada - + Desktop + label for netinstall module, choose desktop environment Escriptori - - Applications - Aplicacions - - - + Communication + label for netinstall module Comunicació - + Development + label for netinstall module Desenvolupament - + Office + label for netinstall module Oficina - + Multimedia + label for netinstall module Multimèdia - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Tema - + Gaming + label for netinstall module Jocs - + Utilities + label for netinstall module Utilitats + + + Applications + Aplicacions + NotesQmlViewStep @@ -2195,24 +2247,24 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé Seleccioneu la regió preferida o useu els paràmetres per defecte. - - - + + + Timezone: %1 Zona horària: %1 - + Select your preferred Zone within your Region. Trieu la zona preferida dins de la regió. - + Zones Zones - + You can fine-tune Language and Locale settings below. Podeu acabar d'ajustar els paràmetres locals i de llengua a continuació. @@ -2487,7 +2539,7 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé Error desconegut - + Password is empty La contrasenya és buida. @@ -2525,22 +2577,6 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé Si us plau, trieu un producte de la llista. S'instal·larà el producte seleccionat. - - PackageChooserQmlViewStep - - - Packages - Paquets - - - - PackageChooserViewStep - - - Packages - Paquets - - PackageModel @@ -3069,7 +3105,7 @@ Sortida: QObject - + %1 (%2) %1 (%2) @@ -3395,12 +3431,12 @@ La configuració pot continuar, però algunes característiques podrien estar in ResultsListDialog - + For best results, please ensure that this computer: Per obtenir els millors resultats, assegureu-vos, si us plau, que aquest ordinador... - + System requirements Requisits del sistema @@ -3828,22 +3864,22 @@ La configuració pot continuar, però algunes característiques podrien estar in <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Cliqueu aquí per a més informació sobre la informació de retorn dels usuaris.</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. El seguiment ajuda els desenvolupadors de %1 a veure amb quina freqüència, en quin maquinari s’instal·la i quines aplicacions s’usen. Per veure què s’enviarà, cliqueu a la icona d’ajuda que hi ha al costat de cada àrea. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Si seleccioneu això, enviareu informació de la vostra instal·lació i el vostre maquinari. Aquesta informació només s'enviarà <b>un cop</b> després d'acabar la instal·lació. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Si seleccioneu això, enviareu informació periòdicament de la instal·lació a la vostra <b>màquina</b>, el maquinari i les aplicacions a %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Si seleccioneu això, enviareu informació regularment de la instal·lació del vostre <b>usuari</b>, el maquinari, les aplicacions i els patrons d'ús a %1. @@ -4031,44 +4067,19 @@ La configuració pot continuar, però algunes característiques podrien estar in - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Benvingut/da al programa de configuració del Calamares per a %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Benvingut/da a la configuració per a %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Benvingut/da a l'instal·lador Calamares per a %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Benvingut/da a l'instal·lador per a %1.</h1> - - - %1 support %1 suport - + About %1 setup Quant a la configuració de %1 - + About %1 installer Quant a l'instal·lador %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Agraïments per a <a href="https://calamares.io/team/">l'equip del Calamares</a> i per a <a href="https://www.transifex.com/calamares/calamares/">l'equip de traductors del Calamares</a>.<br/><br/>El desenvolupament del<a href="https://calamares.io/">Calamares</a> està patrocinat per <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4133,34 +4144,7 @@ La configuració pot continuar, però algunes característiques podrien estar in about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - per a %3</strong><br/><br/> - Copyright 2014-2017, Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020, Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Moltes gràcies a <a href='https://calamares.io/team/'>l'equip del Calamares</a> - i a <a href='https://www.transifex.com/calamares/calamares/'>l'equip de traductors - del Calamares</a>.<br/><br/> - El desenvolupament del<a href='https://calamares.io/'>Calamares</a> - està patrocinat per <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back Enrere @@ -4265,17 +4249,17 @@ La configuració pot continuar, però algunes característiques podrien estar in Model del teclat: - + Layouts Disposicions - + Type here to test your keyboard Escriviu aquí per comprovar el teclat - + Variants Variants @@ -4424,102 +4408,102 @@ Opció predeterminada. Si aquest ordinador l'usarà més d'una persona, podreu crear diversos comptes després de la instal·lació. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Només es permeten lletres en minúscula, números, ratlles baixes i guions. - + root is not allowed as username. No es permet root com a nom d'usuari. - + What is the name of this computer? Com es diu aquest ordinador? - + Computer Name Nom de l'ordinador - + This name will be used if you make the computer visible to others on a network. Aquest nom s'usarà si feu visible aquest ordinador per a altres en una xarxa. - + localhost is not allowed as hostname. No es permet localhost com a nom d'amfitrió. - + Choose a password to keep your account safe. Trieu una contrasenya per tal de mantenir el compte segur. - + Password Contrasenya - + Repeat Password Repetiu la contrasenya. - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia. Una bona contrasenya ha de contenir una barreja de lletres, números i signes de puntuació, hauria de tenir un mínim de 8 caràcters i s'hauria de modificar a intervals regulars. - + Validate passwords quality Valida la qualitat de les contrasenyes. - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no en podreu fer una de dèbil. - + Log in automatically without asking for the password Entra automàticament sense demanar la contrasenya. - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Només es permeten lletres, números, guionets, guionets baixos i un mínim de dos caràcters. - + Reuse user password as root password Reutilitza la contrasenya d'usuari com a contrasenya d'arrel. - + Use the same password for the administrator account. Usa la mateixa contrasenya per al compte d'administració. - + Choose a root password to keep your account safe. Trieu una contrasenya d'arrel per mantenir el compte segur. - + Root Password Contrasenya d'arrel - + Repeat Root Password Repetiu la contrasenya d'arrel. - + Enter the same password twice, so that it can be checked for typing errors. Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia. diff --git a/lang/calamares_ca@valencia.ts b/lang/calamares_ca@valencia.ts index fffb0d892..cfa1bc7e1 100644 --- a/lang/calamares_ca@valencia.ts +++ b/lang/calamares_ca@valencia.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Arbre d'elements - + Debug information Informació de depuració @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Fet @@ -261,7 +280,7 @@ Ha acabat la verificació dels requeriments per al mòdul <i>%1</i>. - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. Ha acabat la verificació dels requeriments del sistema. @@ -484,12 +503,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. CalamaresWindow - + %1 Setup Program Programa de configuració %1 - + %1 Installer Instal·lador de %1 @@ -528,149 +547,149 @@ L'instal·lador es tancarà i tots els canvis es perdran. Formulari - + Select storage de&vice: Seleccioneu un dispositiu d'e&mmagatzematge: - - - - + + + + Current: Actual: - + After: Després: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Particions manuals</strong><br/>Podeu crear particions o canviar-ne la mida pel vostre compte. - + Reuse %1 as home partition for %2. Reutilitza %1 com a partició de l'usuari per a %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Seleccioneu una partició per a reduir-la i arrossegueu-la per a redimensionar-la</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 es reduirà a %2 MiB i es crearà una partició nova de %3 MiB per a %4. - + Boot loader location: Ubicació del gestor d'arrancada: - + <strong>Select a partition to install on</strong> <strong>Seleccioneu una partició per a fer-hi la instal·lació.</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. No s'ha pogut trobar una partició EFI en cap lloc d'aquest sistema. Torneu arrere i useu les particions manuals per a configurar %1. - + The EFI system partition at %1 will be used for starting %2. La partició EFI de sistema en %1 s'usarà per a iniciar %2. - + EFI system partition: Partició del sistema EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Pareix que aquest dispositiu d'emmagatzematge no té cap sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Esborra el disc</strong><br/>Això <font color="red">suprimirà</font> totes les dades del dispositiu seleccionat. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instal·la'l al costat</strong><br/>L'instal·lador reduirà una partició per a fer espai per a %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Reemplaça una partició</strong><br/>Reemplaça una partició per %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Aquest dispositiu d'emmagatzematge té %1. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Aquest dispositiu d'emmagatzematge ja té un sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Aquest dispositiu d'emmagatzematge ja té múltiples sistemes operatius. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Aquest dispositiu d'emmagatzematge ja té un sistema operatiu, però la taula de particions <strong>%1</strong> és diferent de la necessària: <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Aquest dispositiu d'emmagatzematge té una de les particions <strong>muntada</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Aquest dispositiu d'emmagatzematge forma part d'un dispositiu de <strong>RAID inactiu</strong>. - + No Swap Sense intercanvi - + Reuse Swap Reutilitza l'intercanvi - + Swap (no Hibernate) Intercanvi (sense hibernació) - + Swap (with Hibernate) Intercanvi (amb hibernació) - + Swap to file Intercanvi en fitxer @@ -758,27 +777,27 @@ L'instal·lador es tancarà i tots els canvis es perdran. Config - + Set keyboard model to %1.<br/> Estableix el model de teclat en %1.<br/> - + Set keyboard layout to %1/%2. Estableix la distribució del teclat a %1/%2. - + Set timezone to %1/%2. Estableix el fus horari a %1/%2. - + The system language will be set to %1. La llengua del sistema s'establirà en %1. - + The numbers and dates locale will be set to %1. Els números i les dates de la configuració local s'establiran en %1. @@ -813,97 +832,97 @@ L'instal·lador es tancarà i tots els canvis es perdran. Instal·lació per xarxa. (Inhabilitada: no es poden obtindre les llistes de paquets, comproveu la connexió.) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Aquest ordinador no satisfà els requisits mínims per a configurar-hi %1.<br/> La configuració no pot continuar. <a href="#details">Detalls...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Aquest ordinador no satisfà els requisits mínims per a instal·lar-hi %1.<br/> La instal·lació no pot continuar. <a href="#details">Detalls...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Aquest ordinador no satisfà alguns dels requisits recomanats per a configurar-hi %1.<br/>La configuració pot continuar, però és possible que algunes característiques no estiguen habilitades. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Aquest ordinador no satisfà alguns dels requisits recomanats per a instal·lar-hi %1.<br/>La instal·lació pot continuar, però és possible que algunes característiques no estiguen habilitades. - + This program will ask you some questions and set up %2 on your computer. Aquest programa us farà unes preguntes i instal·larà %2 en l'ordinador. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Us donen la benvinguda al programa de configuració del Calamares per a %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Us donen la benvinguda a la configuració per a %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Us donen la benvinguda a l'instal·lador del Calamares per a %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Us donen la benvinguda a l'instal·lador per a %1</h1> - + Your username is too long. El nom d'usuari és massa llarg. - + '%1' is not allowed as username. No es permet %1 com a nom d'usuari. - + Your username must start with a lowercase letter or underscore. El nom d'usuari ha de començar amb una lletra en minúscula o una ratlla baixa. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Només es permeten lletres en minúscula, números, ratlles baixes i guions. - + Your hostname is too short. El nom d'amfitrió és massa curt. - + Your hostname is too long. El nom d'amfitrió és massa llarg. - + '%1' is not allowed as hostname. No es permet %1 com a nom d'amfitrió. - + Only letters, numbers, underscore and hyphen are allowed. Només es permeten lletres, números, ratlles baixes i guions. - + Your passwords do not match! Les contrasenyes no coincideixen. - + OK! @@ -959,11 +978,16 @@ L'instal·lador es tancarà i tots els canvis es perdran. + Packages + Paquets + + + Install option: <strong>%1</strong> - + None @@ -1422,6 +1446,16 @@ L'instal·lador es tancarà i tots els canvis es perdran. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1451,8 +1485,8 @@ L'instal·lador es tancarà i tots els canvis es perdran. Confirmeu la contrasenya - - + + Please enter the same passphrase in both boxes. Escriviu la mateixa contrasenya en les dues caselles. @@ -1541,32 +1575,32 @@ L'instal·lador es tancarà i tots els canvis es perdran. &Reinicia ara - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Tot fet.</h1><br/>%1 s'ha configurat a l'ordinador.<br/>Ara podeu començar a usar el nou sistema. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Quan aquesta casella està marcada, el sistema es reinicia immediatament en clicar en <span style="font-style:italic;">Fet</span> o tancar el programa de configuració.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Tot fet.</h1><br/>%1 s'ha instal·lat a l'ordinador.<br/>Ara podeu reiniciar-lo per tal d'accedir al sistema operatiu nou o bé continuar usant l'entorn autònom de %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Quan aquesta casella està marcada, el sistema es reiniciarà immediatament quan cliqueu en <span style="font-style:italic;">Fet</span> o tanqueu l'instal·lador.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>La configuració ha fallat.</h1><br/>No s'ha configurat %1 en l'ordinador.<br/>El missatge d'error ha estat el següent: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>La instal·lació ha fallat</h1><br/>No s'ha instal·lat %1 en l'ordinador.<br/>El missatge d'error ha estat el següent: %2. @@ -1600,12 +1634,18 @@ L'instal·lador es tancarà i tots els canvis es perdran. Formata la partició de <strong>%3 MiB</strong> <strong>%1</strong> amb el sistema de fitxers <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. S'està formatant la partició %1 amb el sistema de fitxers %2. - + The installer failed to format partition %1 on disk '%2'. L'instal·lador no ha pogut formatar la partició %1 del disc '%2'. @@ -1613,12 +1653,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. GeneralRequirements - + has at least %1 GiB available drive space té com a mínim %1 GiB d'espai de disc disponible. - + There is not enough drive space. At least %1 GiB is required. No hi ha prou espai de disc disponible. Com a mínim hi ha d'haver %1 GiB. @@ -1658,27 +1698,27 @@ L'instal·lador es tancarà i tots els canvis es perdran. està executant l'instal·lador com a administrador (arrel). - + The setup program is not running with administrator rights. El programa de configuració no s'està executant amb privilegis d'administració. - + The installer is not running with administrator rights. L'instal·lador no s'està executant amb privilegis d'administració. - + has a screen large enough to show the whole installer té una pantalla suficientment gran per a mostrar completament l'instal·lador. - + The screen is too small to display the setup program. La pantalla és massa menuda per a mostrar el programa de configuració. - + The screen is too small to display the installer. La pantalla és massa menuda per a mostrar l'instal·lador. @@ -1978,35 +2018,35 @@ L'instal·lador es tancarà i tots els canvis es perdran. LuksBootKeyFileJob - + Configuring LUKS key file. S'està configurant el fitxer de clau LUKS. - - + + No partitions are defined. No s'ha definit cap partició. - - - + + + Encrypted rootfs setup error S'ha produït un error de configuració del rootfs encriptat. - + Root partition %1 is LUKS but no passphrase has been set. La partició d'arrel %1 és LUKS, però no se n'ha establit cap contrasenya. - + Could not create LUKS key file for root partition %1. No s'ha pogut crear el fitxer de clau de LUKS per a la partició d'arrel %1. - + Could not configure LUKS key file on partition %1. No s'ha pogut configurar el fitxer de clau de LUKS en la partició %1. @@ -2032,12 +2072,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. Map - + Timezone: %1 Fus horari: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2049,100 +2089,112 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé NetInstallViewStep - + Package selection Selecció de paquets - + Office software Programari d'oficina - + Office package Paquet d'oficina - + Browser software Programari de navegador - + Browser package Paquet de navegador - + Web browser Navegador web - + Kernel + label for netinstall module, Linux kernel Nucli - + Services + label for netinstall module, system services Serveis - + Login + label for netinstall module, choose login manager Entrada - + Desktop + label for netinstall module, choose desktop environment Escriptori - - Applications - Aplicacions - - - + Communication + label for netinstall module Comunicació - + Development + label for netinstall module Desenvolupament - + Office + label for netinstall module Oficina - + Multimedia + label for netinstall module Multimèdia - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Tema - + Gaming + label for netinstall module Jugant - + Utilities + label for netinstall module Utilitats + + + Applications + Aplicacions + NotesQmlViewStep @@ -2191,24 +2243,24 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé - - - + + + Timezone: %1 Fus horari: %1 - + Select your preferred Zone within your Region. Trieu la zona preferida dins de la regió. - + Zones Zones - + You can fine-tune Language and Locale settings below. Podeu acabar d'ajustar els paràmetres locals i de llengua a continuació. @@ -2483,7 +2535,7 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé S'ha produït un error desconegut - + Password is empty La contrasenya està buida. @@ -2521,22 +2573,6 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé Trieu un producte de la llista. S'instal·larà el producte seleccionat. - - PackageChooserQmlViewStep - - - Packages - Paquets - - - - PackageChooserViewStep - - - Packages - Paquets - - PackageModel @@ -3065,7 +3101,7 @@ Eixida: QObject - + %1 (%2) %1 (%2) @@ -3391,12 +3427,12 @@ La configuració pot continuar, però és possible que algunes característiques ResultsListDialog - + For best results, please ensure that this computer: Per a obtindre els millors resultats, assegureu-vos que aquest ordinador... - + System requirements Requisits de sistema @@ -3824,22 +3860,22 @@ La configuració pot continuar, però és possible que algunes característiques <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Cliqueu ací per a obtindre més informació sobre la informació de retorn dels usuaris.</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. El seguiment ajuda l'equip de desenvolupament de %1 a veure amb quina freqüència, en quin maquinari s'instal·la i quines aplicacions s'usen. Per a veure què s'enviarà, cliqueu en la icona d'ajuda que hi ha al costat de cada àrea. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Si seleccioneu això, enviareu informació de la vostra instal·lació i el vostre maquinari. Aquesta informació només s'enviarà <b>una vegada</b> després d'acabar la instal·lació. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Si seleccioneu això, enviareu informació periòdicament de la instal·lació a la vostra <b>màquina</b>, el maquinari i les aplicacions en %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Si seleccioneu això, enviareu informació regularment de la vostra instal·lació d'<b>usuari</b>, del maquinari i de les aplicacions i dels patrons d'ús d'aplicacions en %1. @@ -4027,44 +4063,19 @@ La configuració pot continuar, però és possible que algunes característiques - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Us donen la benvinguda al programa de configuració del Calamares per a %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Us donem la benvinguda a la configuració per a %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Us donem la benvinguda a l'instal·lador Calamares per a %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Us donem la benvinguda a l'instal·lador per a %1.</h1> - - - %1 support %1 soport - + About %1 setup Quant a la configuració de %1 - + About %1 installer Sobre %1 instal·lador - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Agraïments per a <a href="https://calamares.io/team/">l'equip del Calamares</a> i per a <a href="https://www.transifex.com/calamares/calamares/">l'equip de traducció del Calamares</a>.<br/><br/>El desenvolupament del<a href="https://calamares.io/">Calamares</a> està patrocinat per <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4129,34 +4140,7 @@ La configuració pot continuar, però és possible que algunes característiques about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - per a %3</strong><br/><br/> - Copyright 2014-2017, Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020, Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Moltes gràcies a <a href='https://calamares.io/team/'>l'equip del Calamares</a> - i a <a href='https://www.transifex.com/calamares/calamares/'>l'equip de traducció - del Calamares</a>.<br/><br/> - El desenvolupament del<a href='https://calamares.io/'>Calamares</a> - està patrocinat per <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back Arrere @@ -4258,17 +4242,17 @@ La configuració pot continuar, però és possible que algunes característiques Model de teclat: - + Layouts Disposicions - + Type here to test your keyboard Escriviu ací per a provar el teclat - + Variants Variants @@ -4416,102 +4400,102 @@ La configuració pot continuar, però és possible que algunes característiques Si hi ha més d'una persona que ha d'usar aquest ordinador, podeu crear diversos comptes després de la instal·lació. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Només es permeten lletres en minúscula, números, ratlles baixes i guions. - + root is not allowed as username. - + What is the name of this computer? Quin és el nom d'aquest ordinador? - + Computer Name Nom de l'ordinador - + This name will be used if you make the computer visible to others on a network. Aquest nom s'usarà si feu visible aquest ordinador per a altres en una xarxa. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Seleccioneu una contrasenya per a mantindre el vostre compte segur. - + Password Contrasenya - + Repeat Password Repetiu la contrasenya - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Escriviu la mateixa contrasenya dues vegades per a poder comprovar-ne els errors de mecanografia. Una bona contrasenya contindrà una barreja de lletres, números i signes de puntuació. Hauria de tindre un mínim de huit caràcters i s'hauria de canviar sovint. - + Validate passwords quality Valida la qualitat de les contrasenyes. - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no podreu indicar-ne una de dèbil. - + Log in automatically without asking for the password Entra automàticament sense demanar la contrasenya. - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password Reutilitza la contrasenya d'usuari com a contrasenya d'arrel. - + Use the same password for the administrator account. Usa la mateixa contrasenya per al compte d'administració. - + Choose a root password to keep your account safe. Trieu una contrasenya d'arrel per mantindre el compte segur. - + Root Password Contrasenya d'arrel - + Repeat Root Password Repetiu la contrasenya d'arrel. - + Enter the same password twice, so that it can be checked for typing errors. Escriviu la mateixa contrasenya dues vegades per a poder comprovar-ne els errors de mecanografia. diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts index 9d9f839f6..3d0effe36 100644 --- a/lang/calamares_cs_CZ.ts +++ b/lang/calamares_cs_CZ.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + Autorská práva %1-%2 %3 &lt;%4&gt;<br/> + + AutoMountManagementJob @@ -137,7 +156,7 @@ Strom ovládacích prvků - + Debug information Ladící informace @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Hotovo @@ -261,7 +280,7 @@ Kontrola požadavků pro modul <i>%1</i> dokončena. - + Waiting for %n module(s). Čeká se na %n modul @@ -271,7 +290,7 @@ - + (%n second(s)) (%n sekundu) @@ -281,7 +300,7 @@ - + System-requirements checking is complete. Kontrola požadavků na systém dokončena. @@ -492,12 +511,12 @@ Instalační program bude ukončen a všechny změny ztraceny. CalamaresWindow - + %1 Setup Program Instalátor %1 - + %1 Installer Instalátor %1 @@ -536,149 +555,149 @@ Instalační program bude ukončen a všechny změny ztraceny. Formulář - + Select storage de&vice: &Vyberte úložné zařízení: - - - - + + + + Current: Stávající: - + After: Po: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Ruční rozdělení datového úložiště</strong><br/>Sami si můžete vytvořit vytvořit nebo zvětšit/zmenšit oddíly. - + Reuse %1 as home partition for %2. Zrecyklovat %1 na oddíl pro domovské složky %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Vyberte oddíl, který chcete zmenšit, poté posouváním na spodní liště změňte jeho velikost.</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 bude zmenšen na %2MiB a nový %3MiB oddíl pro %4 bude vytvořen. - + Boot loader location: Umístění zavaděče: - + <strong>Select a partition to install on</strong> <strong>Vyberte oddíl na který nainstalovat</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Nebyl nalezen žádný EFI systémový oddíl. Vraťte se zpět a nastavte %1 pomocí ručního rozdělení. - + The EFI system partition at %1 will be used for starting %2. Pro zavedení %2 se využije EFI systémový oddíl %1. - + EFI system partition: EFI systémový oddíl: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Zdá se, že na tomto úložném zařízení není žádný operační systém. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled a budete požádáni o jejich potvrzení. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Vymazat datové úložiště</strong><br/>Touto volbou budou <font color="red">smazána</font> všechna data, která se na něm nyní nacházejí. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Nainstalovat vedle</strong><br/>Instalátor zmenší oddíl a vytvoří místo pro %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Nahradit oddíl</strong><br/>Původní oddíl bude nahrazen %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Na tomto úložném zařízení bylo nalezeno %1. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled a budete požádáni o jejich potvrzení. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Na tomto úložném zařízení se už nachází operační systém. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled a budete požádáni o jejich potvrzení. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Na tomto úložném zařízení se už nachází několik operačních systémů. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled změn a budete požádáni o jejich potvrzení. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Na tomto úložném zařízení se už nachází operační systém, ale tabulka rozdělení <strong>%1</strong> je jiná než potřebná <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Některé z oddílů tohoto úložného zařízení jsou <strong>připojené</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Toto úložné zařízení je součástí <strong>neaktivního RAID</strong> zařízení. - + No Swap Žádný odkládací prostor (swap) - + Reuse Swap Použít existující odkládací prostor - + Swap (no Hibernate) Odkládací prostor (bez uspávání na disk) - + Swap (with Hibernate) Odkládací prostor (s uspáváním na disk) - + Swap to file Odkládat do souboru @@ -766,27 +785,27 @@ Instalační program bude ukončen a všechny změny ztraceny. Config - + Set keyboard model to %1.<br/> Nastavit model klávesnice na %1.<br/> - + Set keyboard layout to %1/%2. Nastavit rozvržení klávesnice na %1/%2. - + Set timezone to %1/%2. Nastavit časové pásmo na %1/%2. - + The system language will be set to %1. Jazyk systému bude nastaven na %1. - + The numbers and dates locale will be set to %1. Formát zobrazení čísel, data a času bude nastaven dle národního prostředí %1. @@ -821,97 +840,97 @@ Instalační program bude ukončen a všechny změny ztraceny. Síťová instalace. (Vypnuto: Nedaří se stáhnout seznamy balíčků – zkontrolujte připojení k síti) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Počítač nesplňuje minimální požadavky pro instalaci %1.<br/>Nastavování nemůže pokračovat <a href="#details">Podrobnosti…</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Počítač nesplňuje minimální požadavky pro instalaci %1.<br/>Instalace nemůže pokračovat <a href="#details">Podrobnosti…</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Počítač nesplňuje některé doporučené požadavky pro instalaci %1.<br/>Instalace může pokračovat, ale některé funkce mohou být vypnuty. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Počítač nesplňuje některé doporučené požadavky pro instalaci %1.<br/>Instalace může pokračovat, ale některé funkce mohou být vypnuty. - + This program will ask you some questions and set up %2 on your computer. Tento program vám položí několik dotazů, aby na základě odpovědí příslušně nainstaloval %2 na váš počítač. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Vítejte v Calamares – instalačním programu pro %1.</h1> - + <h1>Welcome to %1 setup</h1> <h1>Vítejte v instalátoru %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Vítejte v Calamares, instalačním programu pro %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Vítejte v instalátoru %1.</h1> - + Your username is too long. Vaše uživatelské jméno je příliš dlouhé. - + '%1' is not allowed as username. „%1“ není možné použít jako uživatelské jméno. - + Your username must start with a lowercase letter or underscore. Je třeba, aby uživatelské jméno začínalo na malé písmeno nebo podtržítko. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Je možné použít pouze malá písmena, číslice, podtržítko a spojovník. - + Your hostname is too short. Název stroje je příliš krátký. - + Your hostname is too long. Název stroje je příliš dlouhý. - + '%1' is not allowed as hostname. „%1“ není možné použít jako název počítače. - + Only letters, numbers, underscore and hyphen are allowed. Je možné použít pouze písmena, číslice, podtržítko a spojovník. - + Your passwords do not match! Zadání hesla se neshodují! - + OK! OK! @@ -967,11 +986,16 @@ Instalační program bude ukončen a všechny změny ztraceny. + Packages + Balíčky + + + Install option: <strong>%1</strong> Volba instalace: <strong>%1</strong> - + None Žádné @@ -1430,6 +1454,16 @@ Instalační program bude ukončen a všechny změny ztraceny. FS Label: Jmenovka soubor. systému: + + + Passphrase for existing partition + Heslová fráze pro existující oddíl + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1459,8 +1493,8 @@ Instalační program bude ukončen a všechny změny ztraceny. Potvrzení heslové fráze - - + + Please enter the same passphrase in both boxes. Zadejte stejnou heslovou frázi do obou kolonek. @@ -1549,32 +1583,32 @@ Instalační program bude ukončen a všechny změny ztraceny. &Restartovat nyní - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Instalace je u konce.</h1><br/>%1 byl nainstalován na váš počítač.<br/>Nyní ho můžete restartovat a přejít do čerstvě nainstalovaného systému, nebo můžete pokračovat v práci ve stávajícím prostředím %2, spuštěným z instalačního média. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Když je tato kolonka zaškrtnutá, systém se restartuje jakmile kliknete na <span style="font-style:italic;">Hotovo</span> nebo zavřete instalátor.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Instalace je u konce.</h1><br/>%1 bylo nainstalováno na váš počítač.<br/>Nyní ho můžete restartovat a přejít do čerstvě nainstalovaného systému, nebo můžete pokračovat v práci ve stávajícím prostředím %2, spuštěným z instalačního média. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Když je tato kolonka zaškrtnutá, systém se restartuje jakmile kliknete na <span style="font-style:italic;">Hotovo</span> nebo zavřete instalátor.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Instalace se nezdařila</h1><br/>%1 nebyl instalován na váš počítač.<br/>Hlášení o chybě: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalace se nezdařila</h1><br/>%1 nebylo nainstalováno na váš počítač.<br/>Hlášení o chybě: %2. @@ -1608,12 +1642,18 @@ Instalační program bude ukončen a všechny změny ztraceny. Naformátovat <strong>%3MiB</strong> oddíl <strong>%1</strong> souborovým systémem <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Vytváření souborového systému %2 na oddílu %1. - + The installer failed to format partition %1 on disk '%2'. Instalátoru se nepodařilo vytvořit souborový systém na oddílu %1 jednotky datového úložiště „%2“. @@ -1621,12 +1661,12 @@ Instalační program bude ukončen a všechny změny ztraceny. GeneralRequirements - + has at least %1 GiB available drive space má alespoň %1 GiB dostupného prostoru - + There is not enough drive space. At least %1 GiB is required. Nedostatek místa na úložišti. Je potřeba nejméně %1 GiB. @@ -1666,27 +1706,27 @@ Instalační program bude ukončen a všechny změny ztraceny. instalátor je spuštěný s právy správce systému (root) - + The setup program is not running with administrator rights. Nastavovací program není spuštěn s právy správce systému. - + The installer is not running with administrator rights. Instalační program není spuštěn s právy správce systému. - + has a screen large enough to show the whole installer má obrazovku dostatečně velkou pro zobrazení celého instalátoru - + The screen is too small to display the setup program. Rozlišení obrazovky je příliš malé pro zobrazení nastavovacího programu. - + The screen is too small to display the installer. Rozlišení obrazovky je příliš malé pro zobrazení instalátoru. @@ -1986,35 +2026,35 @@ Instalační program bude ukončen a všechny změny ztraceny. LuksBootKeyFileJob - + Configuring LUKS key file. Nastavování souboru s klíčem pro LUKS šifrování. - - + + No partitions are defined. Nejsou definovány žádné oddíly. - - - + + + Encrypted rootfs setup error Chyba nastavení šifrovaného kořenového oddílu - + Root partition %1 is LUKS but no passphrase has been set. Kořenový oddíl %1 je LUKS, ale nebyla nastavena žádná heslová fráze. - + Could not create LUKS key file for root partition %1. Nedaří se vytvořit LUKS klíč pro kořenový oddíl %1. - + Could not configure LUKS key file on partition %1. Nedaří se nastavit LUKS klíč pro oddíl %1. @@ -2040,12 +2080,12 @@ Instalační program bude ukončen a všechny změny ztraceny. Map - + Timezone: %1 Časové pásmo: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2057,100 +2097,112 @@ Instalační program bude ukončen a všechny změny ztraceny. NetInstallViewStep - + Package selection Výběr balíčků - + Office software Aplikace pro kancelář - + Office package Balíček s kancelářským software - + Browser software Aplikace pro procházení webu - + Browser package Balíček s webovým prohlížečem - + Web browser Webový prohlížeč - + Kernel + label for netinstall module, Linux kernel Jádro systému - + Services + label for netinstall module, system services Služby - + Login + label for netinstall module, choose login manager Uživatelské jméno - + Desktop + label for netinstall module, choose desktop environment Desktop - - Applications - Aplikace - - - + Communication + label for netinstall module Komunikace - + Development + label for netinstall module Vývoj - + Office + label for netinstall module Kancelář - + Multimedia + label for netinstall module Multimédia - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Motivy vzhledu - + Gaming + label for netinstall module Hry - + Utilities + label for netinstall module Nástroje + + + Applications + Aplikace + NotesQmlViewStep @@ -2199,24 +2251,24 @@ Instalační program bude ukončen a všechny změny ztraceny. Vyberte vámi upřednostňovanou oblast, nebo použijte výchozí nastavení. - - - + + + Timezone: %1 Časová zóna: %1 - + Select your preferred Zone within your Region. Vyberte upřednostňované pásmo ve svém regionu. - + Zones Pásma - + You can fine-tune Language and Locale settings below. Níže můžete doladit nastavení jazyka a národního prostředí. @@ -2509,7 +2561,7 @@ Instalační program bude ukončen a všechny změny ztraceny. Neznámá chyba - + Password is empty Heslo není vyplněné @@ -2547,22 +2599,6 @@ Instalační program bude ukončen a všechny změny ztraceny. Vyberte produkt ze seznamu. Ten vybraný bude nainstalován. - - PackageChooserQmlViewStep - - - Packages - Balíčky - - - - PackageChooserViewStep - - - Packages - Balíčky - - PackageModel @@ -3091,7 +3127,7 @@ Výstup: QObject - + %1 (%2) %1 (%2) @@ -3417,12 +3453,12 @@ Výstup: ResultsListDialog - + For best results, please ensure that this computer: Nejlepších výsledků se dosáhne, pokud tento počítač bude: - + System requirements Požadavky na systém @@ -3850,22 +3886,22 @@ Výstup: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Kliknutím sem se dozvíte více o zpětné vazbě od uživatelů</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Sledování pomůže %1 zjistit, jak často je instalováno, na jakém hardware a které aplikace jsou používány. Pro zobrazení toho, co je odesíláno, klikněte na ikonu nápovědy vedle každé z oblastí. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Výběrem tohoto pošlete informace o své instalaci a hardware. Tyto údaje budou odeslány <b>pouze jednorázově</b> po dokončení instalace. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Výběrem tohoto budete pravidelně odesílat informace o instalaci na váš <b>počítač</b>, o hardwaru a aplikacích do %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Výběrem tohoto budete pravidelně odesílat informace o vaší <b>uživatelské</b> instalaci, hardware, aplikacích a způsobu využití aplikací do %1. @@ -4053,44 +4089,19 @@ Výstup: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Vítejte v Calamares, instalačním programu (nejen) pro %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Vítejte v instalátoru pro %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Vítejte v Calamares, instalačním programu (nejen) pro %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Vítejte v instalátoru %1.</h1> - - - %1 support %1 podpora - + About %1 setup O nastavování %1 - + About %1 installer O instalátoru %1. - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Poděkování <a href="https://calamares.io/team/">týmu Calamares</a> a <a href="https://www.transifex.com/calamares/calamares/">týmu překladatelů Calamares</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> vývoj je sponzorován <br/><a href="http://www.blue-systems.com/">Blue Systems</a> – Liberating Software. - WelcomeQmlViewStep @@ -4155,34 +4166,7 @@ Výstup: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - pro %3</strong><br/><br/> - Autorská práva 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Autorská práva 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Děkujeme <a href='https://calamares.io/team/'>Týmu Calamares - a <a href='https://www.transifex.com/calamares/calamares/'>Calamares - týmu překladatelů </a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - vývoj sponzoruje <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back Zpět @@ -4287,17 +4271,17 @@ Výstup: Model klávesnice: - + Layouts Rozvržení - + Type here to test your keyboard Klávesnici vyzkoušíte psaním sem - + Variants Varianty @@ -4446,102 +4430,102 @@ Výstup: Pokud bude tento počítač používat více než jedna osoba, můžete po instalaci vytvořit více účtů. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Je možné použít pouze malá písmena, číslice, podtržítko a spojovník. - + root is not allowed as username. root není možné použít jako uživatelské jméno. - + What is the name of this computer? Jaký je název tohoto počítače? - + Computer Name Název počítače - + This name will be used if you make the computer visible to others on a network. Pod tímto názvem se bude počítač případně zobrazovat ostatním počítačům v síti. - + localhost is not allowed as hostname. localhost není možné použít jako název počítače. - + Choose a password to keep your account safe. Zvolte si heslo pro ochranu svého účtu. - + Password Heslo - + Repeat Password Zopakování zadání hesla - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Zadání hesla zopakujte i do kontrolní kolonky, abyste měli jistotu, že jste napsali, co zamýšleli (že nedošlo k překlepu). Dobré heslo se bude skládat z písmen, číslic a interpunkce a mělo by být alespoň osm znaků dlouhé. Heslo byste také měli pravidelně měnit (prevence škod z jeho případného prozrazení). - + Validate passwords quality Ověřte kvalitu hesel - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Když je toto zaškrtnuto, je prověřována odolnost hesla a nebude umožněno použít snadno prolomitelné heslo. - + Log in automatically without asking for the password Přihlašovat se automaticky bez zadávání hesla - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Je možné použít pouze písmena, číslice, podtržítko a spojovník. Dále je třeba, aby délka byla alespoň dva znaky. - + Reuse user password as root password Použijte heslo uživatele i pro účet správce (root) - + Use the same password for the administrator account. Použít stejné heslo i pro účet správce systému. - + Choose a root password to keep your account safe. Zvolte heslo uživatele root, aby byl váš účet v bezpečí. - + Root Password Heslo uživatele root - + Repeat Root Password Zopakujte zadání hesla pro správce systému (root) - + Enter the same password twice, so that it can be checked for typing errors. Zadání hesla zopakujte i do kontrolní kolonky, abyste měli jistotu, že jste napsali, co zamýšleli (že nedošlo k překlepu). diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index f6dce538d..3a893935b 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Widgettræ - + Debug information Fejlretningsinformation @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Færdig @@ -261,7 +280,7 @@ Tjek af krav for modulet <i>%1</i> er fuldført. - + Waiting for %n module(s). Venter på %n modul. @@ -269,7 +288,7 @@ - + (%n second(s)) (%n sekund) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. Tjek af systemkrav er fuldført. @@ -484,12 +503,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. CalamaresWindow - + %1 Setup Program %1-opsætningsprogram - + %1 Installer %1-installationsprogram @@ -528,149 +547,149 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Formular - + Select storage de&vice: Vælg lageren&hed: - - - - + + + + Current: Nuværende: - + After: Efter: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Manuel partitionering</strong><br/>Du kan selv oprette og ændre størrelse på partitioner. - + Reuse %1 as home partition for %2. Genbrug %1 som hjemmepartition til %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Vælg en partition der skal mindskes, træk herefter den nederste bjælke for at ændre størrelsen</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 vil blive skrumpet til %2 MiB og en ny %3 MiB partition vil blive oprettet for %4. - + Boot loader location: Placering af bootloader: - + <strong>Select a partition to install on</strong> <strong>Vælg en partition at installere på</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. En EFI-partition blev ikke fundet på systemet. Gå venligst tilbage og brug manuel partitionering til at opsætte %1. - + The EFI system partition at %1 will be used for starting %2. EFI-systempartitionen ved %1 vil blive brugt til at starte %2. - + EFI system partition: EFI-systempartition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Lagerenheden ser ikke ud til at indeholde et styresystem. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Slet disk</strong><br/>Det vil <font color="red">slette</font> alt data på den valgte lagerenhed. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Installér ved siden af</strong><br/>Installationsprogrammet vil mindske en partition for at gøre plads til %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Erstat en partition</strong><br/>Erstatter en partition med %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Lagerenheden har %1 på sig. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før det sker ændringer til lagerenheden. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Lagerenheden indeholder allerede et styresystem. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Lagerenheden indeholder flere styresystemer. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Lagerenheden har allerede et styresystem på den men partitionstabellen <strong>%1</strong> er ikke magen til den nødvendige <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Lagerenhden har en af sine partitioner <strong>monteret</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Lagringsenheden er en del af en <strong>inaktiv RAID</strong>-enhed. - + No Swap Ingen swap - + Reuse Swap Genbrug swap - + Swap (no Hibernate) Swap (ingen dvale) - + Swap (with Hibernate) Swap (med dvale) - + Swap to file Swap til fil @@ -758,27 +777,27 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Config - + Set keyboard model to %1.<br/> Indstil tastaturmodel til %1.<br/> - + Set keyboard layout to %1/%2. Indstil tastaturlayout til %1/%2. - + Set timezone to %1/%2. Indstil tidszone til %1/%2. - + The system language will be set to %1. Systemets sprog indstilles til %1. - + The numbers and dates locale will be set to %1. Lokalitet for tal og datoer indstilles til %1. @@ -813,97 +832,97 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Netværksinstallation. (deaktiveret: kunne ikke hente pakkelister, tjek din netværksforbindelse) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Computeren imødekommer ikke minimumsystemkravene for at opsætte %1.<br/>Opsætningen kan ikke fortsætte. <a href="#details">Detaljer ...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Computeren imødekommer ikke minimumsystemkravene for at installere %1.<br/>Installationen kan ikke fortsætte. <a href="#details">Detaljer ...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Computeren imødekommer ikke nogle af de anbefalede systemkrav for at opsætte %1.<br/>Opsætningen kan fortsætte, men nogle funktionaliteter kan være deaktiveret. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Computeren imødekommer ikke nogle af de anbefalede systemkrav for at installere %1.<br/>Installationen kan fortsætte, men nogle funktionaliteter kan være deaktiveret. - + This program will ask you some questions and set up %2 on your computer. Programmet vil stille dig nogle spørgsmål og opsætte %2 på din computer. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Velkommen til Calamares-opsætningsprogrammet til %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Velkommen til %1-opsætningen</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Velkommen til Calamares-installationsprogrammet til %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Velkommen til %1-installationsprogrammet</h1> - + Your username is too long. Dit brugernavn er for langt. - + '%1' is not allowed as username. '%1' er ikke tilladt som brugernavn. - + Your username must start with a lowercase letter or underscore. Dit brugernavn skal begynde med et bogstav med småt eller understregning. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Det er kun tilladt at bruge bogstaver med småt, tal, understregning og bindestreg. - + Your hostname is too short. Dit værtsnavn er for kort. - + Your hostname is too long. Dit værtsnavn er for langt. - + '%1' is not allowed as hostname. '%1' er ikke tilladt som værtsnavn. - + Only letters, numbers, underscore and hyphen are allowed. Det er kun tilladt at bruge bogstaver, tal, understregning og bindestreg. - + Your passwords do not match! Dine adgangskoder er ikke ens! - + OK! @@ -959,11 +978,16 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. + Packages + Pakker + + + Install option: <strong>%1</strong> - + None @@ -1422,6 +1446,16 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1451,8 +1485,8 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Bekræft adgangskode - - + + Please enter the same passphrase in both boxes. Indtast venligst samme adgangskode i begge bokse. @@ -1541,32 +1575,32 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.&Genstart nu - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Færdig.</h1><br/>%1 er blevet opsat på din computer.<br/>Du kan nu begynde at bruge dit nye system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Når boksen er tilvalgt, vil dit system genstarte med det samme når du klikker på <span style="font-style:italic;">Færdig</span> eller lukker opsætningsprogrammet.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Færdig.</h1><br/>%1 er blevet installeret på din computer.<br/>Du kan nu genstarte for at komme ind i dit nye system eller fortsætte med at bruge %2 livemiljøet. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Når boksen er tilvalgt, vil dit system genstarte med det samme når du klikker på <span style="font-style:italic;">Færdig</span> eller lukker installationsprogrammet.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Opsætningen mislykkede</h1><br/>%1 er ikke blevet opsat på din computer.<br/>Fejlmeddelelsen var: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Installation mislykkede</h1><br/>%1 er ikke blevet installeret på din computer.<br/>Fejlmeddelelsen var: %2. @@ -1600,12 +1634,18 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Formatér <strong>%3 MiB</strong> partition <strong>%1</strong> med <strong>%2</strong>-filsystem. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formatterer partition %1 med %2-filsystem. - + The installer failed to format partition %1 on disk '%2'. Installationsprogrammet kunne ikke formatere partition %1 på disk '%2'. @@ -1613,12 +1653,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. GeneralRequirements - + has at least %1 GiB available drive space har mindst %1 GiB ledig plads på drevet - + There is not enough drive space. At least %1 GiB is required. Der er ikke nok ledig plads på drevet. Mindst %1 GiB er påkrævet. @@ -1658,27 +1698,27 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.kører installationsprogrammet som en administrator (root) - + The setup program is not running with administrator rights. Opsætningsprogrammet kører ikke med administratorrettigheder. - + The installer is not running with administrator rights. Installationsprogrammet kører ikke med administratorrettigheder. - + has a screen large enough to show the whole installer har en skærm, som er stor nok til at vise hele installationsprogrammet - + The screen is too small to display the setup program. Skærmen er for lille til at vise opsætningsprogrammet. - + The screen is too small to display the installer. Skærmen er for lille til at vise installationsprogrammet. @@ -1978,35 +2018,35 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. LuksBootKeyFileJob - + Configuring LUKS key file. Konfigurerer LUKS-nøglefil. - - + + No partitions are defined. Der er ikke defineret nogen partitioner. - - - + + + Encrypted rootfs setup error Fejl ved opsætning af krypteret rootfs - + Root partition %1 is LUKS but no passphrase has been set. Rodpartitionen %1 er LUKS men der er ikke indstillet nogen adgangskode. - + Could not create LUKS key file for root partition %1. Kunne ikke oprette LUKS-nøglefil for rodpartitionen %1. - + Could not configure LUKS key file on partition %1. Kunne ikke konfigurere LUKS-nøglefil på partitionen %1. @@ -2032,12 +2072,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Map - + Timezone: %1 Tidszone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2049,100 +2089,112 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. NetInstallViewStep - + Package selection Valg af pakke - + Office software Kontorsoftware - + Office package Kontorpakke - + Browser software Browsersoftware - + Browser package Browserpakke - + Web browser Webbrowser - + Kernel + label for netinstall module, Linux kernel Kerne - + Services + label for netinstall module, system services Tjenester - + Login + label for netinstall module, choose login manager Log ind - + Desktop + label for netinstall module, choose desktop environment Skrivebord - - Applications - Programmer - - - + Communication + label for netinstall module Kommunikation - + Development + label for netinstall module Udvikling - + Office + label for netinstall module Kontor - + Multimedia + label for netinstall module Multimedie - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Tema - + Gaming + label for netinstall module Spil - + Utilities + label for netinstall module Redskaber + + + Applications + Programmer + NotesQmlViewStep @@ -2191,24 +2243,24 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. - - - + + + Timezone: %1 Tidszone: %1 - + Select your preferred Zone within your Region. Vælg din foretrukne zone i dit område. - + Zones Zoner - + You can fine-tune Language and Locale settings below. Du kan finjustere sprog- og lokalitetsindstillinger nedenfor. @@ -2483,7 +2535,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Ukendt fejl - + Password is empty Adgangskoden er tom @@ -2521,22 +2573,6 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Vælg venligst et produkt fra listen. Det valgte produkt installeres. - - PackageChooserQmlViewStep - - - Packages - Pakker - - - - PackageChooserViewStep - - - Packages - Pakker - - PackageModel @@ -3065,7 +3101,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3392,12 +3428,12 @@ setting ResultsListDialog - + For best results, please ensure that this computer: For at få det bedste resultat sørg venligst for at computeren: - + System requirements Systemkrav @@ -3825,22 +3861,22 @@ setting <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Klik her for mere information om brugerfeedback</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Sporing hjælper %1 med at se hvor ofte den installeres, hvilken hardware den installeres på og hvilke programmer der bruges. Klik på hjælpeikonet ved siden af hvert område for at se hvad der sendes. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Vælges dette sender du information om din installation og hardware. Informationen sendes kun <b>én gang</b> efter installationen er færdig. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Vælges dette sender du periodisk information om din <b>maskines</b> installation, hardware og programmer, til %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Vælges dette sender du regelmæssigt information om din <b>brugers</b> installation, hardware, programmer og programmernes anvendelsesmønstre, til %1. @@ -4028,44 +4064,19 @@ setting - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Velkommen til Calamares-opsætningsprogrammet til %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Velkommen til %1-opsætningen.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Velkommen til Calamares-installationsprogrammet for %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Velkommen til %1-installationsprogrammet.</h1> - - - %1 support %1 support - + About %1 setup Om %1-opsætningen - + About %1 installer Om %1-installationsprogrammet - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Ophavsret 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Ophavsret 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Tak til <a href="https://calamares.io/team/">Calamares-teamet</a> og <a href="https://www.transifex.com/calamares/calamares/">Calamares-oversætterteamet</a>.<br/><br/>Udviklingen af <a href="https://calamares.io/">Calamares</a> sponsoreres af <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4130,33 +4141,7 @@ setting about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Ophavsret 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Ophavsret 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Tak til <a href='https://calamares.io/team/'>Calamares-teamet</a> - og <a href='https://www.transifex.com/calamares/calamares/'>Calamares-oversætterteamet</a>.<br/><br/> - Udviklingen af <a href='https://calamares.io/'>Calamares</a> - er sponsoreret af <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back Tilbage @@ -4258,17 +4243,17 @@ setting Tastaturmodel: - + Layouts Layouts - + Type here to test your keyboard Skriv her for at teste dit tastatur - + Variants Varianter @@ -4416,102 +4401,102 @@ setting Hvis mere end én person bruger computeren, kan du oprette flere konti efter installationen. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Det er kun tilladt at bruge bogstaver med småt, tal, understregning og bindestreg. - + root is not allowed as username. - + What is the name of this computer? Hvad er navnet på computeren? - + Computer Name Computernavn - + This name will be used if you make the computer visible to others on a network. Navnet bruges, hvis du gør computeren synlig for andre på et netværk. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Vælg en adgangskode for at beskytte din konto. - + Password Adgangskode - + Repeat Password Gentag adgangskode - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Skriv den samme adgangskode to gange, så den kan blive tjekket for skrivefejl. En god adgangskode indeholder en blanding af bogstaver, tal og specialtegn, bør være mindst 8 tegn langt og bør skiftes jævnligt. - + Validate passwords quality Validér kvaliteten af adgangskoderne - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Når boksen er tilvalgt, så foretages der tjek af adgangskodens styrke og du vil ikke være i stand til at bruge en svag adgangskode. - + Log in automatically without asking for the password Log ind automatisk uden at spørge efter adgangskoden - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password Genbrug brugeradgangskode som root-adgangskode - + Use the same password for the administrator account. Brug den samme adgangskode til administratorkontoen. - + Choose a root password to keep your account safe. Vælg en root-adgangskode til at holde din konto sikker - + Root Password Root-adgangskode - + Repeat Root Password Gentag root-adgangskode - + Enter the same password twice, so that it can be checked for typing errors. Skriv den samme adgangskode to gange, så den kan blive tjekket for skrivefejl. diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index 03477e78e..1fba578c4 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Widget-Baum - + Debug information Debug-Information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Fertig @@ -261,7 +280,7 @@ Die Anforderungsprüfung für das Modul <i>%1</i> ist abgeschlossen. - + Waiting for %n module(s). Warten auf %n Modul. @@ -269,7 +288,7 @@ - + (%n second(s)) (%n Sekunde) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. Die Überprüfung der Systemvoraussetzungen ist abgeschlossen. @@ -488,12 +507,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. CalamaresWindow - + %1 Setup Program %1 Installationsprogramm - + %1 Installer %1 Installationsprogramm @@ -533,149 +552,149 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Form - + Select storage de&vice: Speichermedium auswählen - - - - + + + + Current: Aktuell: - + After: Nachher: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Manuelle Partitionierung</strong><br/>Sie können Partitionen eigenhändig erstellen oder in der Grösse verändern. - + Reuse %1 as home partition for %2. %1 als Home-Partition für %2 wiederverwenden. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Wählen Sie die zu verkleinernde Partition, dann ziehen Sie den Regler, um die Größe zu ändern</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 wird auf %2MiB verkleinert und eine neue Partition mit einer Größe von %3MiB wird für %4 erstellt werden. - + Boot loader location: Installationsziel des Bootloaders: - + <strong>Select a partition to install on</strong> <strong>Wählen Sie eine Partition für die Installation</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Es wurde keine EFI-Systempartition auf diesem System gefunden. Bitte gehen Sie zurück und nutzen Sie die manuelle Partitionierung für das Einrichten von %1. - + The EFI system partition at %1 will be used for starting %2. Die EFI-Systempartition %1 wird benutzt, um %2 zu starten. - + EFI system partition: EFI-Systempartition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Auf diesem Speichermedium scheint kein Betriebssystem installiert zu sein. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen auf diesem Speichermedium vorgenommen werden. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Festplatte löschen</strong><br/>Dies wird alle vorhandenen Daten auf dem gewählten Speichermedium <font color="red">löschen</font>. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Parallel dazu installieren</strong><br/>Das Installationsprogramm wird eine Partition verkleinern, um Platz für %1 zu schaffen. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Ersetze eine Partition</strong><br/>Ersetzt eine Partition durch %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Auf diesem Speichermedium ist %1 installiert. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen an dem Speichermedium vorgenommen werden. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Dieses Speichermedium enthält bereits ein Betriebssystem. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen an dem Speichermedium vorgenommen wird. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Auf diesem Speichermedium sind mehrere Betriebssysteme installiert. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen an dem Speichermedium vorgenommen werden. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Auf diesem Speichergerät befindet sich bereits ein Betriebssystem, aber die Partitionstabelle <strong>%1</strong> unterscheidet sich von den erforderlichen <strong>%2</strong><br/> - + This storage device has one of its partitions <strong>mounted</strong>. Bei diesem Speichergerät ist eine seiner Partitionen <strong>eingehängt</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Dieses Speichergerät ist ein Teil eines <strong>inaktiven RAID</strong>-Geräts. - + No Swap Kein Swap - + Reuse Swap Swap wiederverwenden - + Swap (no Hibernate) Swap (ohne Ruhezustand) - + Swap (with Hibernate) Swap (mit Ruhezustand) - + Swap to file Auslagerungsdatei verwenden @@ -763,27 +782,27 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Config - + Set keyboard model to %1.<br/> Setze Tastaturmodell auf %1.<br/> - + Set keyboard layout to %1/%2. Setze Tastaturbelegung auf %1/%2. - + Set timezone to %1/%2. Setze Zeitzone auf %1%2. - + The system language will be set to %1. Die Systemsprache wird auf %1 eingestellt. - + The numbers and dates locale will be set to %1. Das Format für Zahlen und Datum wird auf %1 gesetzt. @@ -818,97 +837,97 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Netzwerk-Installation. (Deaktiviert: Paketlisten nicht erreichbar, prüfen Sie Ihre Netzwerk-Verbindung) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Dieser Computer erfüllt nicht die Mindestvoraussetzungen für die Installation von %1.<br/>Die Installation kann nicht fortgesetzt werden. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Dieser Computer erfüllt nicht die Mindestvoraussetzungen für die Installation von %1.<br/>Die Installation kann nicht fortgesetzt werden. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Dieser Computer erfüllt nicht alle empfohlenen Voraussetzungen für die Installation von %1.<br/>Die Installation kann fortgesetzt werden, aber es werden eventuell nicht alle Funktionen verfügbar sein. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Dieser Computer erfüllt nicht alle empfohlenen Voraussetzungen für die Installation von %1.<br/>Die Installation kann fortgesetzt werden, aber es werden eventuell nicht alle Funktionen verfügbar sein. - + This program will ask you some questions and set up %2 on your computer. Dieses Programm wird Ihnen einige Fragen stellen, um %2 auf Ihrem Computer zu installieren. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Willkommen bei Calamares, dem Installationsprogramm für %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Willkommen zur Installation von %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Willkommen bei Calamares, dem Installationsprogramm für %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Willkommen zum Installationsprogramm für %1</h1> - + Your username is too long. Ihr Benutzername ist zu lang. - + '%1' is not allowed as username. '%1' ist als Benutzername nicht erlaubt. - + Your username must start with a lowercase letter or underscore. Ihr Benutzername muss mit einem Kleinbuchstaben oder Unterstrich beginnen. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Es sind nur Kleinbuchstaben, Zahlen, Unterstrich und Bindestrich erlaubt. - + Your hostname is too short. Ihr Computername ist zu kurz. - + Your hostname is too long. Ihr Computername ist zu lang. - + '%1' is not allowed as hostname. '%1' ist als Computername nicht erlaubt. - + Only letters, numbers, underscore and hyphen are allowed. Es sind nur Buchstaben, Zahlen, Unter- und Bindestriche erlaubt. - + Your passwords do not match! Ihre Passwörter stimmen nicht überein! - + OK! OK! @@ -964,11 +983,16 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. + Packages + Pakete + + + Install option: <strong>%1</strong> Installations-Option: <strong>%1</strong> - + None Nichts @@ -1427,6 +1451,16 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. FS Label: FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1456,8 +1490,8 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Passwort wiederholen - - + + Please enter the same passphrase in both boxes. Bitte tragen Sie dasselbe Passwort in beide Felder ein. @@ -1546,32 +1580,32 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Jetzt &Neustarten - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Alles erledigt.</h1><br/>%1 wurde auf Ihrem Computer eingerichtet.<br/>Sie können nun mit Ihrem neuen System arbeiten. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Wenn diese Option aktiviert ist, genügt zum Neustart des Systems ein Klick auf <span style="font-style:italic;">Fertig</span> oder das Schließen des Installationsprogramms.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Alles erledigt.</h1><br/>%1 wurde auf Ihrem Computer installiert.<br/>Sie können nun in Ihr neues System neustarten oder mit der %2 Live-Umgebung fortfahren. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Wenn diese Option aktiviert ist, genügt zum Neustart des Systems ein Klick auf <span style="font-style:italic;">Fertig</span> oder das Schließen des Installationsprogramms.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Installation fehlgeschlagen</h1><br/>%1 wurde nicht auf Ihrem Computer eingerichtet.<br/>Die Fehlermeldung war: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Installation fehlgeschlagen</h1><br/>%1 wurde nicht auf deinem Computer installiert.<br/>Die Fehlermeldung lautet: %2. @@ -1605,12 +1639,18 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Formatiere <strong>%3MiB</strong> Partition <strong>%1</strong> mit dem Dateisystem <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formatiere Partition %1 mit Dateisystem %2. - + The installer failed to format partition %1 on disk '%2'. Das Formatieren von Partition %1 auf Datenträger '%2' ist fehlgeschlagen. @@ -1618,12 +1658,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. GeneralRequirements - + has at least %1 GiB available drive space mindestens %1 GiB freien Festplattenplatz hat - + There is not enough drive space. At least %1 GiB is required. Zu wenig Speicherplatz auf der Festplatte. Es wird mindestens %1 GiB benötigt. @@ -1663,27 +1703,27 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. führt das Installationsprogramm als Administrator (root) aus - + The setup program is not running with administrator rights. Das Installationsprogramm wird nicht mit Administratorrechten ausgeführt. - + The installer is not running with administrator rights. Das Installationsprogramm wird nicht mit Administratorrechten ausgeführt. - + has a screen large enough to show the whole installer hat einen ausreichend großen Bildschirm für die Anzeige des gesamten Installationsprogramm - + The screen is too small to display the setup program. Der Bildschirm ist zu klein, um das Installationsprogramm anzuzeigen. - + The screen is too small to display the installer. Der Bildschirm ist zu klein, um das Installationsprogramm anzuzeigen. @@ -1983,35 +2023,35 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. LuksBootKeyFileJob - + Configuring LUKS key file. Konfiguriere LUKS-Schlüsseldatei. - - + + No partitions are defined. Keine Partitionen definiert. - - - + + + Encrypted rootfs setup error Fehler bei der Einrichtung der verschlüsselten Root-Partition - + Root partition %1 is LUKS but no passphrase has been set. Root-Partition %1 ist mit LUKS verschlüsselt, aber es wurde kein Passwort gesetzt. - + Could not create LUKS key file for root partition %1. Konnte die LUKS-Schlüsseldatei für die Root-Partition %1 nicht erstellen. - + Could not configure LUKS key file on partition %1. Die LUKS-Schlüsseldatei konnte nicht auf Partition %1 eingerichtet werden. @@ -2037,12 +2077,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Map - + Timezone: %1 Zeitzone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2054,100 +2094,112 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. NetInstallViewStep - + Package selection Paketauswahl - + Office software Office-Software - + Office package Office-Paket - + Browser software Browser-Software - + Browser package Browser-Paket - + Web browser Webbrowser - + Kernel + label for netinstall module, Linux kernel Kernel - + Services + label for netinstall module, system services Dienste - + Login + label for netinstall module, choose login manager Anmeldung - + Desktop + label for netinstall module, choose desktop environment Desktop - - Applications - Anwendungen - - - + Communication + label for netinstall module Kommunikation - + Development + label for netinstall module Entwicklung - + Office + label for netinstall module Büro - + Multimedia + label for netinstall module Multimedia - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Anpassung - + Gaming + label for netinstall module Spielen - + Utilities + label for netinstall module Dienstprogramme + + + Applications + Anwendungen + NotesQmlViewStep @@ -2196,24 +2248,24 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Wählen Sie Ihre bevorzugte Region oder nutzen Sie die Standardeinstellungen. - - - + + + Timezone: %1 Zeitzone: %1 - + Select your preferred Zone within your Region. Wählen Sie Ihre bevorzugte Zone innerhalb Ihrer Region. - + Zones Zonen - + You can fine-tune Language and Locale settings below. Sie können Sprache und Regionalschema unten weiter anpassen. @@ -2488,7 +2540,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Unbekannter Fehler - + Password is empty Passwort nicht vergeben @@ -2526,22 +2578,6 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Bitte wählen Sie ein Produkt aus der Liste aus. Das ausgewählte Produkt wird installiert. - - PackageChooserQmlViewStep - - - Packages - Pakete - - - - PackageChooserViewStep - - - Packages - Pakete - - PackageModel @@ -3070,7 +3106,7 @@ Ausgabe: QObject - + %1 (%2) %1 (%2) @@ -3396,12 +3432,12 @@ Ausgabe: ResultsListDialog - + For best results, please ensure that this computer: Für das beste Ergebnis stellen Sie bitte sicher, dass dieser Computer: - + System requirements Systemanforderungen @@ -3829,22 +3865,22 @@ Ausgabe: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Klicken sie hier für weitere Informationen über Benutzer-Rückmeldungen</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Tracking hilft %1 festzustellen, wie oft es installiert wurde, welche Hardware und welche Anwendungen benutzt werden. Um zu sehen, welche Informationen gesendet werden, klicken Sie auf das Hilfesymbol daneben. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Wenn Sie dies auswählen, werden Informationen über Ihre Installation und Hardware gesendet. Diese Informationen werden nur <b>einmal</b> nach der Installation gesendet. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Wenn Sie dies auswählen, werden gelegentlich Informationen über Installation, Hardware und Anwendungen dieses <b>Computers</b> an %1 gesendet. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Wenn Sie dies auswählen, werden regelmäßig Informationen über Installation, Hardware, Anwendungen und Benutzungsmuster dieses <b>Benutzers</b> an %1 gesendet. @@ -4032,44 +4068,19 @@ Ausgabe: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Willkommen bei Calamares, dem Installationsprogramm für %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Willkommen zur Installation von %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Willkommen beim Calamares-Installationsprogramm für %1. - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Willkommen im %1 Installationsprogramm.</h1> - - - %1 support Unterstützung für %1 - + About %1 setup Über das Installationsprogramm %1 - + About %1 installer Über das %1 Installationsprogramm - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>für %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Dank an <a href="https://calamares.io/team/">das Calamares Team</a> und das <a href="https://www.transifex.com/calamares/calamares/">Calamares Übersetzerteam</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> wird in der Entwicklung unterstützt von <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4134,34 +4145,7 @@ Ausgabe: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - für %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Dank an <a href='https://calamares.io/team/'>das Calamares Team</a> - und das <a href='https://www.transifex.com/calamares/calamares/'>Calamares - Übersetzerteam</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - wird bei der Entwicklung unterstützt von <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back Zurück @@ -4266,17 +4250,17 @@ Ausgabe: Tastaturmodell: - + Layouts Tastaturbelegungen - + Type here to test your keyboard Tippen Sie hier, um die Tastaturbelegung zu testen. - + Variants Varianten @@ -4425,102 +4409,102 @@ Ausgabe: Falls mehrere Personen diesen Computer benutzen, können Sie nach der Installation weitere Konten hinzufügen. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Es sind nur Kleinbuchstaben, Zahlen, Unterstrich und Bindestrich erlaubt. - + root is not allowed as username. root ist als Benutzername nicht erlaubt. - + What is the name of this computer? Wie ist der Name dieses Computers? - + Computer Name Computername - + This name will be used if you make the computer visible to others on a network. Dieser Name wird benutzt, wenn Sie den Computer im Netzwerk für andere sichtbar machen. - + localhost is not allowed as hostname. localhost ist als Computername nicht erlaubt. - + Choose a password to keep your account safe. Wählen Sie ein Passwort, um Ihr Konto zu sichern. - + Password Passwort - + Repeat Password Passwort wiederholen - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Geben Sie das Passwort zweimal ein, damit es auf Tippfehler überprüft werden kann. Ein gutes Passwort sollte eine Mischung aus Buchstaben, Zahlen sowie Sonderzeichen enthalten, mindestens acht Zeichen lang sein und regelmäßig geändert werden. - + Validate passwords quality Passwort-Qualität überprüfen - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Wenn dieses Kontrollkästchen aktiviert ist, wird die Passwortstärke überprüft und verhindert, dass Sie ein schwaches Passwort verwenden. - + Log in automatically without asking for the password Automatisch anmelden ohne Passwortabfrage - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Es sind nur Buchstaben, Zahlen, Unterstrich und Bindestrich erlaubt, minimal zwei Zeichen. - + Reuse user password as root password Benutzerpasswort als Root-Passwort benutzen - + Use the same password for the administrator account. Nutze das gleiche Passwort auch für das Administratorkonto. - + Choose a root password to keep your account safe. Wählen Sie ein Root-Passwort, um Ihr Konto zu schützen. - + Root Password Root-Passwort - + Repeat Root Password Root-Passwort wiederholen - + Enter the same password twice, so that it can be checked for typing errors. Geben Sie das Passwort zweimal ein, damit es auf Tippfehler überprüft werden kann. diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts index aa1988220..c4598ac31 100644 --- a/lang/calamares_el.ts +++ b/lang/calamares_el.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information Πληροφορίες αποσφαλμάτωσης @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Ολοκληρώθηκε @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -483,12 +502,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer Εφαρμογή εγκατάστασης του %1 @@ -527,149 +546,149 @@ The installer will quit and all changes will be lost. Τύπος - + Select storage de&vice: Επιλέξτε συσκευή απ&οθήκευσης: - - - - + + + + Current: Τρέχον: - + After: Μετά: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Χειροκίνητη τμηματοποίηση</strong><br/>Μπορείτε να δημιουργήσετε κατατμήσεις ή να αλλάξετε το μέγεθός τους μόνοι σας. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Επιλέξτε ένα διαμέρισμα για σμίκρυνση, και μετά σύρετε το κάτω τμήμα της μπάρας για αλλαγή του μεγέθους</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Τοποθεσία προγράμματος εκκίνησης: - + <strong>Select a partition to install on</strong> <strong>Επιλέξτε διαμέρισμα για την εγκατάσταση</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Πουθενά στο σύστημα δεν μπορεί να ανιχθευθεί μία κατάτμηση EFI. Παρακαλώ επιστρέψτε πίσω και χρησιμοποιήστε τη χειροκίνητη τμηματοποίηση για την εγκατάσταση του %1. - + The EFI system partition at %1 will be used for starting %2. Η κατάτμηση συστήματος EFI στο %1 θα χρησιμοποιηθεί για την εκκίνηση του %2. - + EFI system partition: Κατάτμηση συστήματος EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Η συσκευή αποθήκευσης δεν φαίνεται να διαθέτει κάποιο λειτουργικό σύστημα. Τί θα ήθελες να κάνεις;<br/>Θα έχεις την δυνατότητα να επιβεβαιώσεις και αναθεωρήσεις τις αλλαγές πριν γίνει οποιαδήποτε αλλαγή στην συσκευή αποθήκευσης. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Διαγραφή του δίσκου</strong><br/>Αυτό θα <font color="red">διαγράψει</font> όλα τα αρχεία στην επιλεγμένη συσκευή αποθήκευσης. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Εγκατάσταση σε επαλληλία</strong><br/>Η εγκατάσταση θα συρρικνώσει μία κατάτμηση για να κάνει χώρο για το %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Αντικατάσταση μίας κατάτμησης</strong><br/>Αντικαθιστά μία κατάτμηση με το %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -757,27 +776,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Ορισμός του μοντέλου πληκτρολογίου σε %1.<br/> - + Set keyboard layout to %1/%2. Ορισμός της διάταξης πληκτρολογίου σε %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. Η τοπική γλώσσα του συστήματος έχει οριστεί σε %1. - + The numbers and dates locale will be set to %1. @@ -812,97 +831,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Ο υπολογιστής δεν ικανοποιεί τις ελάχιστες απαιτήσεις για την εγκατάσταση του %1.<br/>Η εγκατάσταση δεν μπορεί να συνεχιστεί. <a href="#details">Λεπτομέριες...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Αυτός ο υπολογιστής δεν ικανοποιεί μερικές από τις συνιστώμενες απαιτήσεις για την εγκατάσταση του %1.<br/>Η εγκατάσταση μπορεί να συνεχιστεί, αλλά ορισμένες λειτουργίες μπορεί να απενεργοποιηθούν. - + This program will ask you some questions and set up %2 on your computer. Το πρόγραμμα θα σας κάνει μερικές ερωτήσεις και θα ρυθμίσει το %2 στον υπολογιστή σας. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. Το όνομα χρήστη είναι πολύ μακρύ. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Το όνομα υπολογιστή είναι πολύ σύντομο. - + Your hostname is too long. Το όνομα υπολογιστή είναι πολύ μακρύ. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Οι κωδικοί πρόσβασης δεν ταιριάζουν! - + OK! @@ -958,11 +977,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1421,6 +1445,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1450,8 +1484,8 @@ The installer will quit and all changes will be lost. Επιβεβαίωση λέξης κλειδί - - + + Please enter the same passphrase in both boxes. Παρακαλώ εισάγετε την ίδια λέξη κλειδί και στα δύο κουτιά. @@ -1540,32 +1574,32 @@ The installer will quit and all changes will be lost. Ε&πανεκκίνηση τώρα - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Η εγκατάσταση ολοκληρώθηκε.</h1><br/>Το %1 εγκαταστήθηκε στον υπολογιστή.<br/>Τώρα, μπορείτε να επανεκκινήσετε τον υπολογιστή σας ή να συνεχίσετε να δοκιμάζετε το %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1599,12 +1633,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1612,12 +1652,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1657,27 +1697,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Το πρόγραμμα εγκατάστασης δεν εκτελείται με δικαιώματα διαχειριστή. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Η οθόνη είναι πολύ μικρή για να απεικονίσει το πρόγραμμα εγκατάστασης @@ -1977,35 +2017,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2031,12 +2071,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2046,98 +2086,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection Επιλογή πακέτου - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2188,24 +2240,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2480,7 +2532,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2518,22 +2570,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3059,7 +3095,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3382,12 +3418,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: Για καλύτερο αποτέλεσμα, παρακαλώ βεβαιωθείτε ότι ο υπολογιστής: - + System requirements Απαιτήσεις συστήματος @@ -3815,22 +3851,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4018,44 +4054,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Καλώς ήλθατε στην εγκατάσταση του %1.</h1> - - - %1 support Υποστήριξη %1 - + About %1 setup - + About %1 installer Σχετικά με το πρόγραμμα εγκατάστασης %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4120,23 +4131,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4236,17 +4231,17 @@ Output: Μοντέλο πληκτρολογίου: - + Layouts - + Type here to test your keyboard Πληκτρολογείστε εδώ για να δοκιμάσετε το πληκτρολόγιο σας - + Variants @@ -4373,102 +4368,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? Ποιο είναι το όνομά του υπολογιστή; - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Επιλέξτε ένα κωδικό για να διατηρήσετε το λογαριασμό σας ασφαλή. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. Χρησιμοποιήστε τον ίδιο κωδικό πρόσβασης για τον λογαριασμό διαχειριστή. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts index f3d84c625..00c38a6b5 100644 --- a/lang/calamares_en.ts +++ b/lang/calamares_en.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + Copyright %1-%2 %3 &lt;%4&gt;<br/> + + AutoMountManagementJob @@ -137,7 +156,7 @@ Widget Tree - + Debug information Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Done @@ -261,23 +280,23 @@ Requirements checking for module <i>%1</i> is complete. - + Waiting for %n module(s). - Waiting for %n module(s). - Waiting for %n module(s). + Waiting for %n module. + Waiting for %n modules. - + (%n second(s)) - (%n second(s)) - (%n second(s)) + (%n second) + (%n seconds) - + System-requirements checking is complete. System-requirements checking is complete. @@ -488,12 +507,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 Setup Program - + %1 Installer %1 Installer @@ -532,149 +551,149 @@ The installer will quit and all changes will be lost. Form - + Select storage de&vice: Select storage de&vice: - - - - + + + + Current: Current: - + After: After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Boot loader location: - + <strong>Select a partition to install on</strong> <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. The EFI system partition at %1 will be used for starting %2. - + EFI system partition: EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap No Swap - + Reuse Swap Reuse Swap - + Swap (no Hibernate) Swap (no Hibernate) - + Swap (with Hibernate) Swap (with Hibernate) - + Swap to file Swap to file @@ -762,27 +781,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. Set keyboard layout to %1/%2. - + Set timezone to %1/%2. Set timezone to %1/%2. - + The system language will be set to %1. The system language will be set to %1. - + The numbers and dates locale will be set to %1. The numbers and dates locale will be set to %1. @@ -817,97 +836,97 @@ The installer will quit and all changes will be lost. Network Installation. (Disabled: Unable to fetch package lists, check your network connection) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Welcome to the %1 installer</h1> - + Your username is too long. Your username is too long. - + '%1' is not allowed as username. '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Your hostname is too short. - + Your hostname is too long. Your hostname is too long. - + '%1' is not allowed as hostname. '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Your passwords do not match! - + OK! OK! @@ -963,11 +982,16 @@ The installer will quit and all changes will be lost. + Packages + Packages + + + Install option: <strong>%1</strong> Install option: <strong>%1</strong> - + None None @@ -1426,6 +1450,16 @@ The installer will quit and all changes will be lost. FS Label: FS Label: + + + Passphrase for existing partition + Passphrase for existing partition + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. + + EncryptWidget @@ -1455,8 +1489,8 @@ The installer will quit and all changes will be lost. Confirm passphrase - - + + Please enter the same passphrase in both boxes. Please enter the same passphrase in both boxes. @@ -1545,32 +1579,32 @@ The installer will quit and all changes will be lost. &Restart now - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1604,12 +1638,18 @@ The installer will quit and all changes will be lost. Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. The installer failed to format partition %1 on disk '%2'. @@ -1617,12 +1657,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. There is not enough drive space. At least %1 GiB is required. @@ -1662,27 +1702,27 @@ The installer will quit and all changes will be lost. is running the installer as an administrator (root) - + The setup program is not running with administrator rights. The setup program is not running with administrator rights. - + The installer is not running with administrator rights. The installer is not running with administrator rights. - + has a screen large enough to show the whole installer has a screen large enough to show the whole installer - + The screen is too small to display the setup program. The screen is too small to display the setup program. - + The screen is too small to display the installer. The screen is too small to display the installer. @@ -1982,35 +2022,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. Configuring LUKS key file. - - + + No partitions are defined. No partitions are defined. - - - + + + Encrypted rootfs setup error Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. Could not configure LUKS key file on partition %1. @@ -2036,12 +2076,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2053,100 +2093,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection Package selection - + Office software Office software - + Office package Office package - + Browser software Browser software - + Browser package Browser package - + Web browser Web browser - + Kernel + label for netinstall module, Linux kernel Kernel - + Services + label for netinstall module, system services Services - + Login + label for netinstall module, choose login manager Login - + Desktop + label for netinstall module, choose desktop environment Desktop - - Applications - Applications - - - + Communication + label for netinstall module Communication - + Development + label for netinstall module Development - + Office + label for netinstall module Office - + Multimedia + label for netinstall module Multimedia - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Theming - + Gaming + label for netinstall module Gaming - + Utilities + label for netinstall module Utilities + + + Applications + Applications + NotesQmlViewStep @@ -2195,24 +2247,24 @@ The installer will quit and all changes will be lost. Select your preferred Region, or use the default settings. - - - + + + Timezone: %1 Timezone: %1 - + Select your preferred Zone within your Region. Select your preferred Zone within your Region. - + Zones Zones - + You can fine-tune Language and Locale settings below. You can fine-tune Language and Locale settings below. @@ -2487,7 +2539,7 @@ The installer will quit and all changes will be lost. Unknown error - + Password is empty Password is empty @@ -2525,22 +2577,6 @@ The installer will quit and all changes will be lost. Please pick a product from the list. The selected product will be installed. - - PackageChooserQmlViewStep - - - Packages - Packages - - - - PackageChooserViewStep - - - Packages - Packages - - PackageModel @@ -3069,7 +3105,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3395,12 +3431,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: For best results, please ensure that this computer: - + System requirements System requirements @@ -3828,22 +3864,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -3986,89 +4022,59 @@ Output: - &About - &About - - - Open donations website Open donations website - + &Donate &Donate - + Open help and support website Open help and support website - + &Support &Support - + Open issues and bug-tracking website Open issues and bug-tracking website - + &Known issues &Known issues - + Open release notes website Open release notes website - + &Release notes &Release notes - - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Welcome to %1 setup.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Welcome to the Calamares installer for %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Welcome to the %1 installer.</h1> - - - + %1 support %1 support - + About %1 setup About %1 setup - + About %1 installer About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4130,47 +4136,17 @@ Output: The output was: - - about - - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - Back - Back - - calamares-sidebar - - Show debug information - Show debug information + + About + About + + + + Debug + @@ -4265,17 +4241,17 @@ Output: Keyboard Model: - + Layouts Layouts - + Type here to test your keyboard Type here to test your keyboard - + Variants Variants @@ -4424,102 +4400,102 @@ Output: If more than one person will use this computer, you can create multiple accounts after installation. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. root is not allowed as username. - + What is the name of this computer? What is the name of this computer? - + Computer Name Computer Name - + This name will be used if you make the computer visible to others on a network. This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. localhost is not allowed as hostname. - + Choose a password to keep your account safe. Choose a password to keep your account safe. - + Password Password - + Repeat Password Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password Reuse user password as root password - + Use the same password for the administrator account. Use the same password for the administrator account. - + Choose a root password to keep your account safe. Choose a root password to keep your account safe. - + Root Password Root Password - + Repeat Root Password Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. Enter the same password twice, so that it can be checked for typing errors. @@ -4535,26 +4511,21 @@ Output: - About - About - - - Support Support - + Known issues Known issues - + Release notes Release notes - + Donate Donate diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts index 9993454ed..e4bea73d6 100644 --- a/lang/calamares_en_GB.ts +++ b/lang/calamares_en_GB.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Done @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -483,12 +502,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Installer @@ -527,149 +546,149 @@ The installer will quit and all changes will be lost. Form - + Select storage de&vice: Select storage de&vice: - - - - + + + + Current: Current: - + After: After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Boot loader location: - + <strong>Select a partition to install on</strong> <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. The EFI system partition at %1 will be used for starting %2. - + EFI system partition: EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -757,27 +776,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. The system language will be set to %1. - + The numbers and dates locale will be set to %1. The numbers and dates locale will be set to %1. @@ -812,97 +831,97 @@ The installer will quit and all changes will be lost. Network Installation. (Disabled: Unable to fetch package lists, check your network connection) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Your hostname is too short. - + Your hostname is too long. Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Your passwords do not match! - + OK! @@ -958,11 +977,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1421,6 +1445,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1450,8 +1484,8 @@ The installer will quit and all changes will be lost. Confirm passphrase - - + + Please enter the same passphrase in both boxes. Please enter the same passphrase in both boxes. @@ -1540,32 +1574,32 @@ The installer will quit and all changes will be lost. &Restart now - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1599,12 +1633,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. The installer failed to format partition %1 on disk '%2'. @@ -1612,12 +1652,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1657,27 +1697,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. The screen is too small to display the installer. @@ -1977,35 +2017,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2031,12 +2071,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2046,98 +2086,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2188,24 +2240,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2480,7 +2532,7 @@ The installer will quit and all changes will be lost. Unknown error - + Password is empty @@ -2518,22 +2570,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3062,7 +3098,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3385,12 +3421,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: For best results, please ensure that this computer: - + System requirements System requirements @@ -3818,22 +3854,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4021,44 +4057,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Welcome to the Calamares installer for %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Welcome to the %1 installer.</h1> - - - %1 support %1 support - + About %1 setup - + About %1 installer About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4123,23 +4134,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4239,17 +4234,17 @@ Output: Keyboard Model: - + Layouts - + Type here to test your keyboard Type here to test your keyboard - + Variants @@ -4376,102 +4371,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts index 8c983a472..42889ddff 100644 --- a/lang/calamares_eo.ts +++ b/lang/calamares_eo.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ KromprogrametArbo - + Debug information Sencimiga Informaĵo @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Finita @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -487,12 +506,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instalilo @@ -531,149 +550,149 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. Formularo - + Select storage de&vice: Elektita &tenada aparato - - - - + + + + Current: Nune: - + After: Poste: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Allokigo de la Praŝargilo: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -761,27 +780,27 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -816,97 +835,97 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -962,11 +981,16 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1425,6 +1449,16 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1454,8 +1488,8 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - - + + Please enter the same passphrase in both boxes. @@ -1544,32 +1578,32 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. &Restartigu nun - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Plenumita!</h1><br/>%1 estis agordita sur vian komputilon.<br/>Vi povas nun ekuzi vian novan sistemon. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Se ĉi tio elektobutono estas elektita, via sistemo restartos senprokraste, kiam vi klikas <span style="font-style:italic;">Finita</span> aŭ vi malfermas la agordilon.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Plenumita!</h1><br/>%1 estis instalita sur vian komputilon.<br/>Vi povas nun restartigas en vian novan sistemon, aŭ vi povas pluiri uzi la %2 aŭtonoman sistemon. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Se ĉi tio elektobutono estas elektita, via sistemo restartos senprokraste, kiam vi klikas <span style="font-style:italic;">Finita</span> aŭ vi malfermas la instalilon.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Agorado Malsukcesis</h1><br/>%1 ne estis agordita sur vian komputilon.<br/>La erara mesaĝo estis: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalaĵo Malsukcesis</h1><br/>%1 ne estis instalita sur vian komputilon.<br/>La erara mesaĝo estis: %2. @@ -1603,12 +1637,18 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. Strukturu <strong>%3MiB</strong> subdiskon <strong>%1</strong> kiel dosiersistemo <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1(%2) + + + Formatting partition %1 with file system %2. Strukturanta subdiskon %1 kiel dosiersistemo %2. - + The installer failed to format partition %1 on disk '%2'. La instalilo malsukcesis strukturi ls subdiskon %1 sur disko '%2'. @@ -1616,12 +1656,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1661,27 +1701,27 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1981,35 +2021,35 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2035,12 +2075,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2050,98 +2090,110 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2192,24 +2244,24 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2484,7 +2536,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - + Password is empty @@ -2522,22 +2574,6 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3063,7 +3099,7 @@ Output: QObject - + %1 (%2) %1(%2) @@ -3386,12 +3422,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3819,22 +3855,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4022,44 +4058,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4124,23 +4135,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4240,17 +4235,17 @@ Output: - + Layouts - + Type here to test your keyboard - + Variants @@ -4377,102 +4372,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts index d8aff5cd8..5169765a9 100644 --- a/lang/calamares_es.ts +++ b/lang/calamares_es.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Árbol de «widgets» - + Debug information Información de depuración @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Hecho @@ -261,23 +280,25 @@ Se ha terminado la comprobación de requisitos para el módulo <i>%1</i>. - + Waiting for %n module(s). Esperando a %n módulo. Esperando a %n módulos. + Esperando a %n módulos. - + (%n second(s)) (%n segundo) (%n segundos) + (%n segundos) - + System-requirements checking is complete. Se ha terminado la comprobación de los requisitos del sistema. @@ -365,17 +386,17 @@ El enlace se ha copiado en el portapapeles. The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - El programa de instalación %1 está a punto de hacer cambios en el disco con el fin de configurar %2.<br/><strong>No podrás deshacer estos cambios.</strong> + El configurador de %1 está a punto de hacer cambios en el disco con el fin de preparar y dejar listo %2.<br/><strong>Ten en cuenta que una vez empezados no se podrán deshacer.</strong> The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - El instalador %1 está a punto de hacer cambios en el disco con el fin de instalar %2.<br/><strong>No podrás deshacer estos cambios.</strong> + El instalador %1 está a punto de hacer cambios en el disco con el fin de instalar %2.<br/><strong>Ten en cuenta que una vez empezados no se podrán deshacer.</strong> &Set up now - &Configurar ahora + Empezar la &preparación @@ -488,12 +509,12 @@ El instalador se cerrará y todos tus cambios se perderán. CalamaresWindow - + %1 Setup Program Programa de configuración de %1 - + %1 Installer Instalador de %1 @@ -532,149 +553,149 @@ El instalador se cerrará y todos tus cambios se perderán. Formulario - + Select storage de&vice: Elige un dispositivo de almacenamiento: - - - - + + + + Current: Ahora: - + After: Después: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Particionado manual</strong><br/> Puedes crear o cambiar el tamaño de las particiones a tu gusto. - + Reuse %1 as home partition for %2. Reutilizar %1 como partición de datos personales («home») para %2 - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Elige la partición a reducir, una vez hecho esto arrastra la barra inferior para configurar el espacio restante</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 se reducirá a %2MiB y se creará una nueva partición de %3MiB para %4. - + Boot loader location: Ubicación del cargador de arranque: - + <strong>Select a partition to install on</strong> <strong>Elige una partición en la que realizar la instalación</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. No parece que haya ninguna partición del sistema EFI en el equipo. Puedes volver atrás y preparar %1 con la opción de particionado manual. - + The EFI system partition at %1 will be used for starting %2. La partición del sistema EFI en «%1» se va a usar para arrancar %2. - + EFI system partition: Partición del sistema EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Este dispositivo de almacenamiento no parece tener un sistema operativo dentro. ¿Qué quieres hacer?<br/>Podrás revisar y confirmar los cambios antes de que pase nada. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Borrar el disco</strong><br/>Esto <font color="red">eliminará permanentemente</font> todos los datos en el dispositivo de almacenamiento. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instalar al lado</strong><br/>El instalador reducirá el tamaño de una partición y dejará el suficiente para instalar %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Reemplazar una partición</strong><br/>Sustituye el espacio de una de las particiones ya existentes con %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. %1 se encuentra instalado en este dispositivo de almacenamiento. ¿Qué quieres hacer?<br/>Podrás revisar y confirmar tu elección antes de que cualquier cambio se haga efectivo en el dispositivo de almacenamiento. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Parece que este dispositivo de almacenamiento ya tiene un sistema operativo instalado. ¿Qué quieres hacer?<br/>Podrás revisar y confirmar tu elección antes de que cualquier cambio se haga efectivo en el dispositivo de almacenamiento. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Este dispositivo de almacenamiento contiene múltiples sistemas operativos instalados en él. ¿Qué quieres hacer?<br/>Podrás revisar y confirmar tu elección antes de que cualquier cambio se haga efectivo en el dispositivo de almacenamiento. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Este dispositivo de almacenamiento ya tiene un sistema operativo, pero la tabla de particiones <strong>%1</strong> es diferente de la que se necesita; <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Este dispositivo de almacenamiento tiene alguna de sus particiones <strong>ya montadas</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Este dispositivo de almacenamiento es parte de un <strong>dispositivo RAID</strong> inactivo. - + No Swap Sin «swap» - + Reuse Swap Reutilizar «swap» ya existente - + Swap (no Hibernate) Con «swap» (pero sin hibernación) - + Swap (with Hibernate) Con «swap» (y con hibernación) - + Swap to file Swap en archivo @@ -762,27 +783,27 @@ El instalador se cerrará y todos tus cambios se perderán. Config - + Set keyboard model to %1.<br/> Establecer el modelo de teclado como %1.<br/> - + Set keyboard layout to %1/%2. Establecer la disposición de teclado a %1/%2. - + Set timezone to %1/%2. Configurar el huso horario a %1/%2 - + The system language will be set to %1. El idioma del sistema se establecerá a %1. - + The numbers and dates locale will be set to %1. El formato de números y fechas aparecerá en %1. @@ -817,97 +838,97 @@ El instalador se cerrará y todos tus cambios se perderán. Instalación por Internet. (Desactivada: no se ha podido obtener una lista de paquetes, comprueba tu conexión a la red) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Este equipo no cumple los requisitos mínimos para instalar %1.<br/>La instalación no puede continuar.<a href="#details">Más detalles...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Este equipo no cumple los requisitos mínimos para la instalación. %1.<br/>La instalación no puede continuar. <a href="#details">Detalles...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. El equipo no cumple con alguno de los requisitos recomendados para configurar %1. Se puede continuar con la configuración, pero puede que ciertas funciones no estén disponibles. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. El equipo no cumple con alguno de los requisitos recomendados para instalar %1. Se puede continuar con la instalación, pero puede que ciertas funciones no estén disponibles. - + This program will ask you some questions and set up %2 on your computer. El programa te hará algunas preguntas y configurará %2 en tu equipo. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Te damos la bienvenida al asistente de configuración de %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Te damos la bienvenida al asistente de configuración de %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Te damos la bienvenida a Calamares, el instalador de %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Te damos la bienvenida al instalador de %1</h1> - + Your username is too long. Tu nombre de usuario es demasiado largo. - + '%1' is not allowed as username. «%1» no vale como nombre de usuario. - + Your username must start with a lowercase letter or underscore. Los nombres de usuario empiezan con una letra minúscula o un guion bajo. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Solo se permiten letras minúsculas, números, guiones bajos y normales. - + Your hostname is too short. El nombre del equipo es demasiado corto. - + Your hostname is too long. El nombre del equipo es demasiado largo. - + '%1' is not allowed as hostname. «%1» no es un nombre de equipo válido. - + Only letters, numbers, underscore and hyphen are allowed. Solo se permiten letras, números, guiones bajos y normales. - + Your passwords do not match! Parece que las contraseñas no coinciden. - + OK! Entendido @@ -963,11 +984,16 @@ El instalador se cerrará y todos tus cambios se perderán. + Packages + Paquetes + + + Install option: <strong>%1</strong> Opción de instalación: <strong>%1</strong> - + None Ninguno @@ -1426,6 +1452,16 @@ El instalador se cerrará y todos tus cambios se perderán. FS Label: Etiqueta del sist. de archivos: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1455,8 +1491,8 @@ El instalador se cerrará y todos tus cambios se perderán. Confirmar contraseña de cifrado - - + + Please enter the same passphrase in both boxes. Las contraseñas de ambos campos deben coincidir. @@ -1545,32 +1581,32 @@ El instalador se cerrará y todos tus cambios se perderán. &Reiniciar ahora - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Hemos terminado.</h1><br/>Ahora %1 ya está configurado y listo para usar.<br/>Ya puedes empezar a utilizar tu equipo. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Al marcar esta casilla el sistema se reiniciará inmediatamente una vez hagas clic en el botón <span style="font-style:italic;">Hecho</span> o al cerrar el programa de configuración.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Hemos terminado.</h1><br/>Ahora %1 está instalado en tu equipo.<br/>Puedes reiniciar para empezar a utilizar tu nuevo sistema o seguir en el entorno temporal («live») de %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Al marcar esta casilla el sistema se reiniciará inmediatamente una vez hagas clic en el botón <span style="font-style:italic;">Hecho</span> o al cerrar el instalador.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>La configuración ha fallado</h1><br/>%1 no ha podido configurar tu equipo.<br/>El mensaje de error fue: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>La instalación ha fallado</h1><br/>%1 no se ha instalado en tu equipo.<br/>El mensaje de error fue: %2. @@ -1604,12 +1640,18 @@ El instalador se cerrará y todos tus cambios se perderán. Formatear <strong>%3MiB</strong> partición «<strong>%1</strong>» con sistema de archivos <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formateando partición «%1» con sistema de archivos %2. - + The installer failed to format partition %1 on disk '%2'. El instalador no ha podido formatear la partición %1 en el disco «%2». @@ -1617,12 +1659,12 @@ El instalador se cerrará y todos tus cambios se perderán. GeneralRequirements - + has at least %1 GiB available drive space tiene al menos %1 GiB de espacio disponible en el disco - + There is not enough drive space. At least %1 GiB is required. No hay suficiente espació en el disco duro. Se requiere al menos %1 GB libre. @@ -1662,27 +1704,27 @@ El instalador se cerrará y todos tus cambios se perderán. esta ejecutándose con permisos de administrador («root»). - + The setup program is not running with administrator rights. El instalador no esta ejecutándose con permisos de administrador. - + The installer is not running with administrator rights. El instalador no se está ejecutando con permisos de administrador. - + has a screen large enough to show the whole installer tiene una pantalla lo suficientemente grande como para mostrar todo el instalador - + The screen is too small to display the setup program. La pantalla es demasiado pequeña para mostrar el instalador. - + The screen is too small to display the installer. La pantalla es demasiado pequeña para mostrar el instalador. @@ -1982,35 +2024,35 @@ El instalador se cerrará y todos tus cambios se perderán. LuksBootKeyFileJob - + Configuring LUKS key file. Configurando archivo de claves LUKS. - - + + No partitions are defined. Se ha definido ninguna partición. - - - + + + Encrypted rootfs setup error Se ha producido un error del «rootfs» cifrado - + Root partition %1 is LUKS but no passphrase has been set. La partición root %1 es LUKS pero no se ha establecido ninguna frase de contraseña. - + Could not create LUKS key file for root partition %1. No se pudo crear el archivo de clave LUKS para la partición root %1. - + Could not configure LUKS key file on partition %1. No se pudo configurar el archivo de clave LUKS para la partición root %1. @@ -2036,12 +2078,12 @@ El instalador se cerrará y todos tus cambios se perderán. Map - + Timezone: %1 Huso horario: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2053,100 +2095,112 @@ El instalador se cerrará y todos tus cambios se perderán. NetInstallViewStep - + Package selection Selección de paquetes - + Office software Programa de oficina - + Office package Paquete de oficina - + Browser software Explorador de archivos - + Browser package Paquetes de explorador de archivos - + Web browser Navegador web - + Kernel + label for netinstall module, Linux kernel Kernel - + Services + label for netinstall module, system services Servicios - + Login + label for netinstall module, choose login manager Iniciar sesion - + Desktop + label for netinstall module, choose desktop environment Escritorio - - Applications - Aplicaciones - - - + Communication + label for netinstall module Comunicación - + Development + label for netinstall module Desarrollo - + Office + label for netinstall module Oficina - + Multimedia + label for netinstall module Multimedia - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Temas - + Gaming + label for netinstall module Juegos - + Utilities + label for netinstall module Herramientas + + + Applications + Aplicaciones + NotesQmlViewStep @@ -2195,24 +2249,24 @@ El instalador se cerrará y todos tus cambios se perderán. Seleccione su región preferida o use la configuración predeterminada. - - - + + + Timezone: %1 Huso horario: %1 - + Select your preferred Zone within your Region. Elige un huso horario en tu región. - + Zones Husos - + You can fine-tune Language and Locale settings below. A continuación puedes ajustar la configuración regional. @@ -2295,6 +2349,7 @@ El instalador se cerrará y todos tus cambios se perderán. La contraseña contiene menos de %n letras minúsculas La contraseña contiene menos de %n letras minúsculas + La contraseña contiene menos de %n letras minúsculas @@ -2333,6 +2388,7 @@ El instalador se cerrará y todos tus cambios se perderán. La contraseña contiene menos de %n dígitos La contraseña contiene menos de %n dígitos + La contraseña contiene menos de %n dígitos @@ -2341,6 +2397,7 @@ El instalador se cerrará y todos tus cambios se perderán. La contraseña contiene menos de %n letras mayúsculas La contraseña contiene menos de %n letras mayúsculas + La contraseña contiene menos de %n letras mayúsculas @@ -2349,6 +2406,7 @@ El instalador se cerrará y todos tus cambios se perderán. La contraseña contiene menos de %n caracteres no alfanuméricos La contraseña contiene menos de %n caracteres no alfanuméricos + La contraseña contiene menos de %n caracteres no alfanuméricos @@ -2357,6 +2415,7 @@ El instalador se cerrará y todos tus cambios se perderán. La contraseña es más corta que %n caracteres La contraseña es más corta que %n caracteres + La contraseña es más corta que %n caracteres @@ -2370,6 +2429,7 @@ El instalador se cerrará y todos tus cambios se perderán. La contraseña contiene menos de %n clases de caracteres La contraseña contiene menos de %n clases de caracteres + La contraseña contiene menos de %n clases de caracteres @@ -2378,6 +2438,7 @@ El instalador se cerrará y todos tus cambios se perderán. La contraseña contiene más de %n caracteres iguales consecutivos La contraseña contiene más de %n caracteres iguales consecutivos + La contraseña contiene más de %n caracteres iguales consecutivos @@ -2386,6 +2447,7 @@ El instalador se cerrará y todos tus cambios se perderán. La contraseña contiene más de %n caracteres de la misma clase consecutivamente La contraseña contiene más de %n caracteres de la misma clase consecutivamente + La contraseña contiene más de %n caracteres de la misma clase consecutivamente @@ -2394,6 +2456,7 @@ El instalador se cerrará y todos tus cambios se perderán. La contraseña contiene una secuencia monótona de más de %n caracteres La contraseña contiene una secuencia monótona de más de %n caracteres + La contraseña contiene una secuencia monótona de más de %n caracteres @@ -2487,7 +2550,7 @@ El instalador se cerrará y todos tus cambios se perderán. Error desconocido - + Password is empty La contraseña está vacía. @@ -2525,22 +2588,6 @@ El instalador se cerrará y todos tus cambios se perderán. Elige un producto de la lista para instalarlo. - - PackageChooserQmlViewStep - - - Packages - Paquetes - - - - PackageChooserViewStep - - - Packages - Paquetes - - PackageModel @@ -3069,7 +3116,7 @@ Información de salida: QObject - + %1 (%2) %1 (%2) @@ -3395,12 +3442,12 @@ Información de salida: ResultsListDialog - + For best results, please ensure that this computer: Para un mejor desempeño se recomienda que este equipo: - + System requirements Requisitos del sistema @@ -3828,22 +3875,22 @@ Información de salida: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Haz clic aquí para saber más sobre el sistema de opinión de usuarios</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. El seguimiento ayuda a %1 a ver con qué frecuencia se instala, en qué hardware se instala y qué aplicaciones se usan. Para ver lo que se envía, haz clic en el icono de ayuda en cada sección. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Al seleccionar esto, enviará información sobre su instalación y hardware. Esta información solo se enviará <b>una vez</b> después de finalizar la instalación. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Al seleccionar esto, enviará periódicamente información sobre la instalación, el hardware y las aplicaciones de su <b>máquina</b> a %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Al seleccionar esto, enviará regularmente información sobre su instalación de <b>usuario</b>, hardware, aplicaciones y patrones de uso de aplicaciones a %1. @@ -4031,44 +4078,19 @@ Información de salida: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Te damos la bienvenida a Calamares; el configurador de %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Te damos la bienvenida al configurador de %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Te damos la bienvenida a Calamares; el instalador de %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Te damos la bienvenida al instalador de %1.</h1> - - - %1 support %1 ayuda - + About %1 setup Acerca del configurador de %1 - + About %1 installer Acerca del instalador %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>para %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Gracias al <a href="https://calamares.io/team/">equipo de Calamares</a> y al <a href="https://www.transifex.com/calamares/calamares/">equipo de traductores de Calamares</a>.<br/><br/><a href="https://calamares.io/"> El desarrollo de Calamares</a> está patrocinado por <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Software Libre. - WelcomeQmlViewStep @@ -4133,34 +4155,7 @@ Información de salida: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - para %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Gracias al <a href='https://calamares.io/team/'>equipo de Calamares</a> - y al <a href='https://www.transifex.com/calamares/calamares/'>equipo de - traductores de</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - El desarrollo es patrocinado por<br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Software Libre. - - - + Back Atrás @@ -4266,17 +4261,17 @@ Información de salida: Modelo de teclado: - + Layouts Distribuciones - + Type here to test your keyboard Escribe aquí para probar la salida del teclado - + Variants Variantes @@ -4425,102 +4420,102 @@ Información de salida: Si va a haber más de una persona usando el equipo se pueden crear otras cuentas de usuario una vez terminada la instalación. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Solo se pueden poner letras minúsculas, números y guiones bajos y normales. - + root is not allowed as username. No se puede poner «root» como nombre de usuario. - + What is the name of this computer? ¿Qué nombre le ponemos al equipo? - + Computer Name Nombre del equipo - + This name will be used if you make the computer visible to others on a network. Este nombre será visible al compartir cosas en red. - + localhost is not allowed as hostname. No se puede poner «localhost» como nombre del equipo. - + Choose a password to keep your account safe. Elige una contraseña para mantener tu cuenta segura. - + Password Contraseña - + Repeat Password Repite la contraseña - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Introduce la misma contraseña dos veces, para que se pueda verificar si hay errores de escritura. Una buena contraseña contendrá una combinación de letras, números y puntuación; tiene que tener al menos ocho caracteres y cambiarse de vez en cuando. - + Validate passwords quality Verificar la fortaleza de contraseña - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Cuando se marca esta casilla se verificará la seguridad de la contraseña y no se podrá usar una contraseña débil. - + Log in automatically without asking for the password Iniciar sesión automáticamente sin pedir la contraseña - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Solo se permiten letras, números, guiones bajos y guiones, con un mínimo de dos caracteres. - + Reuse user password as root password Reutilizar la contraseña para el usuario «root» - + Use the same password for the administrator account. Utiliza la misma contraseña para la cuenta de administrador. - + Choose a root password to keep your account safe. Elige una contraseña segura para la cuenta de administración «root». - + Root Password Contraseña de «root» - + Repeat Root Password Repetir la contraseña de «root» - + Enter the same password twice, so that it can be checked for typing errors. Introduce la misma contraseña dos veces para verificar si hay errores de escritura. diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts index f4347a96a..c00cc0acc 100644 --- a/lang/calamares_es_MX.ts +++ b/lang/calamares_es_MX.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information Información de depuración @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Hecho @@ -261,23 +280,25 @@ - + Waiting for %n module(s). + - + (%n second(s)) + - + System-requirements checking is complete. Chequeo de requerimientos del sistema completado. @@ -484,12 +505,12 @@ El instalador terminará y se perderán todos los cambios. CalamaresWindow - + %1 Setup Program %1 Programa de instalación - + %1 Installer %1 Instalador @@ -528,150 +549,150 @@ El instalador terminará y se perderán todos los cambios. Formulario - + Select storage de&vice: Seleccionar dispositivo de almacenamiento: - - - - + + + + Current: Actual: - + After: Después: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Particionado manual </strong><br/> Puede crear o cambiar el tamaño de las particiones usted mismo. - + Reuse %1 as home partition for %2. Reuse %1 como partición home para %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Seleccione una partición para reducir el tamaño, a continuación, arrastre la barra inferior para redimencinar</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 será reducido a %2MiB y una nueva %3MiB partición se creará para %4. - + Boot loader location: Ubicación del cargador de arranque: - + <strong>Select a partition to install on</strong> <strong>Seleccione una partición para instalar</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. No se puede encontrar en el sistema una partición EFI. Por favor vuelva atrás y use el particionamiento manual para configurar %1. - + The EFI system partition at %1 will be used for starting %2. La partición EFI en %1 será usada para iniciar %2. - + EFI system partition: Partición de sistema EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Este dispositivo de almacenamiento parece no tener un sistema operativo en el. ¿que le gustaría hacer?<br/> Usted podrá revisar y confirmar sus elecciones antes que cualquier cambio se realice al dispositivo de almacenamiento. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Borrar disco</strong> <br/>Esto <font color="red">borrará</font> todos los datos presentes actualmente en el dispositivo de almacenamiento seleccionado. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instalar junto a</strong> <br/>El instalador reducirá una partición con el fin de hacer espacio para %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Reemplazar una partición</strong> <br/>Reemplaza una partición con %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Este dispositivo de almacenamiento tiene %1 en el. ¿Que le gustaría hacer? <br/>Usted podrá revisar y confirmar sus elecciones antes de que cualquier cambio se realice al dispositivo de almacenamiento. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Este dispositivo de almacenamiento ya tiene un sistema operativo en el. ¿Que le gustaría hacer?<br/> Usted podrá revisar y confirmar sus elecciones antes que cualquier cambio se realice al dispositivo de almacenamiento. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Este dispositivo de almacenamiento tiene múltiples sistemas operativos en el. ¿Que le gustaria hacer?<br/> Usted podrá revisar y confirmar sus elecciones antes que cualquier cambio se realice al dispositivo de almacenamiento. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap Sin Swap - + Reuse Swap Reutilizar Swap - + Swap (no Hibernate) Swap (sin hibernación) - + Swap (with Hibernate) Swap (con hibernación) - + Swap to file Swap a archivo @@ -759,27 +780,27 @@ El instalador terminará y se perderán todos los cambios. Config - + Set keyboard model to %1.<br/> Ajustar el modelo de teclado a %1.<br/> - + Set keyboard layout to %1/%2. Ajustar teclado a %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. El lenguaje del sistema será establecido a %1. - + The numbers and dates locale will be set to %1. Los números y datos locales serán establecidos a %1. @@ -814,97 +835,97 @@ El instalador terminará y se perderán todos los cambios. Instalación de Red. (Deshabilitada: No se puede acceder a la lista de paquetes, verifique su conección de red) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Este equipo no cumple los requisitos mínimos para la instalación. %1.<br/>La instalación no puede continuar. <a href="#details">Detalles...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Este equipo no cumple alguno de los requisitos recomendados para la instalación %1.<br/>La instalación puede continuar, pero algunas funcionalidades podrían ser deshabilitadas. - + This program will ask you some questions and set up %2 on your computer. El programa le hará algunas preguntas y configurará %2 en su ordenador. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. Tu nombre de usuario es demasiado largo. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. El nombre de tu equipo es demasiado corto. - + Your hostname is too long. El nombre de tu equipo es demasiado largo. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Las contraseñas no coinciden! - + OK! @@ -960,11 +981,16 @@ El instalador terminará y se perderán todos los cambios. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1423,6 +1449,16 @@ El instalador terminará y se perderán todos los cambios. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1452,8 +1488,8 @@ El instalador terminará y se perderán todos los cambios. Confirmar contraseña segura - - + + Please enter the same passphrase in both boxes. Favor ingrese la misma contraseña segura en ambas casillas. @@ -1542,32 +1578,32 @@ El instalador terminará y se perderán todos los cambios. &Reiniciar ahora - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Todo listo.</h1><br/>%1 se ha configurado en su computadora. <br/>Ahora puede comenzar a usar su nuevo sistema. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Cuando esta casilla está marcada, su sistema se reiniciará inmediatamente cuando haga clic en <span style="font-style:italic;">Listo</span> o cierre el programa de instalación.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Listo.</h1><br/>%1 ha sido instalado en su computadora.<br/>Ahora puede reiniciar su nuevo sistema, o continuar usando el entorno Live %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalación fallida</h1> <br/>%1 no ha sido instalado en su computador. <br/>El mensaje de error es: %2. @@ -1601,12 +1637,18 @@ El instalador terminará y se perderán todos los cambios. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formateando partición %1 con sistema de archivos %2. - + The installer failed to format partition %1 on disk '%2'. El instalador no ha podido formatear la partición %1 en el disco '%2' @@ -1614,12 +1656,12 @@ El instalador terminará y se perderán todos los cambios. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1659,27 +1701,27 @@ El instalador terminará y se perderán todos los cambios. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. El instalador no se está ejecutando con privilegios de administrador. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. La pantalla es muy pequeña para mostrar el instalador @@ -1979,35 +2021,35 @@ El instalador terminará y se perderán todos los cambios. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2033,12 +2075,12 @@ El instalador terminará y se perderán todos los cambios. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2048,98 +2090,110 @@ El instalador terminará y se perderán todos los cambios. NetInstallViewStep - + Package selection Selección de paquete - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2190,24 +2244,24 @@ El instalador terminará y se perderán todos los cambios. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2290,6 +2344,7 @@ El instalador terminará y se perderán todos los cambios. + @@ -2328,6 +2383,7 @@ El instalador terminará y se perderán todos los cambios. + @@ -2336,6 +2392,7 @@ El instalador terminará y se perderán todos los cambios. + @@ -2344,6 +2401,7 @@ El instalador terminará y se perderán todos los cambios. + @@ -2352,6 +2410,7 @@ El instalador terminará y se perderán todos los cambios. + @@ -2365,6 +2424,7 @@ El instalador terminará y se perderán todos los cambios. + @@ -2373,6 +2433,7 @@ El instalador terminará y se perderán todos los cambios. + @@ -2381,6 +2442,7 @@ El instalador terminará y se perderán todos los cambios. + @@ -2389,6 +2451,7 @@ El instalador terminará y se perderán todos los cambios. + @@ -2482,7 +2545,7 @@ El instalador terminará y se perderán todos los cambios. Error desconocido - + Password is empty @@ -2520,22 +2583,6 @@ El instalador terminará y se perderán todos los cambios. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3064,7 +3111,7 @@ Salida QObject - + %1 (%2) %1 (%2) @@ -3388,12 +3435,12 @@ Salida ResultsListDialog - + For best results, please ensure that this computer: Para mejores resultados, por favor verifique que esta computadora: - + System requirements Requisitos de sistema @@ -3821,22 +3868,22 @@ Salida <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Haga clic aquí para más información acerca de comentarios del usuario</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4024,44 +4071,19 @@ Salida - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Bienvenido al programa de instalación Calamares para %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Bienvenido a la configuración %1</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Bienvenido al instalador Calamares para %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Bienvenido al instalador de %1.</h1> - - - %1 support %1 Soporte - + About %1 setup Acerca de la configuración %1 - + About %1 installer Acerca del instalador %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4126,23 +4148,7 @@ Salida about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4242,17 +4248,17 @@ Salida Modelo de teclado: - + Layouts - + Type here to test your keyboard Teclee aquí para probar su teclado - + Variants @@ -4379,102 +4385,102 @@ Salida - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? ¿Cuál es el nombre de esta computadora? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Seleccione una contraseña para mantener segura su cuenta. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. Usar la misma contraseña para la cuenta de administrador. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts index f3fccce77..9ab27d204 100644 --- a/lang/calamares_es_PR.ts +++ b/lang/calamares_es_PR.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information Información de depuración @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Hecho @@ -261,23 +280,25 @@ - + Waiting for %n module(s). + - + (%n second(s)) + - + System-requirements checking is complete. @@ -482,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -526,149 +547,149 @@ The installer will quit and all changes will be lost. Formulario - + Select storage de&vice: - - - - + + + + Current: - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -756,27 +777,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -811,97 +832,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -957,11 +978,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1420,6 +1446,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1449,8 +1485,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1539,32 +1575,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1598,12 +1634,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1611,12 +1653,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1656,27 +1698,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1976,35 +2018,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2030,12 +2072,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2045,98 +2087,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2187,24 +2241,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2287,6 +2341,7 @@ The installer will quit and all changes will be lost. + @@ -2325,6 +2380,7 @@ The installer will quit and all changes will be lost. + @@ -2333,6 +2389,7 @@ The installer will quit and all changes will be lost. + @@ -2341,6 +2398,7 @@ The installer will quit and all changes will be lost. + @@ -2349,6 +2407,7 @@ The installer will quit and all changes will be lost. + @@ -2362,6 +2421,7 @@ The installer will quit and all changes will be lost. + @@ -2370,6 +2430,7 @@ The installer will quit and all changes will be lost. + @@ -2378,6 +2439,7 @@ The installer will quit and all changes will be lost. + @@ -2386,6 +2448,7 @@ The installer will quit and all changes will be lost. + @@ -2479,7 +2542,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2517,22 +2580,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3058,7 +3105,7 @@ Output: QObject - + %1 (%2) @@ -3381,12 +3428,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3814,22 +3861,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4017,44 +4064,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4119,23 +4141,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4235,17 +4241,17 @@ Output: - + Layouts - + Type here to test your keyboard - + Variants @@ -4372,102 +4378,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts index 002e36de1..b141288be 100644 --- a/lang/calamares_et.ts +++ b/lang/calamares_et.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information Silumisteave @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Valmis @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -483,12 +502,12 @@ Paigaldaja sulgub ning kõik muutused kaovad. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 paigaldaja @@ -527,149 +546,149 @@ Paigaldaja sulgub ning kõik muutused kaovad. Form - + Select storage de&vice: Vali mäluseade: - - - - + + + + Current: Hetkel: - + After: Pärast: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Käsitsi partitsioneerimine</strong><br/>Sa võid ise partitsioone luua või nende suurust muuta. - + Reuse %1 as home partition for %2. Taaskasuta %1 %2 kodupartitsioonina. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Vali vähendatav partitsioon, seejärel sikuta alumist riba suuruse muutmiseks</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Käivituslaaduri asukoht: - + <strong>Select a partition to install on</strong> <strong>Vali partitsioon, kuhu paigaldada</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. EFI süsteemipartitsiooni ei leitud sellest süsteemist. Palun mine tagasi ja kasuta käsitsi partitsioonimist, et seadistada %1. - + The EFI system partition at %1 will be used for starting %2. EFI süsteemipartitsioon asukohas %1 kasutatakse %2 käivitamiseks. - + EFI system partition: EFI süsteemipartitsioon: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Sellel mäluseadmel ei paista olevat operatsioonisüsteemi peal. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Tühjenda ketas</strong><br/>See <font color="red">kustutab</font> kõik valitud mäluseadmel olevad andmed. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Paigalda kõrvale</strong><br/>Paigaldaja vähendab partitsiooni, et teha ruumi operatsioonisüsteemile %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Asenda partitsioon</strong><br/>Asendab partitsiooni operatsioonisüsteemiga %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Sellel mäluseadmel on peal %1. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Sellel mäluseadmel on juba operatsioonisüsteem peal. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Sellel mäluseadmel on mitu operatsioonisüsteemi peal. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -757,27 +776,27 @@ Paigaldaja sulgub ning kõik muutused kaovad. Config - + Set keyboard model to %1.<br/> Sea klaviatuurimudeliks %1.<br/> - + Set keyboard layout to %1/%2. Sea klaviatuuripaigutuseks %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. Süsteemikeeleks määratakse %1. - + The numbers and dates locale will be set to %1. Arvude ja kuupäevade lokaaliks seatakse %1. @@ -812,97 +831,97 @@ Paigaldaja sulgub ning kõik muutused kaovad. Võrgupaigaldus. (Keelatud: paketinimistute saamine ebaõnnestus, kontrolli oma võrguühendust) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> See arvuti ei rahulda %1 paigldamiseks vajalikke minimaaltingimusi.<br/>Paigaldamine ei saa jätkuda. <a href="#details">Detailid...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. See arvuti ei rahulda mõnda %1 paigaldamiseks soovitatud tingimust.<br/>Paigaldamine võib jätkuda, ent mõned funktsioonid võivad olla keelatud. - + This program will ask you some questions and set up %2 on your computer. See programm küsib sult mõned küsimused ja seadistab %2 sinu arvutisse. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. Sinu kasutajanimi on liiga pikk. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Sinu hostinimi on liiga lühike. - + Your hostname is too long. Sinu hostinimi on liiga pikk. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Sinu paroolid ei ühti! - + OK! @@ -958,11 +977,16 @@ Paigaldaja sulgub ning kõik muutused kaovad. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1421,6 +1445,16 @@ Paigaldaja sulgub ning kõik muutused kaovad. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1450,8 +1484,8 @@ Paigaldaja sulgub ning kõik muutused kaovad. Kinnita salaväljendit - - + + Please enter the same passphrase in both boxes. Palun sisesta sama salaväljend mõlemisse kasti. @@ -1540,32 +1574,32 @@ Paigaldaja sulgub ning kõik muutused kaovad. &Taaskäivita nüüd - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Kõik on valmis.</h1><br/>%1 on paigaldatud sinu arvutisse.<br/>Sa võid nüüd taaskäivitada oma uude süsteemi või jätkata %2 live-keskkonna kasutamist. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Paigaldamine ebaõnnestus</h1><br/>%1 ei paigaldatud sinu arvutisse.<br/>Veateade oli: %2. @@ -1599,12 +1633,18 @@ Paigaldaja sulgub ning kõik muutused kaovad. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Vormindan partitsiooni %1 failisüsteemiga %2. - + The installer failed to format partition %1 on disk '%2'. Paigaldaja ei suutnud vormindada partitsiooni %1 kettal "%2". @@ -1612,12 +1652,12 @@ Paigaldaja sulgub ning kõik muutused kaovad. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1657,27 +1697,27 @@ Paigaldaja sulgub ning kõik muutused kaovad. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Paigaldaja pole käivitatud administraatoriõigustega. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Ekraan on paigaldaja kuvamiseks liiga väike. @@ -1977,35 +2017,35 @@ Paigaldaja sulgub ning kõik muutused kaovad. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2031,12 +2071,12 @@ Paigaldaja sulgub ning kõik muutused kaovad. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2046,98 +2086,110 @@ Paigaldaja sulgub ning kõik muutused kaovad. NetInstallViewStep - + Package selection Paketivalik - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2188,24 +2240,24 @@ Paigaldaja sulgub ning kõik muutused kaovad. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2480,7 +2532,7 @@ Paigaldaja sulgub ning kõik muutused kaovad. Tundmatu viga - + Password is empty @@ -2518,22 +2570,6 @@ Paigaldaja sulgub ning kõik muutused kaovad. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3062,7 +3098,7 @@ Väljund: QObject - + %1 (%2) %1 (%2) @@ -3385,12 +3421,12 @@ Väljund: ResultsListDialog - + For best results, please ensure that this computer: Parimate tulemuste jaoks palun veendu, et see arvuti: - + System requirements Süsteeminõudmised @@ -3818,22 +3854,22 @@ Väljund: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Klõpsa siia, et saada rohkem teavet kasutaja tagasiside kohta</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4021,44 +4057,19 @@ Väljund: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Tere tulemast Calamares'i paigaldajasse %1 jaoks.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Tere tulemast %1 paigaldajasse.</h1> - - - %1 support %1 tugi - + About %1 setup - + About %1 installer Teave %1 paigaldaja kohta - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4123,23 +4134,7 @@ Väljund: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4239,17 +4234,17 @@ Väljund: Klaviatuurimudel: - + Layouts - + Type here to test your keyboard Kirjuta siia, et testida oma klaviatuuri - + Variants @@ -4376,102 +4371,102 @@ Väljund: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? Mis on selle arvuti nimi? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Vali parool, et hoida oma konto turvalisena. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. Kasuta sama parooli administraatorikontole. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts index 810aa18bc..d73a6f353 100644 --- a/lang/calamares_eu.ts +++ b/lang/calamares_eu.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information Arazte informazioa @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Egina @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -483,12 +502,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instalatzailea @@ -527,149 +546,149 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Formulario - + Select storage de&vice: Aukeratu &biltegiratze-gailua: - - - - + + + + Current: Unekoa: - + After: Ondoren: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Eskuz partizioak landu</strong><br/>Zure kasa sortu edo tamainaz alda dezakezu partizioak. - + Reuse %1 as home partition for %2. Berrerabili %1 home partizio bezala %2rentzat. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Aukeratu partizioa txikitzeko eta gero arrastatu azpiko-barra tamaina aldatzeko</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Abio kargatzaile kokapena: - + <strong>Select a partition to install on</strong> <strong>aukeratu partizioa instalatzeko</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Ezin da inon aurkitu EFI sistemako partiziorik sistema honetan. Mesedez joan atzera eta erabili eskuz partizioak lantzea %1 ezartzeko. - + The EFI system partition at %1 will be used for starting %2. %1eko EFI partizio sistema erabiliko da abiarazteko %2. - + EFI system partition: EFI sistema-partizioa: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Biltegiratze-gailuak badirudi ez duela sistema eragilerik. Zer egin nahiko zenuke? <br/>Zure aukerak berrikusteko eta berresteko aukera izango duzu aldaketak gauzatu aurretik biltegiratze-gailuan - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Diskoa ezabatu</strong><br/>Honek orain dauden datu guztiak <font color="red">ezabatuko</font> ditu biltegiratze-gailutik. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instalatu alboan</strong><br/>Instalatzaileak partizioa txikituko du lekua egiteko %1-(r)i. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Ordeztu partizioa</strong><br/>ordezkatu partizioa %1-(e)kin. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Biltegiratze-gailuak %1 dauka. Zer egin nahiko zenuke? <br/>Zure aukerak berrikusteko eta berresteko aukera izango duzu aldaketak gauzatu aurretik biltegiratze-gailuan - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Biltegiragailu honetan badaude jadanik eragile sistema bat. Zer gustatuko litzaizuke egin?<br/>Biltegiragailuan aldaketarik egin baino lehen zure aukerak aztertu eta konfirmatu ahal izango duzu. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Biltegiragailu honetan badaude jadanik eragile sistema batzuk. Zer gustatuko litzaizuke egin?<br/>Biltegiragailuan aldaketarik egin baino lehen zure aukerak aztertu eta konfirmatu ahal izango duzu. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -757,27 +776,27 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Config - + Set keyboard model to %1.<br/> Ezarri teklatu mota %1ra.<br/> - + Set keyboard layout to %1/%2. Ezarri teklatu diseinua %1%2ra. - + Set timezone to %1/%2. - + The system language will be set to %1. %1 ezarriko da sistemako hizkuntza bezala. - + The numbers and dates locale will be set to %1. Zenbaki eta daten eskualdea %1-(e)ra ezarri da. @@ -812,97 +831,97 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Konputagailu honek ez dauzka gutxieneko eskakizunak %1 instalatzeko. <br/>Instalazioak ezin du jarraitu. <a href="#details">Xehetasunak...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Konputagailu honek ez du betetzen gomendatutako zenbait eskakizun %1 instalatzeko. <br/>Instalazioak jarraitu ahal du, baina zenbait ezaugarri desgaituko dira. - + This program will ask you some questions and set up %2 on your computer. Konputagailuan %2 ezartzeko programa honek hainbat galdera egingo dizkizu. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. Zure erabiltzaile-izena luzeegia da. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Zure ostalari-izena laburregia da. - + Your hostname is too long. Zure ostalari-izena luzeegia da. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Pasahitzak ez datoz bat! - + OK! @@ -958,11 +977,16 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1421,6 +1445,16 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1450,8 +1484,8 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Berretsi pasahitza - - + + Please enter the same passphrase in both boxes. Mesedez sartu pasahitz berdina bi kutxatan. @@ -1540,32 +1574,32 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. &Berrabiarazi orain - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1599,12 +1633,18 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. %1 partizioa formateatzen %2 sistemaz. - + The installer failed to format partition %1 on disk '%2'. Huts egin du instalatzaileak %1 partizioa sortzen '%2' diskoan. @@ -1612,12 +1652,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1657,27 +1697,27 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Instalatzailea ez dabil exekutatzen administrari eskubideekin. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Pantaila txikiegia da instalatzailea erakusteko. @@ -1977,35 +2017,35 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2031,12 +2071,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2046,98 +2086,110 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. NetInstallViewStep - + Package selection Pakete aukeraketa - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2188,24 +2240,24 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2480,7 +2532,7 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Hutsegite ezezaguna - + Password is empty @@ -2518,22 +2570,6 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3061,7 +3097,7 @@ Irteera: QObject - + %1 (%2) %1 (%2) @@ -3384,12 +3420,12 @@ Irteera: ResultsListDialog - + For best results, please ensure that this computer: Emaitza egokienak lortzeko, ziurtatu ordenagailu honek baduela: - + System requirements Sistemaren betebeharrak @@ -3817,22 +3853,22 @@ Irteera: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4020,44 +4056,19 @@ Irteera: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Ongi etorri %1 instalatzailera.</h1> - - - %1 support %1 euskarria - + About %1 setup - + About %1 installer %1 instalatzaileari buruz - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4122,23 +4133,7 @@ Irteera: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back Atzera @@ -4238,17 +4233,17 @@ Irteera: Teklatu Modeloa: - + Layouts - + Type here to test your keyboard Idatzi hemen zure teklatua frogatzeko - + Variants @@ -4375,102 +4370,102 @@ Irteera: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? Zein da ordenagailu honen izena? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Aukeratu pasahitza zure kontua babesteko. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. Erabili pasahitz bera administratzaile kontuan. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts index 349a5ba5b..11b5749af 100644 --- a/lang/calamares_fa.ts +++ b/lang/calamares_fa.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ درخت ابزارک‌ها - + Debug information اطّلاعات اشکال‌زدایی @@ -171,7 +190,7 @@ Calamares::JobThread - + Done انجام شد. @@ -261,7 +280,7 @@ بررسی الزامات برای ماژول٪ 1 کامل شد. - + Waiting for %n module(s). منتظر ماندن برای n% ماژول @@ -269,7 +288,7 @@ - + (%n second(s)) (%n ثانیه) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. چک کردن نیازمندی‌های سیستم تمام شد. @@ -488,12 +507,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 برنامه راه‌اندازی - + %1 Installer نصب‌کنندهٔ %1 @@ -532,149 +551,149 @@ The installer will quit and all changes will be lost. فرم - + Select storage de&vice: انتخاب &دستگاه ذخیره‌سازی: - - - - + + + + Current: فعلی: - + After: بعد از: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. شما می توانید پارتیشن بندی دستی ایجاد یا تغییر اندازه دهید . - + Reuse %1 as home partition for %2. استفاده مجدد از %1 به عنوان پارتیشن خانه برای %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>انتخاب یک پارتیشن برای کوجک کردن و ایجاد پارتیشن جدید از آن، سپس نوار دکمه را بکشید تا تغییر اندازه دهد</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 تغییر سایز خواهد داد به %2 مبی‌بایت و یک پارتیشن %3 مبی‌بایتی برای %4 ساخته خواهد شد. - + Boot loader location: مکان بالاآورنده بوت: - + <strong>Select a partition to install on</strong> <strong>یک پارتیشن را برای نصب بر روی آن، انتخاب کنید</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. پارتیشن سیستم ای.اف.آی نمی‌تواند در هیچ جایی از این سیستم یافت شود. لطفا برگردید و از پارتیشن بندی دستی استفاده کنید تا %1 را راه‌اندازی کنید. - + The EFI system partition at %1 will be used for starting %2. پارتیشن سیستم ای.اف.آی در %1 برای شروع %2 استفاده خواهد شد. - + EFI system partition: پارتیشن سیستم ای.اف.آی - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. به نظر می‌رسد در دستگاه ذخیره‌سازی هیچ سیستم‌عاملی وجود ندارد. تمایل به انجام چه کاری دارید؟<br/>شما می‌توانید انتخاب‌هایتان را قبل از اعمال هر تغییری در دستگاه ذخیره‌سازی، مرور و تأیید نمایید. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>پاک کردن دیسک</strong><br/>این کار تمام داده‌های موجود بر روی دستگاه ذخیره‌سازی انتخاب شده را <font color="red">حذف می‌کند</font>. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>نصب در امتداد</strong><br/>این نصاب از یک پارتیشن برای ساخت یک اتاق برای %1 استفاده می‌کند. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>جایگزینی یک افراز</strong><br/>افرازی را با %1 جایگزین می‌کند. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. این دستگاه ذخیره سازی٪ 1 روی خود دارد. دوست دارید چه کاری انجام دهید؟ قبل از اینکه تغییری در دستگاه ذخیره ایجاد شود ، می توانید انتخاب های خود را بررسی و تأیید کنید. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. این دستگاه ذخیره سازی از قبل یک سیستم عامل روی خود دارد. دوست دارید چه کاری انجام دهید؟ قبل از اینکه تغییری در دستگاه ذخیره ایجاد شود ، می توانید انتخاب های خود را بررسی و تأیید کنید. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. این دستگاه ذخیره سازی دارای چندین سیستم عامل است. دوست دارید چه کاری انجام دهید؟ قبل از اینکه تغییری در دستگاه ذخیره ایجاد شود ، می توانید انتخاب های خود را بررسی و تأیید کنید. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> این دستگاه حافظه هم اکنون یک سیستم عامل روی خود دارد، اما جدول افراز <strong>%1</strong> با نیاز <strong>%2</strong> متفاوت است. - + This storage device has one of its partitions <strong>mounted</strong>. این دستگاه حافظه دارای یک افرازی بوده که هم اکنون <strong>سوارشده</strong> است. - + This storage device is a part of an <strong>inactive RAID</strong> device. یکی از بخش های این دستگاه حافظه عضوی از دستگاه <strong>RAID غیرفعال</strong> است. - + No Swap بدون Swap - + Reuse Swap باز استفاده از مبادله - + Swap (no Hibernate) مبادله (بدون خواب‌زمستانی) - + Swap (with Hibernate) مبادله (با خواب‌زمستانی) - + Swap to file مبادله به پرونده @@ -762,27 +781,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> تنظیم مدل صفحه‌کلید به %1.<br/> - + Set keyboard layout to %1/%2. تنظیم چینش صفحه‌کلید به %1/%2. - + Set timezone to %1/%2. منطقه زمانی را تنظیم کنید 1% - + The system language will be set to %1. زبان سامانه به %1 تنظیم خواهد شد. - + The numbers and dates locale will be set to %1. محلی و اعداد و تاریخ ها روی٪ 1 تنظیم می شوند. @@ -817,97 +836,97 @@ The installer will quit and all changes will be lost. نصب شبکه‌ای. (از کار افتاده: ناتوان در گرفتن فهرست بسته‌ها. اتّصال شبکه‌تان را بررسی کنید) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> رایانه کمینهٔ نیازمندی‌های برپاسازی %1 را ندارد.<br/>برپاسازی نمی‌تواند ادامه یابد. <a href="#details">جزییات…</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> رایانه کمینهٔ نیازمندی‌های نصب %1 را ندارد.<br/>نصب نمی‌تواند ادامه یابد. <a href="#details">جزییات…</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. رایانه کمینهٔ نیازمندی‌های برپاسازی %1 را ندارد.<br/>برپاسازی می‌تواند ادامه یابد، ولی ممکن است برخی ویژگی‌ها از کار افتاده باشند. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. رایانه کمینهٔ نیازمندی‌های نصب %1 را ندارد.<br/>نصب می‌تواند ادامه یابد، ولی ممکن است برخی ویژگی‌ها از کار افتاده باشند. - + This program will ask you some questions and set up %2 on your computer. این برنامه تعدادی سوال از شما پرسیده و %2 را روی رایانه‌تان برپا می‌کند. - + <h1>Welcome to the Calamares setup program for %1</h1> به برنامه راه اندازی Calamares خوش آمدید برای 1٪ - + <h1>Welcome to %1 setup</h1> <h1>به برپاسازی %1 خوش آمدید.</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>به نصب‌کنندهٔ کالامارس برای %1 خوش آمدید.</h1> - + <h1>Welcome to the %1 installer</h1> <h1>به نصب‌کنندهٔ %1 خوش آمدید.</h1> - + Your username is too long. نام کاربریتان بیش از حد بلند است. - + '%1' is not allowed as username. '%1' بعنوان نام کاربر مجاز نیست. - + Your username must start with a lowercase letter or underscore. نام کاربری شما باید با یک حرف کوچک یا خط زیر شروع شود. - + Only lowercase letters, numbers, underscore and hyphen are allowed. فقط حروف کوچک ، اعداد ، زیر خط و خط خط مجاز است. - + Your hostname is too short. نام میزبانتان بیش از حد کوتاه است. - + Your hostname is too long. نام میزبانتان بیش از حد بلند است. - + '%1' is not allowed as hostname. '%1' بعنوان نام میزبان مجاز نیست. - + Only letters, numbers, underscore and hyphen are allowed. فقط حروف ، اعداد ، زیر خط و خط خط مجاز است. - + Your passwords do not match! گذرواژه‌هایتان مطابق نیستند! - + OK! باشه! @@ -963,11 +982,16 @@ The installer will quit and all changes will be lost. + Packages + بسته‌ها + + + Install option: <strong>%1</strong> گزینه نصب: <strong>%1</strong> - + None هیچ کدام @@ -1426,6 +1450,16 @@ The installer will quit and all changes will be lost. FS Label: برچسب سامانه پرونده: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1455,8 +1489,8 @@ The installer will quit and all changes will be lost. تأیید عبارت عبور - - + + Please enter the same passphrase in both boxes. لطفاً عبارت عبور یکسانی را در هر دو جعبه وارد کنید. @@ -1545,32 +1579,32 @@ The installer will quit and all changes will be lost. &راه‌اندازی دوباره - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. تمام شد.٪ 1 در رایانه شما تنظیم شده است. اکنون می توانید از سیستم جدید خود استفاده کنید. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> هنگامی که این کادر علامت گذاری شد ، هنگامی که بر روی انجام شده کلیک کنید یا برنامه برپاکننده را ببندید ، سیستم شما بلافاصله راه اندازی می شود. - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>همه‌چیز انجام شد.</h1><br/>%1 روی رایانه‌تان نصب شد.<br/>ممکن است بخواهید به سامانهٔ جدیدتان وارد شده تا به استفاده از محیط زندهٔ %2 ادامه دهید. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> هنگامی که این کادر علامت گذاری شد ، هنگامی که بر روی انجام شده کلیک کنید یا نصب را ببندید ، سیستم شما بلافاصله راه اندازی می شود. - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>برپایی شکست خورد</h1><br/>%1 روی رایانه شما برپا نشد.<br/>پیام خطا: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>نصب شکست خورد</h1><br/>%1 روی رایانه شما نصب نشد.<br/>پیام خطا: %2. @@ -1604,12 +1638,18 @@ The installer will quit and all changes will be lost. فرمت افراز<strong>%1</strong> با سایز <strong>%3مبی‌بایت</strong> با سامانه پرونده <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. فرمت افراز %1 با سامانه پروند %2. - + The installer failed to format partition %1 on disk '%2'. نصب کننده برای فرمت افراز %1 روی دیسک '%2' شکست خورد. @@ -1617,12 +1657,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space دارای حداقل %1 گی‌ب فضای کافی - + There is not enough drive space. At least %1 GiB is required. فضای کافی موجود نیست. حداقل %1 گی‌ب نیاز است. @@ -1662,27 +1702,27 @@ The installer will quit and all changes will be lost. دارد نصب‌کننده را به عنوان یک مدیر (ریشه) اجرا می‌کند - + The setup program is not running with administrator rights. برنامهٔ برپایی با دسترسی‌های مدیر اجرا نشده‌است. - + The installer is not running with administrator rights. برنامهٔ نصب کننده با دسترسی‌های مدیر اجرا نشده‌است. - + has a screen large enough to show the whole installer صفحه‌ای با بزرگی کافی برای نمایش تمام نصب‌کننده دارد - + The screen is too small to display the setup program. صفحه برای نمایش برنامهٔ برپایی خیلی کوچک است. - + The screen is too small to display the installer. صفحه برای نمایش نصب‌کننده خیلی کوچک است. @@ -1982,35 +2022,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. پیکربندی پروندهٔ کلید LUKS. - - + + No partitions are defined. هیچ افرازی تعریف نشده - - - + + + Encrypted rootfs setup error خطای برپاسازی rootfs رمزشده - + Root partition %1 is LUKS but no passphrase has been set. افراز روت %1 یک LUKS است، ولی هیچ گذرواژه ای تنظیم نشده است. - + Could not create LUKS key file for root partition %1. نمیتوان پرونده کلید LUKS را برای افراز روت %1 ایجاد کرد. - + Could not configure LUKS key file on partition %1. نمیتوان پرونده کلید LUKS را برای افراز روت %1 تنظیم کرد. @@ -2036,12 +2076,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 منطقه زمانی: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2051,100 +2091,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection گزینش بسته‌ها - + Office software نرم‌افزار اداری - + Office package بستهٔ اداری - + Browser software نرم‌افزار مرورگر - + Browser package بستهٔ مرورگر - + Web browser مرورگر وب - + Kernel + label for netinstall module, Linux kernel کرنل - + Services + label for netinstall module, system services خدمت‌ها - + Login + label for netinstall module, choose login manager ورود - + Desktop + label for netinstall module, choose desktop environment میزکار - - Applications - برنامه‌های کاربردی - - - + Communication + label for netinstall module ارتباطات - + Development + label for netinstall module توسعه - + Office + label for netinstall module اداری - + Multimedia + label for netinstall module چندرسانه‌ای - + Internet + label for netinstall module اینترنت - + Theming + label for netinstall module شخصی‌سازی - + Gaming + label for netinstall module بازی - + Utilities + label for netinstall module ابزارها + + + Applications + برنامه‌های کاربردی + NotesQmlViewStep @@ -2193,24 +2245,24 @@ The installer will quit and all changes will be lost. منطقه موردنظر خود را انتخاب کنید یا از تنظیمات پیشفرض استفاده کنید. - - - + + + Timezone: %1 منطقه زمانی: %1 - + Select your preferred Zone within your Region. منطقه مورد نظر خود را در منطقه خود انتخاب کنید. - + Zones مناطق - + You can fine-tune Language and Locale settings below. شما میتوانید زبان و زبان محلی را در تنظیمات زیر بطوردقیق تنظیم کنید. @@ -2485,7 +2537,7 @@ The installer will quit and all changes will be lost. خطای ناشناخته - + Password is empty گذرواژه خالی است @@ -2523,22 +2575,6 @@ The installer will quit and all changes will be lost. لطفاً محصولی را از لیست انتخاب کنید. محصول انتخاب شده نصب خواهد شد. - - PackageChooserQmlViewStep - - - Packages - بسته‌ها - - - - PackageChooserViewStep - - - Packages - بسته‌ها - - PackageModel @@ -3064,7 +3100,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3390,12 +3426,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: برای بهترین نتیجه ، لطفا اطمینان حاصل کنید که این کامپیوتر: - + System requirements نیازمندی‌های سامانه @@ -3823,22 +3859,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">برای دریافت اطلاعات بیشتر درمورد بازخورد کاربران اینجا کلیک کنید</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. ردیابی به٪ 1 کمک می کند تا بفهمد هر چند وقت یک بار نصب می شود ، روی چه سخت افزاری نصب شده و از کدام برنامه ها استفاده می شود. برای دیدن موارد ارسالی ، لطفاً روی نماد راهنما در کنار هر منطقه کلیک کنید. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. با انتخاب این گزینه، شما فقط یکبار داده هایی درباره نصب و سخت افزار خود ارسال می کنید. این داده ها فقط <b>یکبار</b> بعد از به پایان رسیدن نصب فرستاده می شوند. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. با انتخاب این گزینه، شما بطور دوره ای داده هایی درباره نصب <b>ماشین</b>، سخت افزار و برنامه ها را به %1 می فرستید. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. با انتخاب این گزینه، شما بطور منظم داده هایی درباره نصب <b>کاربر</b>، سخت افزار، برنامه ها و الگوی مصرفی برنامه ها را به %1 می فرستید. @@ -4026,44 +4062,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>به برنامهٔ برپاسازی کالامارس برای %1 خوش آمدید.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>به برپاسازی %1 خوش آمدید.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>به نصب‌کنندهٔ کالامارس برای %1 خوش آمدید.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>به نصب‌کنندهٔ %1 خوش آمدید.</h1> - - - %1 support پشتیبانی %1 - + About %1 setup دربارهٔ برپاسازی %1 - + About %1 installer دربارهٔ نصب‌کنندهٔ %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/> برای %3</strong><br/><br/> Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> سپاس از <a href='https://calamares.io/team/'>گروه کلامارس</a> و <a href='https://www.transifex.com/calamares/calamares/'>گروه ترجمه کلامارس</a>.<br/><br/> توسعه <a href='https://calamares.io/'>کلامارس</a> توسط <br/> <a href="http://www.blue-systems.com/"><a href='http://www.blue-systems.com/'>سیستم های آبی</a> - نرم افزار آزادی پشتیبانی شده است. - WelcomeQmlViewStep @@ -4128,32 +4139,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - برای %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - سپاس از <a href='https://calamares.io/team/'>گروه کلامارس</a> - و <a href='https://www.transifex.com/calamares/calamares/'>گروه ترجمه کلامارس</a>.<br/><br/> - توسعه <a href='https://calamares.io/'>کلامارس</a> توسط <br/> - <a href='http://www.blue-systems.com/'>سیستم های آبی</a> - - نرم افزار آزادی پشتیبانی شده است. - - - + Back بازگشت @@ -4257,17 +4243,17 @@ Output: مدل صفحه‌کلید: - + Layouts چینش‌ها - + Type here to test your keyboard برای آزمودن صفحه‌کلیدتان، این‌جا بنویسید - + Variants دگرگونه‌ها @@ -4397,102 +4383,102 @@ Output: اگر بیش از یک نفر از این کامپیوتر استفاده می کنند، میتوانید حساب های دیگری بعد نصب ایجاد کنید. - + Only lowercase letters, numbers, underscore and hyphen are allowed. فقط حروف کوچک ، اعداد ، زیر خط و خط خط مجاز است. - + root is not allowed as username. عبارت root بعنوان نام کاربر مجاز نیست. - + What is the name of this computer? نام این رایانه چیست؟ - + Computer Name نام رایانه - + This name will be used if you make the computer visible to others on a network. اگر رایانه‌تان را روی یک شبکه برای دیگران نمایان کنید، از این نام استفاده می‌شود. - + localhost is not allowed as hostname. عبارت localhost بعنوان نام میزبان مجاز نیست. - + Choose a password to keep your account safe. برای امن نگه داشتن حسابتان، گذرواژه‌ای برگزینید. - + Password گذرواژه - + Repeat Password تکرار TextLabel - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. رمز ورود یکسان را دو بار وارد کنید ، تا بتوان آن را از نظر اشتباه تایپ بررسی کرد. یک رمز ورود خوب شامل ترکیبی از حروف ، اعداد و علائم نگارشی است ، باید حداقل هشت حرف داشته باشد و باید در فواصل منظم تغییر یابد. - + Validate passwords quality اعتبارسنجی کیفیت گذرواژه - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. وقتی این کادر علامت گذاری شد ، بررسی قدرت رمز عبور انجام می شود و دیگر نمی توانید از رمز عبور ضعیف استفاده کنید. - + Log in automatically without asking for the password ورود خودکار بدون پرسیدن گذرواژه - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. حداقل دو حرف و فقط حروف، اعداد، زیرخط و خط تیره مجاز هستند. - + Reuse user password as root password استفاده گذرواژه کاربر بعنوان گذرواژه روت - + Use the same password for the administrator account. استفاده از گذرواژهٔ یکسان برای حساب مدیر. - + Choose a root password to keep your account safe. برای امن نگه داشتن حسابتان، گذرواژه روت ای برگزینید. - + Root Password گذرواژه روت - + Repeat Root Password تکرار گذرواژه روت - + Enter the same password twice, so that it can be checked for typing errors. همان گذرواژه را دوباره وارد کنید تا بتواند برای خطاهای نوشتاری بررسی شود. diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index 49ba688fd..bd0062c39 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Widgettipuu - + Debug information Vianetsinnän tiedot @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Valmis @@ -261,7 +280,7 @@ Moduulin vaatimusten tarkistaminen <i>%1</i> on valmis. - + Waiting for %n module(s). Odotetaan %n moduulia. @@ -269,7 +288,7 @@ - + (%n second(s)) (%n sekunti) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. Järjestelmän vaatimusten tarkistus on valmis. @@ -488,12 +507,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. CalamaresWindow - + %1 Setup Program %1-asennusohjelma - + %1 Installer %1-asentaja @@ -532,149 +551,149 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Lomake - + Select storage de&vice: Valitse kiintole&vy: - - - - + + + + Current: Nykyinen: - + After: Jälkeen: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Manuaalinen osiointi </strong><br/>Voit luoda tai muuttaa osioita itse. - + Reuse %1 as home partition for %2. Käytä %1 uudelleen kotiosiona kohteelle %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Valitse supistettava osio ja säädä alarivillä kokoa vetämällä</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 supistetaan %2Mib:iin ja uusi %3MiB-osio luodaan kohteelle %4. - + Boot loader location: Käynnistyslataajan sijainti: - + <strong>Select a partition to install on</strong> <strong>Valitse asennettava osio</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. EFI-järjestelmäosiota ei löydy tästä järjestelmästä. Siirry takaisin ja käytä manuaalista osiointia, kun haluat määrittää %1 - + The EFI system partition at %1 will be used for starting %2. EFI-järjestelmäosiota %1 käytetään %2 käynnistämiseen. - + EFI system partition: EFI-järjestelmäosio: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Tällä massamuistilla ei näytä olevan käyttöjärjestelmää. Mitä haluat tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi ennen kuin massamuistille tehdään muutoksia. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Tyhjennä asema</strong><br/>Tämä <font color="red">poistaa</font> kaikki tiedot valitusta massamuistista. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Asenna nykyisen rinnalle</strong><br/>Asennusohjelma supistaa osiota tehdäkseen tilaa kohteelle %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Osion korvaaminen</strong><br/>korvaa osion %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Tässä massamuistissa on %1 dataa. Mitä haluat tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi ennen kuin massamuistiin tehdään muutoksia. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Tämä massamuisti sisältää jo käyttöjärjestelmän. Mitä haluaisit tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi, ennen kuin massamuistiin tehdään muutoksia. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Tämä massamuisti sisältää jo useita käyttöjärjestelmiä. Mitä haluaisit tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi, ennen kuin massamuistiin tehdään muutoksia. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Tällä massamuistilla on jo käyttöjärjestelmä, mutta osiotaulukko <strong>%1</strong> on erilainen kuin tarvittava <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Tähän massamuistiin on <strong>liitetty</strong> yksi osioista. - + This storage device is a part of an <strong>inactive RAID</strong> device. Tämä massamuisti on osa <strong>passiivista RAID</strong> kokoonpanoa. - + No Swap Swap ei - + Reuse Swap Swap käytä uudellen - + Swap (no Hibernate) Swap (ei lepotilaa) - + Swap (with Hibernate) Swap (lepotilan kanssa) - + Swap to file Swap tiedostona @@ -762,27 +781,27 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Config - + Set keyboard model to %1.<br/> Aseta näppäimiston malli %1.<br/> - + Set keyboard layout to %1/%2. Aseta näppäimiston asetteluksi %1/%2. - + Set timezone to %1/%2. Aseta aikavyöhykkeeksi %1/%2. - + The system language will be set to %1. Järjestelmän kielen asetuksena on %1. - + The numbers and dates locale will be set to %1. Numerot ja päivämäärät, paikallinen asetus on %1. @@ -817,98 +836,98 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Verkkoasennus. (Ei käytössä: Pakettiluetteloita ei voi hakea, tarkista verkkoyhteys) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Tämä tietokone ei täytä vähimmäisvaatimuksia, %1.<br/>Asennusta ei voi jatkaa. <a href="#details">Yksityiskohdat...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Tämä tietokone ei täytä asennuksen vähimmäisvaatimuksia, %1.<br/>Asennus ei voi jatkua. <a href="#details">Yksityiskohdat...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Tämä tietokone ei täytä joitakin suositeltuja vaatimuksia %1.<br/>Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Tämä tietokone ei täytä joitakin suositeltuja vaatimuksia %1. Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. - + This program will ask you some questions and set up %2 on your computer. Tämä ohjelma kysyy joitakin kysymyksiä liittyen järjestelmään %2 ja asentaa sen tietokoneeseen. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Tervetuloa Calamares-asennusohjelmaan %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Tervetuloa %1 asennukseen</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Tervetuloa Calamares-asentajaan %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Tervetuloa %1-asentajaan</h1> - + Your username is too long. Käyttäjänimesi on liian pitkä. - + '%1' is not allowed as username. Käyttäjänimessä '%1' ei ole sallittu. - + Your username must start with a lowercase letter or underscore. Sinun käyttäjänimi täytyy alkaa pienellä kirjaimella tai alaviivalla. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Vain pienet kirjaimet, numerot, alaviivat ja tavuviivat ovat sallittuja. - + Your hostname is too short. Koneen nimi on liian lyhyt. - + Your hostname is too long. Koneen nimi on liian pitkä. - + '%1' is not allowed as hostname. Koneen nimessä '%1' ei ole sallittu. - + Only letters, numbers, underscore and hyphen are allowed. Vain kirjaimet, numerot, alaviivat ja tavuviivat ovat sallittuja. - + Your passwords do not match! Salasanasi eivät täsmää! - + OK! OK! @@ -964,11 +983,16 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. + Packages + Paketit + + + Install option: <strong>%1</strong> Asennuksen vaihtoehto: <strong>%1</strong> - + None Ei käytössä @@ -1427,6 +1451,16 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.FS Label: Tiedostojärjestelmän nimike: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1456,8 +1490,8 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Vahvista salasana - - + + Please enter the same passphrase in both boxes. Anna sama salasana molempiin kenttiin. @@ -1546,32 +1580,32 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.&Käynnistä uudelleen - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Valmista.</h1><br/>%1 on määritetty tietokoneellesi.<br/>Voit nyt alkaa käyttää uutta järjestelmääsi. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Kun tämä valintaruutu on valittu, järjestelmä käynnistyy heti, kun napsautat <span style="font-style:italic;">Valmis</span> -painiketta tai suljet asennusohjelman.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Kaikki tehty.</h1><br/>%1 on asennettu tietokoneellesi.<br/>Voit käynnistää tietokoneen nyt uuteen järjestelmääsi, tai voit jatkaa käyttöjärjestelmän %2 live-ympäristön käyttöä. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Kun tämä valintaruutu on valittuna, järjestelmä käynnistyy heti, kun napsautat <span style="font-style:italic;">Valmis</span> tai suljet asentimen.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Asennus epäonnistui</h1><br/>%1 ei ole määritetty tietokoneellesi.<br/> Virhesanoma oli: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Asennus epäonnistui </h1><br/>%1 ei ole asennettu tietokoneeseesi.<br/>Virhesanoma oli: %2. @@ -1605,12 +1639,18 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Alustus <strong>%3MiB</strong> osio <strong>%1</strong> tiedostojärjestelmällä <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Alustaa osiota %1 tiedostojärjestelmällä %2. - + The installer failed to format partition %1 on disk '%2'. Aseman '%2' osion %1 alustus epäonnistui. @@ -1618,12 +1658,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. GeneralRequirements - + has at least %1 GiB available drive space vähintään %1 GiB vapaata levytilaa - + There is not enough drive space. At least %1 GiB is required. Levytilaa ei ole riittävästi. Vähintään %1 GiB tarvitaan. @@ -1663,27 +1703,27 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.ajaa asennusohjelmaa järjestelmänvalvojana (root) - + The setup program is not running with administrator rights. Asennusohjelma ei ole käynnissä järjestelmänvalvojan oikeuksin. - + The installer is not running with administrator rights. Asennusohjelma ei ole käynnissä järjestelmänvalvojan oikeuksin. - + has a screen large enough to show the whole installer näytöllä on riittävän suuri tarkkuus asentajalle - + The screen is too small to display the setup program. Näyttö on liian pieni, jotta asennus -ohjelma voidaan näyttää. - + The screen is too small to display the installer. Näyttö on liian pieni asentajan näyttämiseksi. @@ -1983,35 +2023,35 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. LuksBootKeyFileJob - + Configuring LUKS key file. LUKS-avaintiedoston määrittäminen. - - + + No partitions are defined. Osioita ei ole määritelty. - - - + + + Encrypted rootfs setup error Salattu rootfs asennusvirhe - + Root partition %1 is LUKS but no passphrase has been set. Juuriosio %1 on LUKS, mutta salasanaa ei ole asetettu. - + Could not create LUKS key file for root partition %1. LUKS-avaintiedostoa ei voitu luoda juuriosioon %1. - + Could not configure LUKS key file on partition %1. LUKS-avaintiedostoa ei voi määrittää osiossa %1. @@ -2037,12 +2077,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Map - + Timezone: %1 Aikavyöhyke: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2054,100 +2094,112 @@ hiiren vieritystä skaalaamiseen. NetInstallViewStep - + Package selection Paketin valinta - + Office software Office-ohjelmisto - + Office package Office-paketti - + Browser software Selainohjelmisto - + Browser package Selainpaketti - + Web browser Nettiselain - + Kernel + label for netinstall module, Linux kernel Kernel - + Services + label for netinstall module, system services Palvelut - + Login + label for netinstall module, choose login manager Kirjaudu - + Desktop + label for netinstall module, choose desktop environment Työpöytä - - Applications - Sovellukset - - - + Communication + label for netinstall module Viestintä - + Development + label for netinstall module Ohjelmistokehitys - + Office + label for netinstall module Toimisto - + Multimedia + label for netinstall module Multimedia - + Internet + label for netinstall module Internetti - + Theming + label for netinstall module Teema - + Gaming + label for netinstall module Pelit - + Utilities + label for netinstall module Apuohjelmat + + + Applications + Sovellukset + NotesQmlViewStep @@ -2196,24 +2248,24 @@ hiiren vieritystä skaalaamiseen. Valitse sinun asuinalue tai käytä oletusta. - - - + + + Timezone: %1 Aikavyöhyke: %1 - + Select your preferred Zone within your Region. Valitse haluamasi alue alueesi sisällä. - + Zones Vyöhykkeet - + You can fine-tune Language and Locale settings below. Voit hienosäätää kieli- ja alueasetuksia alla. @@ -2488,7 +2540,7 @@ hiiren vieritystä skaalaamiseen. Tuntematon virhe - + Password is empty Salasana on tyhjä @@ -2526,22 +2578,6 @@ hiiren vieritystä skaalaamiseen. Valitse tuote luettelosta. Valittu tuote asennetaan. - - PackageChooserQmlViewStep - - - Packages - Paketit - - - - PackageChooserViewStep - - - Packages - Paketit - - PackageModel @@ -3070,7 +3106,7 @@ Ulostulo: QObject - + %1 (%2) %1 (%2) @@ -3396,12 +3432,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</ ResultsListDialog - + For best results, please ensure that this computer: Saadaksesi parhaan lopputuloksen, tarkista että tämä tietokone: - + System requirements Järjestelmävaatimukset @@ -3829,22 +3865,22 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</ <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Klikkaa tästä saadaksesi lisätietoja käyttäjäpalautteesta</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Seuranta auttaa %1 näkemään, kuinka usein se asennetaan, mihin laitteistoon se on asennettu ja mihin sovelluksiin sitä käytetään. Jos haluat nähdä, mitä lähetetään, napsauta kunkin alueen vieressä olevaa ohjekuvaketta. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Valitsemalla tämän lähetät tietoja asennuksesta ja laitteistosta. Nämä tiedot lähetetään vain </b>kerran</b> asennuksen päätyttyä. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Valitsemalla tämän lähetät määräajoin tietoja <b>koneesi</b> asennuksesta, laitteistosta ja sovelluksista, %1:lle. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Valitsemalla tämän lähetät säännöllisesti tietoja <b>käyttäjän</b> asennuksesta, laitteistosta, sovelluksista ja sovellusten käyttötavoista %1:lle. @@ -4032,44 +4068,19 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</ - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Tervetuloa Calamares-asennusohjelmaan %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Tervetuloa %1 asennukseen.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Tervetuloa Calamares-asennusohjelmaan %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Tervetuloa %1 -asennusohjelmaan.</h1> - - - %1 support %1 tuki - + About %1 setup Tietoja %1 asetuksista - + About %1 installer Tietoa %1-asennusohjelmasta - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>- %3</strong><br/><br/>Tekijänoikeus 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Tekijänoikeus 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Kiitokset <a href="https://calamares.io/team/">Calamares-tiimille</a> ja <a href="https://www.transifex.com/calamares/calamares/">Calamares-kääntäjille</a>.<br/><br/><a href="https://calamares.io/">Calamaresin</a> kehitystä sponsoroi <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4134,34 +4145,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</ about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Kiitokset <a href='https://calamares.io/team/'>the Calamares tiimille</a> - ja <a href='https://www.transifex.com/calamares/calamares/'>Calamares - kääntäjäille</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - ohjelmistokehitystä sponsoroi <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back Takaisin @@ -4266,17 +4250,17 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</ Näppäimistön malli: - + Layouts Asettelut - + Type here to test your keyboard Kirjoita tähän testaksesi näppäimistöäsi. - + Variants Vaihtoehdot @@ -4425,102 +4409,102 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</ Jos tätä tietokonetta käyttää useampi kuin yksi henkilö, voit luoda useita tilejä asennuksen jälkeen. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Vain pienet kirjaimet, numerot, alaviivat ja tavuviivat ovat sallittuja. - + root is not allowed as username. root ei ole sallittu käyttäjänimeksi. - + What is the name of this computer? Mikä on tämän tietokoneen nimi? - + Computer Name Tietokoneen nimi - + This name will be used if you make the computer visible to others on a network. Tätä nimeä käytetään, jos teet tietokoneen näkyväksi verkon muille käyttäjille. - + localhost is not allowed as hostname. localhost ei ole sallittu koneen nimeksi. - + Choose a password to keep your account safe. Valitse salasana pitääksesi tilisi turvallisena. - + Password Salasana - + Repeat Password Toista salasana - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Syötä sama salasana kahdesti, jotta se voidaan tarkistaa kirjoittamisvirheiden varalta. Hyvä salasana sisältää sekoituksen kirjaimia, numeroita ja välimerkkejä. Vähintään kahdeksan merkkiä pitkä ja se on vaihdettava säännöllisin väliajoin. - + Validate passwords quality Tarkista salasanojen laatu - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Kun tämä valintaruutu on valittu, salasanan vahvuus tarkistetaan, etkä voi käyttää heikkoa salasanaa. - + Log in automatically without asking for the password Kirjaudu automaattisesti ilman salasanaa - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Vain kirjaimet, numerot, alaviiva ja väliviiva ovat sallittuja, vähintään kaksi merkkiä. - + Reuse user password as root password Käytä käyttäjän salasanaa myös root-salasanana - + Use the same password for the administrator account. Käytä pääkäyttäjän tilillä samaa salasanaa. - + Choose a root password to keep your account safe. Valitse root-salasana, jotta tilisi pysyy turvassa. - + Root Password Root-salasana - + Repeat Root Password Toista Root-salasana - + Enter the same password twice, so that it can be checked for typing errors. Syötä sama salasana kahdesti, jotta se voidaan tarkistaa kirjoitusvirheiden varalta. diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts index 58fa8f79d..5cb79bb5d 100644 --- a/lang/calamares_fr.ts +++ b/lang/calamares_fr.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Arbre de widget - + Debug information Informations de dépannage @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Fait @@ -261,23 +280,25 @@ La vérification des prérequis pour le module <i>%1</i> est terminée. - + Waiting for %n module(s). En attente de %n module(s). En attente de %n module(s). + En attente de %n module(s). - + (%n second(s)) (%n seconde(s)) (%n seconde(s)) + (%n seconde(s)) - + System-requirements checking is complete. La vérification des prérequis système est terminée. @@ -488,12 +509,12 @@ L'installateur se fermera et les changements seront perdus. CalamaresWindow - + %1 Setup Program Programme de configuration de %1 - + %1 Installer Installateur %1 @@ -532,149 +553,149 @@ L'installateur se fermera et les changements seront perdus. Formulaire - + Select storage de&vice: Sélectionner le support de sto&ckage : - - - - + + + + Current: Actuel : - + After: Après : - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Partitionnement manuel</strong><br/>Vous pouvez créer ou redimensionner vous-même des partitions. - + Reuse %1 as home partition for %2. Réutiliser %1 comme partition home pour %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Sélectionner une partition à réduire, puis faites glisser la barre du bas pour redimensionner</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 va être réduit à %2 Mio et une nouvelle partition de %3 Mio va être créée pour %4. - + Boot loader location: Emplacement du chargeur de démarrage : - + <strong>Select a partition to install on</strong> <strong>Sélectionner une partition pour l'installation</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Une partition système EFI n'a pas pu être trouvée sur ce système. Veuillez retourner à l'étape précédente et sélectionner le partitionnement manuel pour configurer %1. - + The EFI system partition at %1 will be used for starting %2. La partition système EFI sur %1 va être utilisée pour démarrer %2. - + EFI system partition: Partition système EFI : - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Ce périphérique de stockage ne semble pas contenir de système d'exploitation. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Effacer le disque</strong><br/>Ceci va <font color="red">effacer</font> toutes les données actuellement présentes sur le périphérique de stockage sélectionné. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Installer à côté</strong><br/>L'installateur va réduire une partition pour faire de la place pour %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Remplacer une partition</strong><br>Remplace une partition par %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Ce périphérique de stockage contient %1. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Ce périphérique de stockage contient déjà un système d'exploitation. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Ce péiphérique de stockage contient déjà plusieurs systèmes d'exploitation. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Le périphérique de stockage contient déjà un système d'exploitation, mais la table de partition <strong>%1</strong> est différente de celle nécessaire <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Une des partitions de ce périphérique de stockage est <strong>montée</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Ce périphérique de stockage fait partie d'une grappe <strong>RAID inactive</strong>. - + No Swap Aucun Swap - + Reuse Swap Réutiliser le Swap - + Swap (no Hibernate) Swap (sans hibernation) - + Swap (with Hibernate) Swap (avec hibernation) - + Swap to file Swap dans un fichier @@ -762,27 +783,27 @@ L'installateur se fermera et les changements seront perdus. Config - + Set keyboard model to %1.<br/> Configurer le modèle de clavier à %1.<br/> - + Set keyboard layout to %1/%2. Configurer la disposition clavier à %1/%2. - + Set timezone to %1/%2. Configurer timezone sur %1/%2. - + The system language will be set to %1. La langue du système sera réglée sur %1. - + The numbers and dates locale will be set to %1. Les nombres et les dates seront réglés sur %1. @@ -817,97 +838,97 @@ L'installateur se fermera et les changements seront perdus. Installation par le réseau (Désactivée : impossible de récupérer les listes de paquets, vérifier la connexion réseau) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Cet ordinateur ne satisfait pas les minimum prérequis pour configurer %1.<br/>La configuration ne peut pas continuer. <a href="#details">Détails...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Cet ordinateur ne satisfait pas les minimum prérequis pour installer %1.<br/>L'installation ne peut pas continuer. <a href="#details">Détails...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Cet ordinateur ne satisfait pas certains des prérequis recommandés pour configurer %1.<br/>La configuration peut continuer, mais certaines fonctionnalités pourraient être désactivées. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Cet ordinateur ne satisfait pas certains des prérequis recommandés pour installer %1.<br/>L'installation peut continuer, mais certaines fonctionnalités pourraient être désactivées. - + This program will ask you some questions and set up %2 on your computer. Ce programme va vous poser quelques questions et configurer %2 sur votre ordinateur. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Bienvenue dans le programme de configuration Calamares pour %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Bienvenue dans la configuration de %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Bienvenue dans l'installateur Calamares pour %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Bienvenue dans l'installateur de %1</h1> - + Your username is too long. Votre nom d'utilisateur est trop long. - + '%1' is not allowed as username. '%1' n'est pas autorisé comme nom d'utilisateur. - + Your username must start with a lowercase letter or underscore. Votre nom d'utilisateur doit commencer avec une lettre minuscule ou un underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Seuls les minuscules, nombres, underscores et tirets sont autorisés. - + Your hostname is too short. Le nom d'hôte est trop petit. - + Your hostname is too long. Le nom d'hôte est trop long. - + '%1' is not allowed as hostname. '%1' n'est pas autorisé comme nom d'hôte. - + Only letters, numbers, underscore and hyphen are allowed. Seuls les lettres, nombres, underscores et tirets sont autorisés. - + Your passwords do not match! Vos mots de passe ne correspondent pas ! - + OK! OK! @@ -963,11 +984,16 @@ L'installateur se fermera et les changements seront perdus. + Packages + Paquets + + + Install option: <strong>%1</strong> - + None @@ -1426,6 +1452,16 @@ L'installateur se fermera et les changements seront perdus. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1455,8 +1491,8 @@ L'installateur se fermera et les changements seront perdus. Confirmer la phrase secrète - - + + Please enter the same passphrase in both boxes. Merci d'entrer la même phrase secrète dans les deux champs. @@ -1545,32 +1581,32 @@ L'installateur se fermera et les changements seront perdus. &Redémarrer maintenant - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Configuration terminée.</h1><br/>%1 a été configuré sur votre ordinateur.<br/>Vous pouvez maintenant utiliser votre nouveau système. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>En sélectionnant cette option, votre système redémarrera immédiatement quand vous cliquerez sur <span style=" font-style:italic;">Terminé</span> ou fermerez le programme de configuration.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Installation terminée.</h1><br/>%1 a été installé sur votre ordinateur.<br/>Vous pouvez redémarrer sur le nouveau système, ou continuer d'utiliser l'environnement actuel %2 . - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>En sélectionnant cette option, votre système redémarrera immédiatement quand vous cliquerez sur <span style=" font-style:italic;">Terminé</span> ou fermerez l'installateur.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Échec de la configuration</h1><br/>%1 n'a pas été configuré sur cet ordinateur.<br/>Le message d'erreur était : %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Installation échouée</h1><br/>%1 n'a pas été installée sur cet ordinateur.<br/>Le message d'erreur était : %2. @@ -1604,12 +1640,18 @@ L'installateur se fermera et les changements seront perdus. Formater la partition <strong>%1</strong> de <strong>%3Mio</strong>avec le système de fichier <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formatage de la partition %1 avec le système de fichiers %2. - + The installer failed to format partition %1 on disk '%2'. Le programme d'installation n'a pas pu formater la partition %1 sur le disque '%2'. @@ -1617,12 +1659,12 @@ L'installateur se fermera et les changements seront perdus. GeneralRequirements - + has at least %1 GiB available drive space a au moins %1 Gio d'espace disque disponible - + There is not enough drive space. At least %1 GiB is required. Il n'y a pas assez d'espace disque. Au moins %1 Gio sont requis. @@ -1662,27 +1704,27 @@ L'installateur se fermera et les changements seront perdus. a démarré l'installateur en tant qu'administrateur (root) - + The setup program is not running with administrator rights. Le programme de configuration ne dispose pas des droits administrateur. - + The installer is not running with administrator rights. L'installateur ne dispose pas des droits administrateur. - + has a screen large enough to show the whole installer a un écran assez large pour afficher l'intégralité de l'installateur - + The screen is too small to display the setup program. L'écran est trop petit pour afficher le programme de configuration. - + The screen is too small to display the installer. L'écran est trop petit pour afficher l'installateur. @@ -1982,35 +2024,35 @@ L'installateur se fermera et les changements seront perdus. LuksBootKeyFileJob - + Configuring LUKS key file. Configuration de la clé de fichier LUKS. - - + + No partitions are defined. Aucune partition n'est définie. - - - + + + Encrypted rootfs setup error Erreur du chiffrement du setup rootfs - + Root partition %1 is LUKS but no passphrase has been set. La partition racine %1 est LUKS mais aucune phrase secrète n'a été configurée. - + Could not create LUKS key file for root partition %1. Impossible de créer le fichier de clé LUKS pour la partition racine %1. - + Could not configure LUKS key file on partition %1. La clé LUKS n'a pas pu être configurée sur la partition %1. @@ -2036,12 +2078,12 @@ L'installateur se fermera et les changements seront perdus. Map - + Timezone: %1 Fuseau horaire : %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2053,100 +2095,112 @@ L'installateur se fermera et les changements seront perdus. NetInstallViewStep - + Package selection Sélection des paquets - + Office software Logiciel de bureau - + Office package Suite bureautique - + Browser software Logiciel de navigation - + Browser package Navigateur web - + Web browser Navigateur web - + Kernel + label for netinstall module, Linux kernel Noyau - + Services + label for netinstall module, system services Services - + Login + label for netinstall module, choose login manager Connexion - + Desktop + label for netinstall module, choose desktop environment Bureau - - Applications - Applications - - - + Communication + label for netinstall module Communication - + Development + label for netinstall module Développement - + Office + label for netinstall module Bureautique - + Multimedia + label for netinstall module Multimédia - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Thèmes - + Gaming + label for netinstall module Jeux - + Utilities + label for netinstall module Utilitaires + + + Applications + Applications + NotesQmlViewStep @@ -2195,24 +2249,24 @@ L'installateur se fermera et les changements seront perdus. - - - + + + Timezone: %1 Fuseau horaire : %1 - + Select your preferred Zone within your Region. Sélectionner votre zone préférée dans votre région. - + Zones Zones - + You can fine-tune Language and Locale settings below. Vous pouvez affiner les paramètres de langue et régionaux ci-dessous. @@ -2295,6 +2349,7 @@ L'installateur se fermera et les changements seront perdus. Le mot de passe contient moins de %n lettres minuscules Le mot de passe contient moins de %n lettres minuscules + Le mot de passe contient moins de %n lettres minuscules @@ -2333,6 +2388,7 @@ L'installateur se fermera et les changements seront perdus. Le mot de passe contient moins de %n chiffres Le mot de passe contient moins de %n chiffres + Le mot de passe contient moins de %n chiffres @@ -2341,6 +2397,7 @@ L'installateur se fermera et les changements seront perdus. Le mot de passe contient moins de %n lettres majuscules Le mot de passe contient moins de %n lettres majuscules + Le mot de passe contient moins de %n lettres majuscules @@ -2349,6 +2406,7 @@ L'installateur se fermera et les changements seront perdus. Le mot de passe contient moins de %n caractères non alphanumériques Le mot de passe contient moins de %n caractères non alphanumériques + Le mot de passe contient moins de %n caractères non alphanumériques @@ -2357,6 +2415,7 @@ L'installateur se fermera et les changements seront perdus. Le mot de passe est plus court que %n caractères Le mot de passe est plus court que %n caractères + Le mot de passe est plus court que %n caractères @@ -2370,6 +2429,7 @@ L'installateur se fermera et les changements seront perdus. Le mot de passe contient moins de %n classes de caractères Le mot de passe contient moins de %n classes de caractères + Le mot de passe contient moins de %n classes de caractères @@ -2378,6 +2438,7 @@ L'installateur se fermera et les changements seront perdus. Le mot de passe contient plus de %n mêmes caractères consécutifs Le mot de passe contient plus de %n mêmes caractères consécutifs + Le mot de passe contient plus de %n mêmes caractères consécutifs @@ -2386,6 +2447,7 @@ L'installateur se fermera et les changements seront perdus. Le mot de passe contient plus de %n caractères de la même classe consécutive Le mot de passe contient plus de %n caractères de la même classe consécutive + Le mot de passe contient plus de %n caractères de la même classe consécutive @@ -2394,6 +2456,7 @@ L'installateur se fermera et les changements seront perdus. Le mot de passe contient une séquence monotone de plus de %n caractères Le mot de passe contient une séquence monotone de plus de %n caractères + Le mot de passe contient une séquence monotone de plus de %n caractères @@ -2487,7 +2550,7 @@ L'installateur se fermera et les changements seront perdus. Erreur inconnue - + Password is empty Le mot de passe est vide @@ -2525,22 +2588,6 @@ L'installateur se fermera et les changements seront perdus. Merci de sélectionner un produit de la liste. Le produit sélectionné sera installé. - - PackageChooserQmlViewStep - - - Packages - Paquets - - - - PackageChooserViewStep - - - Packages - Paquets - - PackageModel @@ -3070,7 +3117,7 @@ Sortie QObject - + %1 (%2) %1 (%2) @@ -3396,12 +3443,12 @@ Sortie ResultsListDialog - + For best results, please ensure that this computer: Pour de meilleur résultats, merci de s'assurer que cet ordinateur : - + System requirements Configuration requise @@ -3829,22 +3876,22 @@ Sortie <html><head/><body><span style=" text-decoration: underline; color:#2980b9;">Cliquer ici pour plus d'informations sur les rapports d'utilisateurs</span><a href="placeholder"><p></p></body> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Le suivi aide %1 à voir à quelle fréquence il est installé, sur quel matériel il est installé et quelles applications sont utilisées. Pour voir ce qui sera envoyé, veuillez cliquer sur l'icône d'aide à côté de chaque zone. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. En sélectionnant cette option, vous enverrez des informations sur votre installation et votre matériel. Ces informations ne seront envoyées <b>qu'une seule fois</b> après la fin de l'installation. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. En sélectionnant cette option, vous enverrez périodiquement des informations sur l'installation, le matériel et les applications de votre <b>machine</b> à %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. En sélectionnant cette option, vous enverrez régulièrement des informations sur <b>votre</b> installation, le matériel, les applications et les modèles d'utilisation des applications à %1. @@ -4032,44 +4079,19 @@ Sortie - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Bienvenue dans le programme de configuration Calamares pour %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Bienvenue dans la configuration de %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - Bien dans l'installateur Calamares pour %1. - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Bienvenue dans l'installateur de %1.</h1> - - - %1 support Support de %1 - + About %1 setup À propos de la configuration de %1 - + About %1 installer À propos de l'installateur %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/> pour %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Merci à <a href="https://calamares.io/team/">l'équipe de Calamares</a> et à <a href="https://www.transifex.com/calamares/calamares/">l'équipe de traducteurs de Calamares</a>.<br/><br/>Le développement de <a href="https://calamares.io/">Calamares</a> est sponsorisé par<br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4134,32 +4156,7 @@ Sortie about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - pour %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Merci à <a href='https://calamares.io/team/'>l'équipe de Calamares</a> - et à <a href='https://www.transifex.com/calamares/calamares/'>l'équipe de traducteurs de Calamares</a>.<br/><br/> - Le développement de <a href='https://calamares.io/'>Calamares</a> est sponsorisé par<br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back Retour @@ -4263,17 +4260,17 @@ Sortie Modèle de clavier : - + Layouts Dispositions - + Type here to test your keyboard Saisir ici pour tester votre clavier - + Variants Variantes @@ -4421,102 +4418,102 @@ Sortie Si plusieurs personnes utilisent cet ordinateur, vous pouvez créer plusieurs comptes après l'installation. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Seuls les minuscules, nombres, underscores et tirets sont autorisés. - + root is not allowed as username. root n'est pas autorisé en tant que nom d'utilisateur. - + What is the name of this computer? Quel est le nom de votre ordinateur ? - + Computer Name Nom de l'ordinateur - + This name will be used if you make the computer visible to others on a network. Ce nom sera utilisé si vous rendez l'ordinateur visible aux autres sur un réseau. - + localhost is not allowed as hostname. localhost n'est pas autorisé en tant que nom d'utilisateur. - + Choose a password to keep your account safe. Veuillez saisir le mot de passe pour sécuriser votre compte. - + Password Mot de passe - + Repeat Password Répéter le mot de passe - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Saisir le même mot de passe deux fois, afin qu'il puisse être vérifié pour les erreurs de frappe. Un bon mot de passe contient un mélange de lettres, de chiffres et de ponctuation, doit comporter au moins huit caractères et doit être changé à intervalles réguliers. - + Validate passwords quality Valider la qualité des mots de passe - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quand cette case est cochée, la vérification de la puissance du mot de passe est activée et vous ne pourrez pas utiliser de mot de passe faible. - + Log in automatically without asking for the password Connectez-vous automatiquement sans demander le mot de passe - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Seuls les lettres, les chiffres, les underscores et les trait d'union sont autorisés et un minimum de deux caractères. - + Reuse user password as root password Réutiliser le mot de passe utilisateur comme mot de passe root - + Use the same password for the administrator account. Utiliser le même mot de passe pour le compte administrateur. - + Choose a root password to keep your account safe. Choisir un mot de passe root pour protéger votre compte. - + Root Password Mot de passe root - + Repeat Root Password Répéter le mot de passe root - + Enter the same password twice, so that it can be checked for typing errors. Entrer le même mot de passe deux fois, afin qu'il puisse être vérifié pour les erreurs de frappe. diff --git a/lang/calamares_fur.ts b/lang/calamares_fur.ts index aa879dc2c..9ee3148b0 100644 --- a/lang/calamares_fur.ts +++ b/lang/calamares_fur.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Arbul dai widget - + Debug information Informazions di debug @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Fat @@ -261,7 +280,7 @@ Il control dai recuisîts pal modul <i>%1</i> al è complet. - + Waiting for %n module(s). In spiete di %n modul. @@ -269,7 +288,7 @@ - + (%n second(s)) (%n secont) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. Il control dai recuisîts di sisteme al è complet. @@ -484,12 +503,12 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< CalamaresWindow - + %1 Setup Program Program di configurazion di %1 - + %1 Installer Program di instalazion di %1 @@ -528,149 +547,149 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Formulari - + Select storage de&vice: Selezione il &dispositîf di memorie: - - - - + + + + Current: Atuâl: - + After: Dopo: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Partizionament manuâl</strong><br/>Tu puedis creâ o ridimensionâ lis partizions di bessôl. - + Reuse %1 as home partition for %2. Torne dopre %1 come partizion home par %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Selezione une partizion di scurtâ, dopo strissine la sbare inferiôr par ridimensionâ</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 e vignarà scurtade a %2MiB e une gnove partizion di %3MiB e vignarà creade par %4. - + Boot loader location: Ubicazion dal gjestôr di inviament: - + <strong>Select a partition to install on</strong> <strong>Selezione une partizion dulà lâ a instalâ</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Impussibil cjatâ une partizion di sisteme EFI. Par plasê torne indaûr e dopre un partizionament manuâl par configurâ %1. - + The EFI system partition at %1 will be used for starting %2. La partizion di sisteme EFI su %1 e vignarà doprade par inviâ %2. - + EFI system partition: Partizion di sisteme EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Al somee che chest dispositîf di memorie nol vedi parsore un sisteme operatîf. Ce desideristu fâ?<br/>Tu podarâs tornâ a viodi e confermâ lis tôs sieltis prime di aplicâ cualsisei modifiche al dispositîf di memorie. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Scancelâ il disc</strong><br/>Chest al <font color="red">eliminarà</font> ducj i dâts presints sul dispositîf di memorie selezionât. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instalâ in bande</strong><br/>Il program di instalazion al scurtarà une partizion par fâ spazi a %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Sostituî une partizion</strong><br/>Al sostituìs une partizion cun %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Chest dispositîf di memorie al à parsore %1. Ce desideristu fâ? <br/>Tu podarâs tornâ a viodi e confermâ lis tôs sieltis prime di aplicâ cualsisei modifiche al dispositîf di memorie. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Chest dispositîf di memorie al à za parsore un sisteme operatîf. Ce desideristu fâ?<br/>Tu podarâs tornâ a viodi e confermâ lis tôs sieltis prime di aplicâ cualsisei modifiche al dispositîf di memorie. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Chest dispositîf di memorie al à parsore plui sistemis operatîfs. Ce desideristu fâ?<br/>Tu podarâs tornâ a viodi e confermâ lis tôs sieltis prime di aplicâ cualsisei modifiche al dispositîf di memorie. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Chest dispositîf di memorie al à za un sisteme operatîf parsore, ma la tabele des partizions <strong>%1</strong> e je diferente di chê che a covente: <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Une des partizions dal dispositîf di memorie e je <strong>montade</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Chest dispositîf di memorie al fâs part di un dispositîf <strong>RAID inatîf</strong>. - + No Swap Cence Swap - + Reuse Swap Torne dopre Swap - + Swap (no Hibernate) Swap (cence ibernazion) - + Swap (with Hibernate) Swap (cun ibernazion) - + Swap to file Swap su file @@ -758,27 +777,27 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Config - + Set keyboard model to %1.<br/> Stabilî il model di tastiere a %1.<br/> - + Set keyboard layout to %1/%2. Stabilî la disposizion di tastiere a %1/%2. - + Set timezone to %1/%2. Stabilî il fûs orari a %1/%2. - + The system language will be set to %1. La lenghe dal sisteme e vignarà configurade a %1. - + The numbers and dates locale will be set to %1. La localizazion dai numars e des datis e vignarà configurade a %1. @@ -813,97 +832,97 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Instalazion di rêt. (Disabilitade: impussibil recuperâ la liste dai pachets, controlâ la conession di rêt) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Chest computer nol sodisfe i recuisîts minims pe configurazion di %1.<br/>La configurazion no pues continuâ. <a href="#details">Detais...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Chest computer nol sodisfe i recuisîts minims pe instalazion di %1.<br/>La instalazion no pues continuâ. <a href="#details">Detais...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Chest computer nol sodisfe cualchi recuisît conseât pe configurazion di %1.<br/>La configurazion e pues continuâ, ma cualchi funzionalitât e podarès vignî disabilitade. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Chest computer nol sodisfe cualchi recuisît conseât pe instalazion di %1.<br/>La instalazion e pues continuâ, ma cualchi funzionalitât e podarès vignî disabilitade. - + This program will ask you some questions and set up %2 on your computer. Chest program al fasarà cualchi domande e al configurarà %2 sul computer. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Benvignûts sul program di configurazion Calamares par %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Benvignûts te configurazion di %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Benvignûts sul program di instalazion Calamares par %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Benvignûts tal program di instalazion di %1</h1> - + Your username is too long. Il to non utent al è masse lunc. - + '%1' is not allowed as username. '%1' nol è ametût come non utent. - + Your username must start with a lowercase letter or underscore. Il to non utent al scugne scomençâ cuntune letare minuscule o une liniute basse. - + Only lowercase letters, numbers, underscore and hyphen are allowed. A son ametûts dome i numars, lis letaris minusculis, lis liniutis bassis e i tratuts. - + Your hostname is too short. Il to non host al è masse curt. - + Your hostname is too long. Il to non host al è masse lunc. - + '%1' is not allowed as hostname. '%1' nol è ametût come non host. - + Only letters, numbers, underscore and hyphen are allowed. A son ametûts dome i numars, lis letaris, lis liniutis bassis e i tratuts. - + Your passwords do not match! Lis passwords no corispuindin! - + OK! @@ -959,11 +978,16 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< + Packages + Pachets + + + Install option: <strong>%1</strong> - + None @@ -1422,6 +1446,16 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1451,8 +1485,8 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Conferme frase di acès - - + + Please enter the same passphrase in both boxes. Par plasê inserìs la stesse frase di acès in ducj i doi i ricuadris. @@ -1541,32 +1575,32 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< &Torne invie cumò - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Fat dut.</h1><br/>%1 al è stât configurât sul computer.<br/>Tu puedis cumò scomençâ a doprâ il gnûf sisteme. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Cuant che cheste casele e ven selezionade, il sisteme al tornarà a inviâsi a colp apene che si fasarà clic su <span style="font-style:italic;">Fat</span> o si sierarà il program di configurazion.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Fat dut.</h1><br/>%1 al è stât instalât sul computer.<br/>Tu puedis tornâ a inviâ la machine tal gnûf sisteme o continuâ a doprâ l'ambient Live di %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Cuant che cheste casele e ven selezionade, il sisteme al tornarà a inviâsi a colp apene che si fasarà clic su <span style="font-style:italic;">Fat</span> o si sierarà il program di instalazion.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Configurazion falide</h1><br/>%1 nol è stât configurât sul to computer.<br/>Il messaç di erôr al jere: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalazion falide</h1><br/>%1 nol è stât instalât sul to computer.<br/>Il messaç di erôr al jere: %2. @@ -1600,12 +1634,18 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Formatâ la partizion <strong>%1</strong> di <strong>%3MiB</strong> cul filesystem <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Daûr a formatâ la partizion %1 cul filesystem %2. - + The installer failed to format partition %1 on disk '%2'. Il program di instalazion nol è rivât a formatâ la partizion %1 sul disc '%2'. @@ -1613,12 +1653,12 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< GeneralRequirements - + has at least %1 GiB available drive space al à almancul %1 GiB di spazi disponibil - + There is not enough drive space. At least %1 GiB is required. No si à vonde spazi libar te unitât. Al covente spazi par almancul %1 GiB. @@ -1658,27 +1698,27 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< al sta eseguint il program di instalazion come aministradôr (root) - + The setup program is not running with administrator rights. Il program di configurazion nol è in esecuzion cui permès di aministradôr. - + The installer is not running with administrator rights. Il program di instalazion nol è in esecuzion cui permès di aministradôr. - + has a screen large enough to show the whole installer al à un schermi avonde grant par mostrâ dut il program di instalazion - + The screen is too small to display the setup program. Il schermi al è masse piçul par visualizâ il program di configurazion. - + The screen is too small to display the installer. Il schermi al è masse piçul par visualizâ il program di instalazion. @@ -1978,35 +2018,35 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< LuksBootKeyFileJob - + Configuring LUKS key file. Daûr a configurâ dal file clâf di LUKS. - - + + No partitions are defined. No je stade definide nissune partizion. - - - + + + Encrypted rootfs setup error Erôr te configurazion di rootfs cifrât - + Root partition %1 is LUKS but no passphrase has been set. La partizion lidrîs (root) %1 e je LUKS ma no je stade stabilide nissune frase di acès. - + Could not create LUKS key file for root partition %1. Impussibil creâ il file clâf di LUKS pe partizion lidrîs (root) %1. - + Could not configure LUKS key file on partition %1. No si è rivâts a configurâ il file clâf di LUKS su la partizion %1. @@ -2032,12 +2072,12 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Map - + Timezone: %1 Fûs orari: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2049,100 +2089,112 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< NetInstallViewStep - + Package selection Selezion pachets - + Office software Software pal ufici - + Office package Pachet pal ufici - + Browser software Software par navigâ - + Browser package Pachet par navigadôr - + Web browser Navigadôr web - + Kernel + label for netinstall module, Linux kernel Kernel - + Services + label for netinstall module, system services Servizis - + Login + label for netinstall module, choose login manager Acès - + Desktop + label for netinstall module, choose desktop environment Scritori - - Applications - Aplicazions - - - + Communication + label for netinstall module Comunicazion - + Development + label for netinstall module Disvilup - + Office + label for netinstall module Ufici - + Multimedia + label for netinstall module Multimedia - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Personalizazion teme - + Gaming + label for netinstall module Zûcs - + Utilities + label for netinstall module Utilitâts + + + Applications + Aplicazions + NotesQmlViewStep @@ -2191,24 +2243,24 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< - - - + + + Timezone: %1 Fûs orari: %1 - + Select your preferred Zone within your Region. Selezione la tô Zone preferide dentri de tô Regjon. - + Zones Zonis - + You can fine-tune Language and Locale settings below. Tu puedis regolâ lis impostazions di Lenghe e Localizazion chi sot. @@ -2483,7 +2535,7 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Erôr no cognossût - + Password is empty Password vueide @@ -2521,22 +2573,6 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Sielç un prodot de liste. Il prodot selezionât al vignarà instalât. - - PackageChooserQmlViewStep - - - Packages - Pachets - - - - PackageChooserViewStep - - - Packages - Pachets - - PackageModel @@ -3065,7 +3101,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3391,12 +3427,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: Par otignî i miôrs risultâts, siguriti che chest computer: - + System requirements Recuisîts di sisteme @@ -3824,22 +3860,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Fâs clic achì par vê plui informazions su lis opinions dai utents</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Tignî i indizis al jude %1 a viodi trop dispès che al ven instalât, in cuâl hardware e ce aplicazions che a vegnin dopradis. Par viodi ce che al ven inviât, fâs clic su pe icone di jutori dongje a ogni aree. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Selezionant chest tu inviarâs informazions sul to hardware e su la tô instalazion. Cheste informazion e vignarà mandade dome <b>une volte</b>, dopo finide la instalazion. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Selezionant chest tu mandarâs informazions in mût periodic a %1 su la instalazion, l'hardware e lis aplicazions de tô <b>machine</b>. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Selezionant chest tu mandarâs cun regolaritât informazions a %1 su la instalazion, l'hardware, lis aplicazions e modei di ûs de aplicazion dal tô <b>utent</b>. @@ -4027,44 +4063,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Benvignûts sul program di configurazion Calamares par %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Benvignûts te configurazion di %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Benvignûts sul program di instalazion Calamares par %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Benvignûts sul program di instalazion di %1.</h1> - - - %1 support Supuart di %1 - + About %1 setup Informazions su la configurazion di %1 - + About %1 installer Informazion su la instalazion di %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>par %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Gracie a <a href="https://calamares.io/team/">il grup di Calamares</a> e al <a href="https://www.transifex.com/calamares/calamares/">grup di tradutôrs di Calamares</a>.<br/><br/>Il disvilup di <a href="https://calamares.io/">Calamares</a> al è patrocinât di <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4129,34 +4140,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - par %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Gracie a <a href='https://calamares.io/team/'>il grup di Calamares</a> - e al <a href='https://www.transifex.com/calamares/calamares/'>grup di tradutôrs - di Calamares</a>.<br/><br/> - Il disvilup di - <a href='https://calamares.io/'>Calamares</a> al è patrocinât di <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back Indaûr @@ -4258,17 +4242,17 @@ Output: Model de tastiere: - + Layouts Disposizions - + Type here to test your keyboard Scrîf achì par provâ la tastiere - + Variants Variantis @@ -4416,102 +4400,102 @@ Output: Se chest computer al vignarà doprât di plui personis, tu puedis creâ plui account dopo vê completade la instalazion. - + Only lowercase letters, numbers, underscore and hyphen are allowed. A son ametûts dome i numars, lis letaris minusculis, lis liniutis bassis e i tratuts. - + root is not allowed as username. - + What is the name of this computer? Ce non aial chest computer? - + Computer Name Non dal computer - + This name will be used if you make the computer visible to others on a network. Si doprarà chest non se tu rindis visibil a altris chest computer suntune rêt. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Sielç une password par tignî il to account al sigûr. - + Password Password - + Repeat Password Ripeti password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Inserìs la stesse password dôs voltis, in mût di evitâ erôrs di batidure. Une buine password e contignarà un miscliç di letaris, numars e puntuazions, e sarà lungje almancul vot caratars e si scugnarà cambiâle a intervai regolârs. - + Validate passwords quality Convalidâ la cualitât des passwords - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Cuant che cheste casele e je selezionade, il control su la fuarce de password al ven fat e no si podarà doprâ une password debile. - + Log in automatically without asking for the password Jentre in automatic cence domandâ la password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password Torne dopre la password dal utent pe password di root - + Use the same password for the administrator account. Dopre la stesse password pal account di aministradôr. - + Choose a root password to keep your account safe. Sielç une password di root par tignî il to account al sigûr. - + Root Password Password di root - + Repeat Root Password Ripeti password di root - + Enter the same password twice, so that it can be checked for typing errors. Inserìs la stesse password dôs voltis, in mût di evitâ erôrs di batidure. diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts index 775374c7a..01daf0ad2 100644 --- a/lang/calamares_gl.ts +++ b/lang/calamares_gl.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -138,7 +157,7 @@ - + Debug information Informe de depuración de erros. @@ -172,7 +191,7 @@ Calamares::JobThread - + Done Feito @@ -262,7 +281,7 @@ - + Waiting for %n module(s). @@ -270,7 +289,7 @@ - + (%n second(s)) @@ -278,7 +297,7 @@ - + System-requirements checking is complete. @@ -484,12 +503,12 @@ O instalador pecharase e perderanse todos os cambios. CalamaresWindow - + %1 Setup Program - + %1 Installer Instalador de %1 @@ -528,149 +547,149 @@ O instalador pecharase e perderanse todos os cambios. Formulario - + Select storage de&vice: Seleccione o dispositivo de almacenamento: - - - - + + + + Current: Actual: - + After: Despois: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Particionado manual</strong><br/> Pode crear o redimensionar particións pola súa conta. - + Reuse %1 as home partition for %2. Reutilizar %1 como partición home para %2 - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Seleccione unha partición para acurtar, logo empregue a barra para redimensionala</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Localización do cargador de arranque: - + <strong>Select a partition to install on</strong> <strong>Seleccione unha partición para instalar</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Non foi posible atopar unha partición de sistema de tipo EFI. Por favor, volva atrás e empregue a opción de particionado manual para crear unha en %1. - + The EFI system partition at %1 will be used for starting %2. A partición EFI do sistema en %1 será usada para iniciar %2. - + EFI system partition: Partición EFI do sistema: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Esta unidade de almacenamento non semella ter un sistema operativo instalado nela. Que desexa facer?<br/>Poderá revisar e confirmar as súas eleccións antes de que calquera cambio sexa feito na unidade de almacenamento. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Borrar disco</strong><br/>Esto <font color="red">eliminará</font> todos os datos gardados na unidade de almacenamento seleccionada. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instalar a carón</strong><br/>O instalador encollerá a partición para facerlle sitio a %1 - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Substituír a partición</strong><br/>Substitúe a partición con %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. A unidade de almacenamento ten %1 nela. Que desexa facer?<br/>Poderá revisar e confirmar a súa elección antes de que se aplique algún cambio á unidade. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Esta unidade de almacenamento xa ten un sistema operativo instalado nel. Que desexa facer?<br/>Poderá revisar e confirmar as súas eleccións antes de que calquera cambio sexa feito na unidade de almacenamento - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Esta unidade de almacenamento ten múltiples sistemas operativos instalados nela. Que desexa facer?<br/>Poderá revisar e confirmar as súas eleccións antes de que calquera cambio sexa feito na unidade de almacenamento. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -758,27 +777,27 @@ O instalador pecharase e perderanse todos os cambios. Config - + Set keyboard model to %1.<br/> Seleccionado modelo de teclado a %1.<br/> - + Set keyboard layout to %1/%2. Seleccionada a disposición do teclado a %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. A linguaxe do sistema será establecida a %1. - + The numbers and dates locale will be set to %1. A localización de números e datas será establecida a %1. @@ -813,97 +832,97 @@ O instalador pecharase e perderanse todos os cambios. Installación por rede. (Desactivadas. Non se pudo recupera-la lista de pacotes, comprobe a sua conexión a rede) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Este ordenador non satisfai os requerimentos mínimos ara a instalación de %1.<br/>A instalación non pode continuar. <a href="#details">Máis información...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Este ordenador non satisfai algúns dos requisitos recomendados para instalar %1.<br/> A instalación pode continuar, pero pode que algunhas características sexan desactivadas. - + This program will ask you some questions and set up %2 on your computer. Este programa faralle algunhas preguntas mentres prepara %2 no seu ordenador. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. O nome de usuario é demasiado longo. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. O nome do computador é demasiado curto. - + Your hostname is too long. O nome do computador é demasiado longo. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Os contrasinais non coinciden! - + OK! @@ -959,11 +978,16 @@ O instalador pecharase e perderanse todos os cambios. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1422,6 +1446,16 @@ O instalador pecharase e perderanse todos os cambios. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1451,8 +1485,8 @@ O instalador pecharase e perderanse todos os cambios. Confirme a frase de contrasinal - - + + Please enter the same passphrase in both boxes. Faga o favor de introducila a misma frase de contrasinal námbalas dúas caixas. @@ -1541,32 +1575,32 @@ O instalador pecharase e perderanse todos os cambios. &Reiniciar agora. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Todo feito.</h1><br/>%1 foi instalado na súa computadora.<br/>Agora pode reiniciar no seu novo sistema ou continuar a usalo entorno Live %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Fallou a instalación</h1><br/>%1 non se pudo instalar na sua computadora. <br/>A mensaxe de erro foi: %2. @@ -1600,12 +1634,18 @@ O instalador pecharase e perderanse todos os cambios. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Dando formato a %1 con sistema de ficheiros %2. - + The installer failed to format partition %1 on disk '%2'. O instalador fallou cando formateaba a partición %1 no disco '%2'. @@ -1613,12 +1653,12 @@ O instalador pecharase e perderanse todos os cambios. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1658,27 +1698,27 @@ O instalador pecharase e perderanse todos os cambios. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. O instalador non se está a executar con dereitos de administrador. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. A pantalla é demasiado pequena para mostrar o instalador. @@ -1978,35 +2018,35 @@ O instalador pecharase e perderanse todos os cambios. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2032,12 +2072,12 @@ O instalador pecharase e perderanse todos os cambios. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2047,98 +2087,110 @@ O instalador pecharase e perderanse todos os cambios. NetInstallViewStep - + Package selection Selección de pacotes. - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2189,24 +2241,24 @@ O instalador pecharase e perderanse todos os cambios. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2481,7 +2533,7 @@ O instalador pecharase e perderanse todos os cambios. Erro descoñecido - + Password is empty @@ -2519,22 +2571,6 @@ O instalador pecharase e perderanse todos os cambios. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3063,7 +3099,7 @@ Saída: QObject - + %1 (%2) %1 (%2) @@ -3386,12 +3422,12 @@ Saída: ResultsListDialog - + For best results, please ensure that this computer: Para os mellores resultados, por favor, asegúrese que este ordenador: - + System requirements Requisitos do sistema @@ -3819,22 +3855,22 @@ Saída: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Prema aquí para máis información sobre as opinións do usuario</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4022,44 +4058,19 @@ Saída: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Reciba a benvida ao instalador Calamares para %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Benvido o instalador %1.</h1> - - - %1 support %1 axuda - + About %1 setup - + About %1 installer Acerca do instalador %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4124,23 +4135,7 @@ Saída: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4240,17 +4235,17 @@ Saída: Modelo de teclado. - + Layouts - + Type here to test your keyboard Teclee aquí para comproba-lo seu teclado. - + Variants @@ -4377,102 +4372,102 @@ Saída: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? Cal é o nome deste computador? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Escolla un contrasinal para mante-la sua conta segura. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. Empregar o mesmo contrasinal para a conta de administrador. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts index db6b4c990..d166f6655 100644 --- a/lang/calamares_gu.ts +++ b/lang/calamares_gu.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -482,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -526,149 +545,149 @@ The installer will quit and all changes will be lost. - + Select storage de&vice: - - - - + + + + Current: - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -756,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -811,97 +830,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -957,11 +976,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1420,6 +1444,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1449,8 +1483,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1539,32 +1573,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1598,12 +1632,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1611,12 +1651,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1656,27 +1696,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1976,35 +2016,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2030,12 +2070,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2045,98 +2085,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2187,24 +2239,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2479,7 +2531,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2517,22 +2569,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3058,7 +3094,7 @@ Output: QObject - + %1 (%2) @@ -3381,12 +3417,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3814,22 +3850,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4017,44 +4053,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4119,23 +4130,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4235,17 +4230,17 @@ Output: - + Layouts - + Type here to test your keyboard - + Variants @@ -4372,102 +4367,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index cf4e2ab7d..8d247a41b 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + <h1>%1</h1><br/><strong>%2<br/> עבור %3</strong><br/><br/> + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + תודה ל<a href="https://calamares.io/team/">צוות Calamares</a> ול<a href="https://www.transifex.com/calamares/calamares/">צוות המתרגמים שלCalamares</a>.<br/><br/><a href="https://calamares.io/">הפיתוח של Calamares</a> ממומן על ידי <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - משחררים תוכנה. + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + כל הזכויות שמורות %1-%2 %3 &lt;%4&gt;<br/> + + AutoMountManagementJob @@ -137,7 +156,7 @@ עץ וידג׳טים - + Debug information מידע על ניפוי שגיאות @@ -171,7 +190,7 @@ Calamares::JobThread - + Done סיום @@ -261,7 +280,7 @@ בדיקת הדרישות למודול <i>%1</i> הושלמה. - + Waiting for %n module(s). בהמתנה למודול אחד. @@ -271,7 +290,7 @@ - + (%n second(s)) ((שנייה אחת) @@ -281,7 +300,7 @@ - + System-requirements checking is complete. בדיקת דרישות המערכת הושלמה. @@ -492,12 +511,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program תכנית התקנת %1 - + %1 Installer אשף התקנת %1 @@ -536,149 +555,149 @@ The installer will quit and all changes will be lost. Form - + Select storage de&vice: בחירת התקן א&חסון: - - - - + + + + Current: נוכחי: - + After: לאחר: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>הגדרת מחיצות באופן ידני</strong><br/>ניתן ליצור או לשנות את גודל המחיצות בעצמך. - + Reuse %1 as home partition for %2. שימוש ב־%1 כמחיצת הבית (home) עבור %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>ראשית יש לבחור מחיצה לכיווץ, לאחר מכן לגרור את הסרגל התחתון כדי לשנות את גודלה</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 תכווץ לכדי %2MiB ותיווצר מחיצה חדשה בגודל %3MiB עבור %4. - + Boot loader location: מיקום מנהל אתחול המערכת: - + <strong>Select a partition to install on</strong> <strong>נא לבחור מחיצה כדי להתקין עליה</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. במערכת זו לא נמצאה מחיצת מערכת EFI. נא לחזור ולהשתמש ביצירת מחיצות באופן ידני כדי להגדיר את %1. - + The EFI system partition at %1 will be used for starting %2. מחיצת מערכת EFI שב־%1 תשמש לטעינת %2. - + EFI system partition: מחיצת מערכת EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. לא נמצאה מערכת הפעלה על התקן אחסון זה. מה ברצונך לעשות?<br/> ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>מחיקת כונן</strong><br/> פעולה זו <font color="red">תמחק</font> את כל המידע השמור על התקן האחסון הנבחר. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>התקנה לצד</strong><br/> אשף ההתקנה יכווץ מחיצה כדי לפנות מקום לטובת %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>החלפת מחיצה</strong><br/> ביצוע החלפה של המחיצה ב־%1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. בהתקן אחסון זה נמצאה %1. מה ברצונך לעשות?<br/> ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. כבר קיימת מערכת הפעלה על התקן האחסון הזה. כיצד להמשיך?<br/> ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. ישנן מגוון מערכות הפעלה על התקן אחסון זה. איך להמשיך? <br/>ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> בהתקן האחסון הזה כבר יש מערכת הפעלה אך טבלת המחיצות <strong>%1</strong> שונה מהנדרשת <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. אחת המחיצות של התקן האחסון הזה <strong>מעוגנת</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. התקן אחסון זה הוא חלק מהתקן <strong>RAID בלתי פעיל</strong>. - + No Swap ללא החלפה - + Reuse Swap שימוש מחדש בהחלפה - + Swap (no Hibernate) החלפה (ללא תרדמת) - + Swap (with Hibernate) החלפה (עם תרדמת) - + Swap to file החלפה לקובץ @@ -766,27 +785,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> הגדרת דגם המקלדת בתור %1.<br/> - + Set keyboard layout to %1/%2. הגדרת פריסת לוח המקשים בתור %1/%2. - + Set timezone to %1/%2. הגדרת אזור הזמן לכדי %1/%2. - + The system language will be set to %1. שפת המערכת תוגדר להיות %1. - + The numbers and dates locale will be set to %1. תבנית של המספרים והתאריכים של המיקום יוגדרו להיות %1. @@ -821,97 +840,97 @@ The installer will quit and all changes will be lost. התקנה מהרשת. (מושבתת: לא ניתן לקבל רשימות של חבילות תכנה, נא לבדוק את החיבור לרשת) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> המחשב לא עומד ברף הדרישות המזערי להתקנת %1. <br/>להתקנה אין אפשרות להמשיך. <a href="#details">פרטים…</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> המחשב לא עומד ברף דרישות המינימום להתקנת %1. <br/>ההתקנה לא יכולה להמשיך. <a href="#details"> פרטים...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. המחשב לא עומד בחלק מרף דרישות המזערי להתקנת %1.<br/> ההתקנה יכולה להמשיך, אך יתכן כי חלק מהתכונות יושבתו. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. המחשב לא עומד בחלק מרף דרישות המינימום להתקנת %1.<br/> ההתקנה יכולה להמשיך, אך יתכן כי חלק מהתכונות יושבתו. - + This program will ask you some questions and set up %2 on your computer. תכנית זו תשאל אותך מספר שאלות ותתקין את %2 על המחשב שלך. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>ברוך בואך לתכנית ההתקנה Calamares עבור %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>ברוך בואך להתקנת %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>ברוך בואך להתקנת %1 עם Calamares</h1> - + <h1>Welcome to the %1 installer</h1> <h1>ברוך בואך להתקנת %1</h1> - + Your username is too long. שם המשתמש ארוך מדי. - + '%1' is not allowed as username. אסור להשתמש ב־‚%1’ כשם משתמש. - + Your username must start with a lowercase letter or underscore. שם המשתמש שלך חייב להתחיל באות קטנה או בקו תחתי. - + Only lowercase letters, numbers, underscore and hyphen are allowed. מותר להשתמש רק באותיות קטנות, ספרות, קווים תחתיים ומינוסים. - + Your hostname is too short. שם המחשב קצר מדי. - + Your hostname is too long. שם המחשב ארוך מדי. - + '%1' is not allowed as hostname. אסור להשתמש ב־‚%1’ כשם מארח. - + Only letters, numbers, underscore and hyphen are allowed. מותר להשתמש רק באותיות, ספרות, קווים תחתיים ומינוסים. - + Your passwords do not match! הסיסמאות לא תואמות! - + OK! בסדר! @@ -967,11 +986,16 @@ The installer will quit and all changes will be lost. + Packages + חבילות + + + Install option: <strong>%1</strong> אפשרות התקנה: <strong>%1</strong> - + None ללא @@ -1430,6 +1454,16 @@ The installer will quit and all changes will be lost. FS Label: תווית מערכת הקבצים: + + + Passphrase for existing partition + מילת צופן למחיצה קיימת + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + לא ניתן לפענח את המחיצה %1 עם מילת הצופן שסופקה.<br/><br/>יש לערוך את המחיצה שוב ולספק את מילת הצופן הנכונה או למחוק וליצור מחיצה מוצפנת חדשה. + EncryptWidget @@ -1459,8 +1493,8 @@ The installer will quit and all changes will be lost. אישור מילת צופן - - + + Please enter the same passphrase in both boxes. נא להקליד את אותה מילת הצופן בשתי התיבות. @@ -1549,32 +1583,32 @@ The installer will quit and all changes will be lost. ה&פעלה מחדש כעת - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>הכול הושלם.</h1><br/>ההתקנה של %1 למחשב שלך הושלמה.<br/>מעתה יתאפשר לך להשתמש במערכת החדשה שלך. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>אם תיבה זו מסומנת, המערכת שלך תופעל מחדש מיידית עם הלחיצה על <span style="font-style:italic;">סיום</span> או עם סגירת תכנית ההתקנה.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>תהליך ההתקנה הסתיים.</h1><br/>%1 הותקן על המחשב שלך.<br/> כעת ניתן לאתחל את המחשב אל תוך המערכת החדשה שהותקנה, או להמשיך להשתמש בסביבה הנוכחית של %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>אם תיבה זו מסומנת, המערכת שלך תופעל מחדש מיידית עם הלחיצה על <span style="font-style:italic;">סיום</span> או עם סגירת תכנית ההתקנה.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>ההתקנה נכשלה</h1><br/>ההתקנה של %1 במחשבך לא הושלמה.<br/>הודעת השגיאה הייתה: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>ההתקנה נכשלה</h1><br/>%1 לא הותקן על מחשבך.<br/> הודעת השגיאה: %2. @@ -1608,12 +1642,18 @@ The installer will quit and all changes will be lost. אתחול מחיצה בגודל <strong>%3MiB</strong> בנתיב <strong>%1</strong> עם מערכת הקבצים <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. כעת בפרמוט המחיצה %1 עם מערכת הקבצים %2. - + The installer failed to format partition %1 on disk '%2'. אשף ההתקנה נכשל בעת אתחול המחיצה %1 על הכונן ‚%2’. @@ -1621,12 +1661,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space יש לפחות %1 GiB פנויים בכונן - + There is not enough drive space. At least %1 GiB is required. נפח האחסון לא מספיק. נדרשים %1 GiB לפחות. @@ -1666,27 +1706,27 @@ The installer will quit and all changes will be lost. ההתקנה מופעלת תחת חשבון מורשה ניהול (root) - + The setup program is not running with administrator rights. תכנית ההתקנה אינה פועלת עם הרשאות ניהול. - + The installer is not running with administrator rights. אשף ההתקנה לא רץ עם הרשאות מנהל. - + has a screen large enough to show the whole installer המסך גדול מספיק להצגת כל אשף ההתקנה - + The screen is too small to display the setup program. המסך קטן מכדי להציג את תכנית ההתקנה. - + The screen is too small to display the installer. גודל המסך קטן מכדי להציג את תכנית ההתקנה. @@ -1986,35 +2026,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. קובץ מפתח ה־LUKS מוגדר. - - + + No partitions are defined. לא הוגדרו מחיצות. - - - + + + Encrypted rootfs setup error שגיאת התקנת מחיצת שורש מוצפנת - + Root partition %1 is LUKS but no passphrase has been set. מחיצת השורש %1 היא LUKS אבל לא הוגדרה מילת צופן. - + Could not create LUKS key file for root partition %1. לא ניתן ליצור קובץ מפתח LUKS למחיצת השורש %1. - + Could not configure LUKS key file on partition %1. לא ניתן להגדיר קובץ מפתח LUKS למחיצה %1. @@ -2040,12 +2080,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 אזור זמן: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2057,100 +2097,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection בחירת חבילות - + Office software תכנה של כלים משרדיים - + Office package חבילת כלים משרדיים - + Browser software תכנה של דפדפן - + Browser package חבילת דפדפן - + Web browser דפדפן - + Kernel + label for netinstall module, Linux kernel ליבה - + Services + label for netinstall module, system services שירותים - + Login + label for netinstall module, choose login manager כניסה - + Desktop + label for netinstall module, choose desktop environment שולחן עבודה - - Applications - יישומים - - - + Communication + label for netinstall module תקשורת - + Development + label for netinstall module פיתוח - + Office + label for netinstall module כלי משרד - + Multimedia + label for netinstall module מולטימדיה - + Internet + label for netinstall module אינטרנט - + Theming + label for netinstall module עיצוב - + Gaming + label for netinstall module משחקים - + Utilities + label for netinstall module כלים + + + Applications + יישומים + NotesQmlViewStep @@ -2199,24 +2251,24 @@ The installer will quit and all changes will be lost. ניתן לבחור את האזור המועדף עליך או להשתמש בהגדרות בררת המחדל. - - - + + + Timezone: %1 אזור זמן: %1 - + Select your preferred Zone within your Region. נא לבחור את האזור המועדף במחוז שלך. - + Zones אזורים - + You can fine-tune Language and Locale settings below. ניתן לכוון את הגדרות השפה והמיקום להלן. @@ -2509,7 +2561,7 @@ The installer will quit and all changes will be lost. שגיאה לא ידועה - + Password is empty שדה הסיסמה ריק @@ -2547,22 +2599,6 @@ The installer will quit and all changes will be lost. נא לבחור במוצר מהרשימה. המוצר הנבחר יותקן. - - PackageChooserQmlViewStep - - - Packages - חבילות - - - - PackageChooserViewStep - - - Packages - חבילות - - PackageModel @@ -3091,7 +3127,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3417,12 +3453,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: לקבלת התוצאות הטובות ביותר, נא לוודא כי מחשב זה: - + System requirements דרישות מערכת @@ -3850,22 +3886,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">יש ללחוץ כאן למידע נוסף על המשוב מצד המשתמשים</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. מעקב מסייע ל־%1 לראות מה תדירות ההתקנות, על איזו חומרה המערכת מותקנת ואילו יישומים בשימוש. כדי לצפות במה שיישלח, נא ללחוץ על סמל העזרה שליד כל אזור. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. בחירה באפשרות זו תוביל לשליחת מידע על ההתקנה והחומרה שלך. מידע זה יישלח <b>פעם אחת</b> בלבד לאחר סיום ההתקנה. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. בחירה באפשרות הזאת תוביל לשליחת מידע מדי פעם בפעם על ההתקנה ב<b>מערכת</b>, החומרה והיישומים שלך אל %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. בחירה באפשרות זו תוביל לשליחת מידע באופן קבוע על התקנת ה<b>משתמש</b>, החומרה, היישומים ודפוסי שימוש אל %1. @@ -4053,44 +4089,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>ברוך בואך לתכנית ההתקנה Calamares עבור %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>ברוך בואך להתקנת %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>ברוך בואך להתקנת %1 עם Calamares.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>ברוך בואך להתקנת %1.</h1> - - - %1 support תמיכה ב־%1 - + About %1 setup על אודות התקנת %1 - + About %1 installer על אודות התקנת %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>עבור %3</strong><br/><br/>כל הזכויות שמורות 2014‏-2017 ל־Teo Mrnjavac‏ &lt;teo@kde.org&gt;<br/>כל הזכויות שמורות 2017‏-2020 ל־Adriaan de Groot‏ &lt;groot@kde.org&gt;<br/>תודה גדולה נתונה <a href="https://calamares.io/team/">לצוות Calamares</a> ול<a href="https://www.transifex.com/calamares/calamares/">צווות המתרגמים של Calamares</a>.<br/><br/><a href="https://calamares.io/">הפיתוח של Calamares</a> ממומן על ידי <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - דואגים לחירות התכנה. - WelcomeQmlViewStep @@ -4155,34 +4166,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - כל הזכויות שמורות 2014‏-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - כל הזכויות שמורות 2017‏-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - תודה גדולה נתונה <a href='https://calamares.io/team/'>לצוות Calamares</a> - ול<a href='https://www.transifex.com/calamares/calamares/'>צוות המתרגמים - של Calamares</a>.<br/><br/> - הפיתוח של <a href='https://calamares.io/'>Calamares</a> - ממומן על ידי <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - דואגים לחירות התכנה. - - - + Back חזרה @@ -4287,17 +4271,17 @@ Output: דגם מקלדת: - + Layouts פריסות - + Type here to test your keyboard ניתן להקליד כאן כדי לבדוק את המקלדת שלך - + Variants הגוונים @@ -4446,102 +4430,102 @@ Output: אם במחשב זה יש יותר ממשתמש אחד, ניתן ליצור מגוון חשבונות לאחר ההתקנה. - + Only lowercase letters, numbers, underscore and hyphen are allowed. מותר להשתמש רק באותיות קטנות, ספרות, קווים תחתיים ומינוסים. - + root is not allowed as username. אסור להשתמש ב־root כשם משתמש. - + What is the name of this computer? מהו השם של המחשב הזה? - + Computer Name שם המחשב - + This name will be used if you make the computer visible to others on a network. השם הזה יהיה בשימוש אם המחשב הזה יהיה גלוי לשאר הרשת. - + localhost is not allowed as hostname. אסור להשתמש ב־localhost כשם מארח. - + Choose a password to keep your account safe. נא לבחור סיסמה להגנה על חשבונך. - + Password סיסמה - + Repeat Password חזרה על הסיסמה - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. יש להקליד את אותה הסיסמה פעמיים כדי שניתן יהיה לבדוק שגיאות הקלדה. סיסמה טובה אמורה להכיל שילוב של אותיות, מספרים וסימני פיסוק, להיות באורך של שמונה תווים לפחות ויש להחליף אותה במרווחי זמן קבועים. - + Validate passwords quality אימות איכות הסיסמאות - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. כשתיבה זו מסומנת, בדיקת אורך סיסמה מתבצעת ולא תהיה לך אפשרות להשתמש בסיסמה חלשה. - + Log in automatically without asking for the password להיכנס אוטומטית מבלי לבקש סיסמה - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. מותר להשתמש באותיות, ספרות, קווים תחתונים ומינוסים, שני תווים ומעלה. - + Reuse user password as root password להשתמש בסיסמת המשתמש גם בשביל משתמש העל (root) - + Use the same password for the administrator account. להשתמש באותה הסיסמה בשביל חשבון המנהל. - + Choose a root password to keep your account safe. נא לבחור סיסמה למשתמש העל (root) כדי להגן על חשבונך. - + Root Password סיסמה למשתמש העל (root) - + Repeat Root Password נא לחזור על סיסמת משתמש העל - + Enter the same password twice, so that it can be checked for typing errors. נא להקליד את הסיסמה פעמיים כדי לאפשר זיהוי של שגיאות הקלדה. diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts index e32c70897..ebe9d431d 100644 --- a/lang/calamares_hi.ts +++ b/lang/calamares_hi.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ विजेट ट्री - + Debug information डीबग संबंधी जानकारी @@ -171,7 +190,7 @@ Calamares::JobThread - + Done पूर्ण @@ -261,7 +280,7 @@ मॉड्यूल <i>%1</i> हेतु आवश्यकताओं की जाँच पूर्ण हुई। - + Waiting for %n module(s). %n मॉड्यूल की प्रतीक्षा में। @@ -269,7 +288,7 @@ - + (%n second(s)) (%n सेकंड) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. सिस्टम हेतु आवश्यकताओं की जाँच पूर्ण हुई। @@ -488,12 +507,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 सेटअप प्रोग्राम - + %1 Installer %1 इंस्टॉलर @@ -532,149 +551,149 @@ The installer will quit and all changes will be lost. रूप - + Select storage de&vice: डिवाइस चुनें (&v): - - - - + + + + Current: मौजूदा : - + After: बाद में: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>मैनुअल विभाजन</strong><br/> स्वयं विभाजन बनाएँ या उनका आकार बदलें। - + Reuse %1 as home partition for %2. %2 के होम विभाजन के लिए %1 को पुनः उपयोग करें। - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>छोटा करने के लिए विभाजन चुनें, फिर नीचे bar से उसका आकर सेट करें</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 को छोटा करके %2MiB किया जाएगा व %4 हेतु %3MiB का एक नया विभाजन बनेगा। - + Boot loader location: बूट लोडर का स्थान: - + <strong>Select a partition to install on</strong> <strong>इंस्टॉल के लिए विभाजन चुनें</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. इस सिस्टम पर कहीं भी कोई EFI सिस्टम विभाजन नहीं मिला। कृपया वापस जाएँ व %1 को सेट करने के लिए मैनुअल रूप से विभाजन करें। - + The EFI system partition at %1 will be used for starting %2. %1 वाले EFI सिस्टम विभाजन का उपयोग %2 को शुरू करने के लिए किया जाएगा। - + EFI system partition: EFI सिस्टम विभाजन: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. इस डिवाइस पर लगता है कि कोई ऑपरेटिंग सिस्टम नहीं है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे। - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>डिस्क का सारा डाटा हटाएँ</strong><br/>इससे चयनित डिवाइस पर मौजूद सारा डाटा <font color="red">हटा</font>हो जाएगा। - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>साथ में इंस्टॉल करें</strong><br/>इंस्टॉलर %1 के लिए स्थान बनाने हेतु एक विभाजन को छोटा कर देगा। - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>विभाजन को बदलें</strong><br/>एक विभाजन को %1 से बदलें। - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. इस डिवाइस पर %1 है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे। - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. इस डिवाइस पर पहले से एक ऑपरेटिंग सिस्टम है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे। - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. इस डिवाइस पर एक से अधिक ऑपरेटिंग सिस्टम है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे। - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> इस संचय उपकरण पर पहले से ऑपरेटिंग सिस्टम है, परंतु <strong>%1</strong> विभाजन तालिका अपेक्षित <strong>%2</strong> से भिन्न है।<br/> - + This storage device has one of its partitions <strong>mounted</strong>. इस संचय उपकरण के विभाजनों में से कोई एक विभाजन <strong>माउंट</strong> है। - + This storage device is a part of an <strong>inactive RAID</strong> device. यह संचय उपकरण एक <strong>निष्क्रिय RAID</strong> उपकरण का हिस्सा है। - + No Swap कोई स्वैप नहीं - + Reuse Swap स्वैप पुनः उपयोग करें - + Swap (no Hibernate) स्वैप (हाइबरनेशन/सिस्टम सुप्त रहित) - + Swap (with Hibernate) स्वैप (हाइबरनेशन/सिस्टम सुप्त सहित) - + Swap to file स्वैप फाइल बनाएं @@ -762,27 +781,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> कुंजीपटल का मॉडल %1 सेट करें।<br/> - + Set keyboard layout to %1/%2. कुंजीपटल का अभिन्यास %1/%2 सेट करें। - + Set timezone to %1/%2. समय क्षेत्र %1%2 सेट करें। - + The system language will be set to %1. सिस्टम भाषा %1 सेट की जाएगी। - + The numbers and dates locale will be set to %1. संख्या व दिनांक स्थानिकी %1 सेट की जाएगी। @@ -817,97 +836,97 @@ The installer will quit and all changes will be lost. नेटवर्क इंस्टॉल। (निष्क्रिय है : पैकेज सूची प्राप्त करने में असमर्थ, अपना नेटवर्क कनेक्शन जाँचें) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> यह कंप्यूटर %1 सेटअप करने की न्यूनतम आवश्यकताओं को पूरा नहीं करता।<br/>सेटअप जारी नहीं रखा जा सकता।<a href="#details">विवरण...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> यह कंप्यूटर %1 इंस्टॉल करने की न्यूनतम आवश्यकताओं को पूरा नहीं करता।<br/>इंस्टॉल जारी नहीं रखा जा सकता।<a href="#details">विवरण...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. यह कंप्यूटर %1 सेटअप करने हेतु सुझाई गई आवश्यकताओं को पूरा नहीं करता।<br/>सेटअप जारी रखा जा सकता है, लेकिन कुछ विशेषताएँ निष्क्रिय कर दी जाएँगी। - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. यह कंप्यूटर %1 इंस्टॉल करने हेतु सुझाई गई आवश्यकताओं को पूरा नहीं करता।<br/>इंस्टॉल जारी रखा जा सकता है, लेकिन कुछ विशेषताएँ निष्क्रिय कर दी जाएँगी। - + This program will ask you some questions and set up %2 on your computer. यह प्रोग्राम प्रश्नावली के माध्यम से आपके कंप्यूटर पर %2 को सेट करेगा। - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>%1 हेतु Calamares सेटअप में आपका स्वागत है</h1> - + <h1>Welcome to %1 setup</h1> <h1>%1 सेटअप में आपका स्वागत है</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>%1 हेतु Calamares इंस्टॉलर में आपका स्वागत है</h1> - + <h1>Welcome to the %1 installer</h1> <h1>%1 इंस्टॉलर में आपका स्वागत है</h1> - + Your username is too long. उपयोक्ता नाम बहुत लंबा है। - + '%1' is not allowed as username. उपयोक्ता नाम के रूप में '%1' का उपयोग अस्वीकार्य है। - + Your username must start with a lowercase letter or underscore. उपयोक्ता नाम का आरंभ केवल लोअरकेस अक्षर या अंडरस्कोर(-) से ही करें। - + Only lowercase letters, numbers, underscore and hyphen are allowed. केवल लोअरकेस अक्षर, अंक, अंडरस्कोर(_) व हाइफ़न(-) ही स्वीकार्य हैं। - + Your hostname is too short. होस्ट नाम बहुत छोटा है। - + Your hostname is too long. होस्ट नाम बहुत लंबा है। - + '%1' is not allowed as hostname. होस्ट नाम के रूप में '%1' का उपयोग अस्वीकार्य है। - + Only letters, numbers, underscore and hyphen are allowed. केवल अक्षर, अंक, अंडरस्कोर(_) व हाइफ़न(-) ही स्वीकार्य हैं। - + Your passwords do not match! आपके कूटशब्द मेल नहीं खाते! - + OK! ठीक है! @@ -963,11 +982,16 @@ The installer will quit and all changes will be lost. + Packages + पैकेज + + + Install option: <strong>%1</strong> इंस्टॉल विकल्प : <strong>%1</strong> - + None कोई नहीं @@ -1426,6 +1450,16 @@ The installer will quit and all changes will be lost. FS Label: फाइल सिस्टम उपनाम : + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1455,8 +1489,8 @@ The installer will quit and all changes will be lost. कूटशब्द की पुष्टि करें - - + + Please enter the same passphrase in both boxes. कृपया दोनों स्थानों में समान कूटशब्द दर्ज करें। @@ -1545,32 +1579,32 @@ The installer will quit and all changes will be lost. अभी पुनः आरंभ करें (&R) - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>सब हो गया।</h1><br/>आपके कंप्यूटर पर %1 को सेटअप कर दिया गया है।<br/>अब आप अपने नए सिस्टम का उपयोग कर सकते है। - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>यह विकल्प चयनित होने पर आपका सिस्टम तुरंत पुनः आरंभ हो जाएगा जब आप <span style="font-style:italic;">हो गया</span>पर क्लिक करेंगे या सेटअप प्रोग्राम को बंद करेंगे।</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>सब हो गया।</h1><br/>आपके कंप्यूटर पर %1 इंस्टॉल हो चुका है।<br/>अब आप आपने नए सिस्टम को पुनः आरंभ कर सकते है, या फिर %2 लाइव वातावरण उपयोग करना जारी रखें। - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>यह विकल्प चयनित होने पर आपका सिस्टम तुरंत पुनः आरंभ हो जाएगा जब आप <span style="font-style:italic;">हो गया</span>पर क्लिक करेंगे या इंस्टॉलर बंद करेंगे।</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>सेटअप विफल रहा</h1><br/>%1 आपके कंप्यूटर पर सेटअप नहीं हुआ।<br/>त्रुटि संदेश : %2। - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>इंस्टॉल विफल रहा</h1><br/>%1 आपके कंप्यूटर पर इंस्टॉल नहीं हुआ।<br/>त्रुटि संदेश : %2। @@ -1604,12 +1638,18 @@ The installer will quit and all changes will be lost. फ़ाइल सिस्टम <strong>%2</strong> के साथ <strong>%3MiB</strong> के विभाजन <strong>%1</strong> को फॉर्मेट करें। - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. फ़ाइल सिस्टम %2 के साथ विभाजन %1 को फॉर्मेट किया जा रहा है। - + The installer failed to format partition %1 on disk '%2'. इंस्टॉलर डिस्क '%2' पर विभाजन %1 को फॉर्मेट करने में विफल रहा। @@ -1617,12 +1657,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space कम-से-कम %1 GiB स्पेस ड्राइव पर उपलब्ध हो - + There is not enough drive space. At least %1 GiB is required. ड्राइव में पर्याप्त स्पेस नहीं है। कम-से-कम %1 GiB होना आवश्यक है। @@ -1662,27 +1702,27 @@ The installer will quit and all changes will be lost. इंस्टॉलर को प्रबंधक(रुट) के अंतर्गत चला रहा है - + The setup program is not running with administrator rights. सेटअप प्रोग्राम के पास प्रबंधक अधिकार नहीं है। - + The installer is not running with administrator rights. इंस्टॉलर के पास प्रबंधक अधिकार नहीं है। - + has a screen large enough to show the whole installer स्क्रीन का माप इंस्टॉलर को पूर्णतया प्रदर्शित करने में सक्षम हो - + The screen is too small to display the setup program. सेटअप प्रोग्राम प्रदर्शित करने हेतु स्क्रीन काफ़ी छोटी है। - + The screen is too small to display the installer. इंस्टॉलर प्रदर्शित करने हेतु स्क्रीन काफ़ी छोटी है। @@ -1982,35 +2022,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. LUKS कुंजी फ़ाइल विन्यस्त करना। - - + + No partitions are defined. कोई विभाजन परिभाषित नहीं है। - - - + + + Encrypted rootfs setup error एन्क्रिप्टेड रुट फ़ाइल सिस्टम सेटअप करने में त्रुटि - + Root partition %1 is LUKS but no passphrase has been set. रुट विभाजन %1, LUKS है परंतु कोई कूटशब्द सेट नहीं है। - + Could not create LUKS key file for root partition %1. रुट विभाजन %1 हेतु LUKS कुंजी फ़ाइल बनाई नहीं जा सकी। - + Could not configure LUKS key file on partition %1. विभाजन %1 हेतु LUKS कुंजी फ़ाइल विन्यस्त नहीं हो सकी। @@ -2036,12 +2076,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 समय क्षेत्र : %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2053,100 +2093,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection पैकेज चयन - + Office software ऑफिस सॉफ्टवेयर - + Office package ऑफिस पैकेज - + Browser software ब्राउज़र सॉफ्टवेयर - + Browser package ब्राउज़र पैकेज - + Web browser वेब ब्राउज़र - + Kernel + label for netinstall module, Linux kernel कर्नेल - + Services + label for netinstall module, system services सेवाएँ - + Login + label for netinstall module, choose login manager लॉगिन - + Desktop + label for netinstall module, choose desktop environment डेस्कटॉप - - Applications - अनुप्रयोग - - - + Communication + label for netinstall module संचार - + Development + label for netinstall module सॉफ्टवेयर विकास - + Office + label for netinstall module ऑफिस - + Multimedia + label for netinstall module मल्टीमीडिया - + Internet + label for netinstall module इंटरनेट - + Theming + label for netinstall module थीम - + Gaming + label for netinstall module खेल - + Utilities + label for netinstall module साधन + + + Applications + अनुप्रयोग + NotesQmlViewStep @@ -2195,24 +2247,24 @@ The installer will quit and all changes will be lost. अपना इच्छित क्षेत्र चुनें या फिर डिफ़ॉल्ट सेटिंग्स उपयोग करें। - - - + + + Timezone: %1 समय क्षेत्र : %1 - + Select your preferred Zone within your Region. इच्छित क्षेत्र में भूभाग चुनें। - + Zones भूभाग - + You can fine-tune Language and Locale settings below. भाषा व स्थानिकी हेतु निम्नलिखित सेटिंग्स उपयोग करें। @@ -2487,7 +2539,7 @@ The installer will quit and all changes will be lost. अज्ञात त्रुटि - + Password is empty कूटशब्द रिक्त है @@ -2525,22 +2577,6 @@ The installer will quit and all changes will be lost. सूची में से वस्तु विशेष का चयन करें। चयनित वस्तु इंस्टॉल कर दी जाएगी। - - PackageChooserQmlViewStep - - - Packages - पैकेज - - - - PackageChooserViewStep - - - Packages - पैकेज - - PackageModel @@ -3069,7 +3105,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3395,12 +3431,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: उत्तम परिणाम हेतु, कृपया सुनिश्चित करें कि यह कंप्यूटर : - + System requirements सिस्टम इंस्टॉल हेतु आवश्यकताएँ @@ -3828,22 +3864,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">उपयोक्ता प्रतिक्रिया के बारे में अधिक जानकारी हेतु यहाँ क्लिक करें</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. ट्रैकिंग द्वारा %1 को यह जानने में सहायता मिलती है कि कितनी बार व किस हार्डवेयर पर इंस्टॉल किया गया एवं कौन से अनुप्रयोग उपयोग किए गए। यह जानने हेतु कि क्या भेजा जाएगा, कृपया प्रत्येक के साथ दिए गए सहायता आइकन पर क्लिक करें। - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. इसे चयनित करने पर आपके इंस्टॉल व हार्डवेयर संबंधी जानकारी भेजी जाएँगी। यह जानकारी इंस्टॉल समाप्त हो जाने के उपरांत केवल <b>एक बार</b> ही भेजी जाएगी। - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. इसे चयनित करने पर आपके <b>मशीन</b> इंस्टॉल, हार्डवेयर व अनुप्रयोगों संबंधी जानकारी समय-समय पर, %1 को भेजी जाएँगी। - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. इसे चयनित करने पर आपके <b>उपयोक्ता</b> इंस्टॉल, हार्डवेयर, अनुप्रयोगों व प्रतिमानों संबंधी जानकारी समय-समय पर, %1 को भेजी जाएँगी। @@ -4031,44 +4067,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>%1 हेतु Calamares सेटअप में आपका स्वागत है।</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>%1 सेटअप में आपका स्वागत है।</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>%1 के लिए Calamares इंस्टॉलर में आपका स्वागत है।</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>%1 इंस्टॉलर में आपका स्वागत है।</h1> - - - %1 support %1 सहायता - + About %1 setup %1 सेटअप के बारे में - + About %1 installer %1 इंस्टॉलर के बारे में - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>के लिए %3</strong><br/><br/>प्रतिलिप्याधिकार 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>प्रतिलिप्याधिकार 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/><a href="https://calamares.io/team/">Calamares टीम</a> व <a href="https://www.transifex.com/calamares/calamares/">Calamares अनुवादक टीम</a> का धन्यवाद।<br/><br/><a href="https://calamares.io/">Calamares</a> का विकास <br/><a href="http://www.blue-systems.com/">ब्लू सिस्टम्स</a> - लिब्रेटिंग सॉफ्टवेयर द्वारा प्रायोजित है। - WelcomeQmlViewStep @@ -4133,34 +4144,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - के लिए %3</strong><br/><br/> - प्रतिलिप्याधिकार 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - प्रतिलिप्याधिकार 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - <a href='https://calamares.io/team/'>Calamares टीम</a> - व <a href='https://www.transifex.com/calamares/calamares/'>Calamares - अनुवादक टीम</a>को धन्यवाद।<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - का विकास <br/> - <a href='http://www.blue-systems.com/'>ब्लू सिस्टम्स</a> - - लिब्रेटिंग सॉफ्टवेयर द्वारा प्रायोजित है। - - - + Back वापस @@ -4265,17 +4249,17 @@ Output: कुंजीपटल का मॉडल - + Layouts अभिन्यास - + Type here to test your keyboard अपना कुंजीपटल जाँचने के लिए यहाँ टाइप करें - + Variants भिन्न रूप @@ -4424,102 +4408,102 @@ Output: यदि एक से अधिक व्यक्ति इस कंप्यूटर का उपयोग करेंगे, तो आप इंस्टॉल के उपरांत एकाधिक अकाउंट बना सकते हैं। - + Only lowercase letters, numbers, underscore and hyphen are allowed. केवल लोअरकेस अक्षर, अंक, अंडरस्कोर(_) व हाइफ़न(-) ही स्वीकार्य हैं। - + root is not allowed as username. उपयोक्ता नाम के रूप में root का उपयोग अस्वीकार्य है। - + What is the name of this computer? इस कंप्यूटर का नाम ? - + Computer Name कंप्यूटर का नाम - + This name will be used if you make the computer visible to others on a network. यदि आपका कंप्यूटर किसी नेटवर्क पर दृश्यमान होता है, तो यह नाम उपयोग किया जाएगा। - + localhost is not allowed as hostname. होस्ट नाम के रूप में localhost का उपयोग अस्वीकार्य है। - + Choose a password to keep your account safe. अपना अकाउंट सुरक्षित रखने के लिए पासवर्ड चुनें । - + Password कूटशब्द - + Repeat Password कूटशब्द पुनः दर्ज करें - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. एक ही कूटशब्द दो बार दर्ज़ करें, ताकि उसे टाइप त्रुटि हेतु जाँचा जा सके। एक अच्छे कूटशब्द में अक्षर, अंक व विराम चिन्हों का मेल होता है, उसमें कम-से-कम आठ अक्षर होने चाहिए, और उसे नियमित अंतराल पर बदलते रहना चाहिए। - + Validate passwords quality कूटशब्द गुणवत्ता प्रमाणीकरण - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. यह बॉक्स टिक करने के परिणाम स्वरुप कूटशब्द-क्षमता की जाँच होगी व आप कमज़ोर कूटशब्द उपयोग नहीं कर पाएंगे। - + Log in automatically without asking for the password कूटशब्द बिना पूछे ही स्वतः लॉग इन करें - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. केवल अक्षर, अंक, अंडरस्कोर व हाइफ़न ही स्वीकार्य हैं, परन्तु केवल दो अक्षर ही ऐसे हो सकते हैं। - + Reuse user password as root password रुट कूटशब्द हेतु भी उपयोक्ता कूटशब्द उपयोग करें - + Use the same password for the administrator account. प्रबंधक अकाउंट के लिए भी यही कूटशब्द उपयोग करें। - + Choose a root password to keep your account safe. अकाउंट सुरक्षा हेतु रुट कूटशब्द चुनें। - + Root Password रुट कूटशब्द - + Repeat Root Password रुट कूटशब्द पुनः दर्ज करें - + Enter the same password twice, so that it can be checked for typing errors. समान कूटशब्द दो बार दर्ज करें, ताकि टाइपिंग त्रुटि हेतु जाँच की जा सकें। diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts index 876ef3906..8a9ae8d55 100644 --- a/lang/calamares_hr.ts +++ b/lang/calamares_hr.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Stablo widgeta - + Debug information Debug informacija @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Gotovo @@ -261,7 +280,7 @@ Provjera zahtjeva za modul <i>%1</i> je dovršena. - + Waiting for %n module(s). Čekam %n modul(a). @@ -270,7 +289,7 @@ - + (%n second(s)) (%n sekunda(e)) @@ -279,7 +298,7 @@ - + System-requirements checking is complete. Provjera zahtjeva za instalaciju sustava je dovršena. @@ -490,12 +509,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. CalamaresWindow - + %1 Setup Program %1 instalacijski program - + %1 Installer %1 Instalacijski program @@ -534,149 +553,149 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Oblik - + Select storage de&vice: Odaberi uređaj za spremanje: - - - - + + + + Current: Trenutni: - + After: Poslije: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Ručno particioniranje</strong><br/>Možete sami stvoriti ili promijeniti veličine particija. - + Reuse %1 as home partition for %2. Koristi %1 kao home particiju za %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Odaberite particiju za smanjivanje, te povlačenjem donjeg pokazivača odaberite promjenu veličine</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 će se smanjiti na %2MB i stvorit će se nova %3MB particija za %4. - + Boot loader location: Lokacija boot učitavača: - + <strong>Select a partition to install on</strong> <strong>Odaberite particiju za instalaciju</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. EFI particija ne postoji na ovom sustavu. Vratite se natrag i koristite ručno particioniranje da bi ste postavili %1. - + The EFI system partition at %1 will be used for starting %2. EFI particija na %1 će se koristiti za pokretanje %2. - + EFI system partition: EFI particija: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Izgleda da na ovom disku nema operacijskog sustava. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Obriši disk</strong><br/>To će <font color="red">obrisati</font> sve podatke na odabranom disku. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instaliraj uz postojeće</strong><br/>Instalacijski program će smanjiti particiju da bi napravio mjesto za %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Zamijeni particiju</strong><br/>Zamijenjuje particiju sa %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Ovaj disk ima %1. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Ovaj disk već ima operacijski sustav. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Ovaj disk ima više operacijskih sustava. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Ovaj uređaj za pohranu već ima operativni sustav, ali njegova particijska tablica <strong>%1</strong> razlikuje se od potrebne <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Ovaj uređaj za pohranu ima <strong>montiranu</strong> jednu od particija. - + This storage device is a part of an <strong>inactive RAID</strong> device. Ovaj uređaj za pohranu je dio <strong>neaktivnog RAID</strong> uređaja. - + No Swap Bez swap-a - + Reuse Swap Iskoristi postojeći swap - + Swap (no Hibernate) Swap (bez hibernacije) - + Swap (with Hibernate) Swap (sa hibernacijom) - + Swap to file Swap datoteka @@ -764,27 +783,27 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. Config - + Set keyboard model to %1.<br/> Postavi model tipkovnice na %1.<br/> - + Set keyboard layout to %1/%2. Postavi raspored tipkovnice na %1%2. - + Set timezone to %1/%2. Postavi vremesku zonu na %1%2. - + The system language will be set to %1. Jezik sustava će se postaviti na %1. - + The numbers and dates locale will be set to %1. Regionalne postavke brojeva i datuma će se postaviti na %1. @@ -819,97 +838,97 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Mrežna instalacija. (Onemogućeno: Ne mogu dohvatiti listu paketa, provjerite da li ste spojeni na mrežu) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Ovo računalo ne zadovoljava minimalne zahtjeve za instalaciju %1.<br/>Instalacija se ne može nastaviti.<a href="#details">Detalji...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Ovo računalo ne zadovoljava minimalne uvijete za instalaciju %1.<br/>Instalacija se ne može nastaviti.<a href="#details">Detalji...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Računalo ne zadovoljava neke od preporučenih uvjeta za instalaciju %1.<br/>Instalacija se može nastaviti, ali neke značajke možda neće biti dostupne. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Računalo ne zadovoljava neke od preporučenih uvjeta za instalaciju %1.<br/>Instalacija se može nastaviti, ali neke značajke možda neće biti dostupne. - + This program will ask you some questions and set up %2 on your computer. Ovaj program će vam postaviti neka pitanja i instalirati %2 na vaše računalo. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Dobrodošli u Calamares instalacijski program za %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Dobrodošli u %1 instalacijski program</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Dobrodošli u Calamares instalacijski program za %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Dobrodošli u %1 instalacijski program</h1> - + Your username is too long. Vaše korisničko ime je predugačko. - + '%1' is not allowed as username. '%1' nije dopušteno kao korisničko ime. - + Your username must start with a lowercase letter or underscore. Vaše korisničko ime mora započeti malim slovom ili donjom crtom. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Dopuštena su samo mala slova, brojevi, donja crta i crtica. - + Your hostname is too short. Ime računala je kratko. - + Your hostname is too long. Ime računala je predugačko. - + '%1' is not allowed as hostname. '%1' nije dopušteno kao ime računala. - + Only letters, numbers, underscore and hyphen are allowed. Dopuštena su samo slova, brojevi, donja crta i crtica. - + Your passwords do not match! Lozinke se ne podudaraju! - + OK! OK! @@ -965,11 +984,16 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. + Packages + Paketi + + + Install option: <strong>%1</strong> Opcija instalacije: <strong>%1</strong> - + None Nijedan @@ -1428,6 +1452,16 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.FS Label: Oznaka datotečnog sustava: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1457,8 +1491,8 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Potvrdi lozinku - - + + Please enter the same passphrase in both boxes. Molimo unesite istu lozinku u oba polja. @@ -1547,32 +1581,32 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.&Ponovno pokreni sada - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Gotovo.</h1><br/>%1 je instaliran na vaše računalo.<br/>Sada možete koristiti vaš novi sustav. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Kada je odabrana ova opcija, vaš sustav će se ponovno pokrenuti kada kliknete na <span style="font-style:italic;">Gotovo</span> ili zatvorite instalacijski program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Gotovo.</h1><br/>%1 je instaliran na vaše računalo.<br/>Sada možete ponovno pokrenuti računalo ili nastaviti sa korištenjem %2 live okruženja. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Kada je odabrana ova opcija, vaš sustav će se ponovno pokrenuti kada kliknete na <span style="font-style:italic;">Gotovo</span> ili zatvorite instalacijski program.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Instalacija nije uspijela</h1><br/>%1 nije instaliran na vaše računalo.<br/>Greška: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalacija nije uspijela</h1><br/>%1 nije instaliran na vaše računalo.<br/>Greška: %2. @@ -1606,12 +1640,18 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Formatiraj <strong>%3MB</strong>particiju <strong>%1</strong> na datotečni sustav <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formatiraj particiju %1 na datotečni sustav %2. - + The installer failed to format partition %1 on disk '%2'. Instalacijski program nije uspio formatirati particiju %1 na disku '%2'. @@ -1619,12 +1659,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. GeneralRequirements - + has at least %1 GiB available drive space ima barem %1 GB dostupne slobodne memorije na disku - + There is not enough drive space. At least %1 GiB is required. Nema dovoljno prostora na disku. Potrebno je najmanje %1 GB. @@ -1664,27 +1704,27 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.pokreće instalacijski program kao administrator (root) - + The setup program is not running with administrator rights. Instalacijski program nije pokrenut sa administratorskim dozvolama. - + The installer is not running with administrator rights. Instalacijski program nije pokrenut sa administratorskim dozvolama. - + has a screen large enough to show the whole installer ima zaslon dovoljno velik da može prikazati cijeli instalacijski program - + The screen is too small to display the setup program. Zaslon je premalen za prikaz instalacijskog programa. - + The screen is too small to display the installer. Zaslon je premalen za prikaz instalacijskog programa. @@ -1984,35 +2024,35 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. LuksBootKeyFileJob - + Configuring LUKS key file. Konfiguriranje LUKS ključne datoteke. - - + + No partitions are defined. Nema definiranih particija. - - - + + + Encrypted rootfs setup error Pogreška postavljanja šifriranog rootfs-a - + Root partition %1 is LUKS but no passphrase has been set. Root particija %1 je LUKS, ali nije postavljena zaporka. - + Could not create LUKS key file for root partition %1. Nije moguće kreirati LUKS ključnu datoteku za root particiju %1. - + Could not configure LUKS key file on partition %1. Nije moguće konfigurirati datoteku LUKS ključevima na particiji %1. @@ -2038,12 +2078,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. Map - + Timezone: %1 Vremenska zona: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2055,100 +2095,112 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje. NetInstallViewStep - + Package selection Odabir paketa - + Office software Uredski softver - + Office package Uredski paket - + Browser software Preglednici - + Browser package Paket preglednika - + Web browser Web preglednik - + Kernel + label for netinstall module, Linux kernel Kernel - + Services + label for netinstall module, system services Servisi - + Login + label for netinstall module, choose login manager Prijava - + Desktop + label for netinstall module, choose desktop environment Radna površina - - Applications - Aplikacije - - - + Communication + label for netinstall module Komunikacija - + Development + label for netinstall module Razvoj - + Office + label for netinstall module Ured - + Multimedia + label for netinstall module Multimedija - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Izgled - + Gaming + label for netinstall module Igranje - + Utilities + label for netinstall module Alati + + + Applications + Aplikacije + NotesQmlViewStep @@ -2197,24 +2249,24 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje. Odaberite željenu regiju ili upotrijebite zadane postavke. - - - + + + Timezone: %1 Vremenska zona: %1 - + Select your preferred Zone within your Region. Odaberite željenu zonu unutar svoje regije. - + Zones Zone - + You can fine-tune Language and Locale settings below. Dolje možete fino prilagoditi postavke jezika i regionalne postavke. @@ -2498,7 +2550,7 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje. Nepoznata greška - + Password is empty Lozinka je prazna @@ -2536,22 +2588,6 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje. Molimo odaberite proizvod s popisa. Izabrani proizvod će biti instaliran. - - PackageChooserQmlViewStep - - - Packages - Paketi - - - - PackageChooserViewStep - - - Packages - Paketi - - PackageModel @@ -3080,7 +3116,7 @@ Izlaz: QObject - + %1 (%2) %1 (%2) @@ -3406,12 +3442,12 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene ResultsListDialog - + For best results, please ensure that this computer: Za najbolje rezultate, pobrinite se da ovo računalo: - + System requirements Zahtjevi sustava @@ -3839,22 +3875,22 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Klikni ovdje za više informacija o korisničkoj povratnoj informaciji</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Praćenje pomaže %1 vidjeti koliko često se instalira, na kojem je hardveru instaliran i koje se aplikacije koriste. Da biste vidjeli što će biti poslano, kliknite ikonu pomoći pored svakog područja. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Odabirom ove opcije poslat ćete podatke o svojoj instalaciji i hardveru. Ove će informacije biti poslane <b>samo jednom</b> nakon završetka instalacije. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Odabirom ove opcije periodično ćete slati podatke o instalaciji vašeg <b>računala</b>, hardveru i aplikacijama na %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Odabirom ove opcije redovito ćete slati podatke o vašoj <b>korisničkoj</b> instalaciji, hardveru, aplikacijama i obrascima upotrebe aplikacija na %1. @@ -4042,44 +4078,19 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Dobrodošli u Calamares instalacijski program za %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Dobrodošli u %1 instalacijski program.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - Dobrodošli u Calamares instalacijski program za %1. - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Dobrodošli u %1 instalacijski program.</h1> - - - %1 support %1 podrška - + About %1 setup O %1 instalacijskom programu - + About %1 installer O %1 instalacijskom programu - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>za %3</strong><br/><br/>Autorska prava 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Autorska prava 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> Hvala <a href="https://calamares.io/team/">Calamares timu</a> i <a href="https://www.transifex.com/calamares/calamares/">Calamares timu za prevođenje</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> sponzorira <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4144,34 +4155,7 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> -<strong>%2<br/> -za %3</strong><br/><br/> -Autorska prava 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> -Autorska prava 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> -Hvala <a href='https://calamares.io/team/'>Calamares timu</a> -i <a href='https://www.transifex.com/calamares/calamares/'>Calamares -timu za prevođenje</a>.<br/><br/> -<a href='https://calamares.io/'>Calamares</a> -sponzorira <br/> -<a href='http://www.blue-systems.com/'>Blue Systems</a> - -Liberating Software. - - - + Back Natrag @@ -4276,17 +4260,17 @@ Postavke regije utječu na format brojeva i datuma. Trenutne postavke su <str Tip tipkovnice: - + Layouts Rasporedi - + Type here to test your keyboard Ovdje testiraj tipkovnicu - + Variants Varijante @@ -4434,102 +4418,102 @@ Postavke regije utječu na format brojeva i datuma. Trenutne postavke su <str Ako će više korisnika koristiti ovo računalo, nakon instalacije možete otvoriti više računa. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Dopuštena su samo mala slova, brojevi, donja crta i crtica. - + root is not allowed as username. root nije dozvoljeno korisničko ime. - + What is the name of this computer? Koje je ime ovog računala? - + Computer Name Ime računala - + This name will be used if you make the computer visible to others on a network. Ovo će se ime upotrebljavati ako računalo učinite vidljivim drugima na mreži. - + localhost is not allowed as hostname. localhost nije dozvoljeno ime računala. - + Choose a password to keep your account safe. Odaberite lozinku da bi račun bio siguran. - + Password Lozinka - + Repeat Password Ponovite lozinku - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Dvaput unesite istu lozinku kako biste je mogli provjeriti ima li pogrešaka u tipkanju. Dobra lozinka sadržavat će mješavinu slova, brojeva i interpunkcije, treba imati najmanje osam znakova i treba je mijenjati u redovitim intervalima. - + Validate passwords quality Provjerite kvalitetu lozinki - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Kad je ovaj okvir potvrđen, bit će napravljena provjera jakosti lozinke te nećete moći koristiti slabu lozinku. - + Log in automatically without asking for the password Automatska prijava bez traženja lozinke - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Dopuštena su samo slova, brojevi, donja crta i crtica i to kao najmanje dva znaka - + Reuse user password as root password Upotrijebite lozinku korisnika kao root lozinku - + Use the same password for the administrator account. Koristi istu lozinku za administratorski račun. - + Choose a root password to keep your account safe. Odaberite root lozinku da biste zaštitili svoj račun. - + Root Password Root lozinka - + Repeat Root Password Ponovite root lozinku - + Enter the same password twice, so that it can be checked for typing errors. Dvaput unesite istu lozinku kako biste mogli provjeriti ima li pogrešaka u tipkanju. diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts index f3ba3e1ef..833b47e04 100644 --- a/lang/calamares_hu.ts +++ b/lang/calamares_hu.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Modul- fa - + Debug information Hibakeresési információk @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Kész @@ -261,7 +280,7 @@ Követelmények ellenőrzése a <i>%1</i>modulhoz kész. - + Waiting for %n module(s). Várakozás a %n modulokra. @@ -269,7 +288,7 @@ - + (%n second(s)) (%n másodperc) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. Rendszerkövetelmények ellenőrzése kész. @@ -484,12 +503,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. CalamaresWindow - + %1 Setup Program %1 Program telepítése - + %1 Installer %1 Telepítő @@ -528,149 +547,149 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. Adatlap - + Select storage de&vice: Válassz tároló eszközt: - - - - + + + + Current: Aktuális: - + After: Utána: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Manuális partícionálás</strong><br/>Létrehozhat vagy átméretezhet partíciókat. - + Reuse %1 as home partition for %2. %1 partíció használata mint home partíció a %2 -n - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Válaszd ki a partíciót amit zsugorítani akarsz és egérrel méretezd át.</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 zsugorítva lesz %2MiB -re és új %3MiB partíció lesz létrehozva itt %4. - + Boot loader location: Rendszerbetöltő helye: - + <strong>Select a partition to install on</strong> <strong>Válaszd ki a telepítésre szánt partíciót </strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Nem található EFI partíció a rendszeren. Menj vissza a manuális partícionáláshoz és állíts be %1. - + The EFI system partition at %1 will be used for starting %2. A %1 EFI rendszer partíció lesz használva %2 indításához. - + EFI system partition: EFI rendszerpartíció: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Úgy tűnik ezen a tárolóeszközön nincs operációs rendszer. Mit szeretnél csinálni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Lemez törlése</strong><br/>Ez <font color="red">törölni</font> fogja a lemezen levő összes adatot. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Meglévő mellé telepíteni</strong><br/>A telepítő zsugorítani fogja a partíciót, hogy elférjen a %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>A partíció lecserélése</strong> a következővel: %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Ezen a tárolóeszközön %1 található. Mit szeretnél tenni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Ez a tárolóeszköz már tartalmaz egy operációs rendszert. Mit szeretnél tenni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. A tárolóeszközön több operációs rendszer található. Mit szeretnél tenni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap Swap nélkül - + Reuse Swap Swap újrahasználata - + Swap (no Hibernate) Swap (nincs hibernálás) - + Swap (with Hibernate) Swap (hibernálással) - + Swap to file Swap fájlba @@ -758,27 +777,27 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. Config - + Set keyboard model to %1.<br/> Billentyűzet típus beállítása %1.<br/> - + Set keyboard layout to %1/%2. Billentyűzet kiosztás beállítása %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. A rendszer területi beállítása %1. - + The numbers and dates locale will be set to %1. A számok és dátumok területi beállítása %1. @@ -813,98 +832,98 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. Hálózati telepítés. (Kikapcsolva: A csomagokat nem lehet letölteni, ellenőrizd a hálózati kapcsolatot) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Ez a számítógép nem felel meg a minimum követelményeknek a %1 telepítéséhez. <br/>A telepítés nem folytatható. <a href="#details">Részletek...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Ez a számítógép nem felel meg a minimum követelményeknek a %1 telepítéséhez.<br/> Telepítés nem folytatható. <a href="#details">Részletek...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Ez a számítógép nem felel meg néhány követelménynek a %1 telepítéséhez. <br/>A telepítés folytatható de előfordulhat néhány képesség nem lesz elérhető. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Ez a számítógép nem felel meg a minimum követelményeknek a %1 telepítéséhez.<br/>Telepítés folytatható de néhány tulajdonság valószínűleg nem lesz elérhető. - + This program will ask you some questions and set up %2 on your computer. Ez a program fel fog tenni néhány kérdést és %2 -t telepíti a számítógépre. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. A felhasználónév túl hosszú. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. A hálózati név túl rövid. - + Your hostname is too long. A hálózati név túl hosszú. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! A két jelszó nem egyezik! - + OK! @@ -960,11 +979,16 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1423,6 +1447,16 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1452,8 +1486,8 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Jelszó megerősítés - - + + Please enter the same passphrase in both boxes. Írd be ugyanazt a jelmondatot mindkét dobozban. @@ -1542,32 +1576,32 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Új&raindítás most - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Minden kész.</h1><br/>%1 telepítve lett a számítógépére. <br/>Most már használhatja az új rendszert. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Ezt bejelölve a rendszer újra fog indulni amikor a <span style="font-style:italic;">Kész</span> gombra kattint vagy bezárja a telepítőt.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Sikeres művelet.</h1><br/>%1 telepítve lett a számítógépére.<br/>Újraindítás után folytathatod az %2 éles környezetben. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Ezt bejelölve a rendszer újra fog indulni amikor a <span style="font-style:italic;">Kész</span>gombra kattint vagy bezárja a telepítőt.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Telepítés nem sikerült</h1><br/>%1 nem lett telepítve a számítógépére. <br/>A hibaüzenet: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>A telepítés hibába ütközött.</h1><br/>%1 nem lett telepítve a számítógépre.<br/>A hibaüzenet: %2. @@ -1601,12 +1635,18 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a><strong>%3MiB</strong> <strong>%1</strong> partíció formázása <strong>%2</strong> fájlrendszerrel. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. %1 partíció formázása %2 fájlrendszerrel. - + The installer failed to format partition %1 on disk '%2'. A telepítő nem tudta formázni a %1 partíciót a %2 lemezen. @@ -1614,12 +1654,12 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> GeneralRequirements - + has at least %1 GiB available drive space legalább %1 GiB lemezterület elérhető - + There is not enough drive space. At least %1 GiB is required. Nincs elég lemezterület. Legalább %1 GiB szükséges. @@ -1659,27 +1699,27 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> - + The setup program is not running with administrator rights. A telepítő program nem adminisztrátori joggal fut. - + The installer is not running with administrator rights. A telepítő nem adminisztrátori jogokkal fut. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. A képernyő mérete túl kicsi a telepítő program megjelenítéséhez. - + The screen is too small to display the installer. A képernyőméret túl kicsi a telepítő megjelenítéséhez. @@ -1979,35 +2019,35 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> LuksBootKeyFileJob - + Configuring LUKS key file. LUKS kulcs fájl konfigurálása. - - + + No partitions are defined. Nincsenek partíciók definiálva. - - - + + + Encrypted rootfs setup error Titkosított rootfs telepítési hiba - + Root partition %1 is LUKS but no passphrase has been set. A %1 root partíció LUKS de beállítva nincs kulcs. - + Could not create LUKS key file for root partition %1. Nem sikerült létrehozni a LUKS kulcs fájlt a %1 root partícióhoz - + Could not configure LUKS key file on partition %1. @@ -2033,12 +2073,12 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2048,100 +2088,112 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> NetInstallViewStep - + Package selection Csomag választása - + Office software - + Office package - + Browser software - + Browser package - + Web browser Böngésző - + Kernel + label for netinstall module, Linux kernel Kernel - + Services + label for netinstall module, system services Szolgáltatások - + Login + label for netinstall module, choose login manager Bejelentkezés - + Desktop + label for netinstall module, choose desktop environment Asztal - - - Applications - Alkalmazások - - - - Communication - - - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module - Utilities + Gaming + label for netinstall module + + + Utilities + label for netinstall module + + + + + Applications + Alkalmazások + NotesQmlViewStep @@ -2190,24 +2242,24 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2482,7 +2534,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Ismeretlen hiba - + Password is empty @@ -2520,22 +2572,6 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3064,7 +3100,7 @@ Kimenet: QObject - + %1 (%2) %1 (%2) @@ -3387,12 +3423,12 @@ Kimenet: ResultsListDialog - + For best results, please ensure that this computer: A legjobb eredményért győződjünk meg, hogy ez a számítógép: - + System requirements Rendszer követelmények @@ -3821,22 +3857,22 @@ Calamares hiba %1. <html><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;"> Kattints ide bővebb információért a felhasználói visszajelzésről </span></a></p></body><head/></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4024,44 +4060,19 @@ Calamares hiba %1. - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Üdvözli önt a Calamares telepítő itt %1!</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Köszöntjük a %1 telepítőben!</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Üdvözlet a Calamares %1 telepítőjében.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Üdvözlet a %1 telepítőben.</h1> - - - %1 support %1 támogatás - + About %1 setup A %1 telepítőről. - + About %1 installer A %1 telepítőről - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4126,23 +4137,7 @@ Calamares hiba %1. about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4242,17 +4237,17 @@ Calamares hiba %1. Billentyűzet modell: - + Layouts - + Type here to test your keyboard Gépelj itt a billentyűzet teszteléséhez - + Variants @@ -4379,102 +4374,102 @@ Calamares hiba %1. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? Mi legyen a számítógép neve? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Adj meg jelszót a felhasználói fiókod védelmére. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. Ugyanaz a jelszó használata az adminisztrátor felhasználóhoz. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index dd45e866f..0deba5826 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information Informasi debug @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Selesai @@ -261,21 +280,21 @@ - + Waiting for %n module(s). Menunggu %n modul(). - + (%n second(s)) (%n detik()) - + System-requirements checking is complete. Pengecekan kebutuhan sistem telah selesai. @@ -481,12 +500,12 @@ Instalasi akan ditutup dan semua perubahan akan hilang. CalamaresWindow - + %1 Setup Program - + %1 Installer Installer %1 @@ -525,149 +544,149 @@ Instalasi akan ditutup dan semua perubahan akan hilang. Isian - + Select storage de&vice: Pilih perangkat penyimpanan: - - - - + + + + Current: Saat ini: - + After: Setelah: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Pemartisian manual</strong><br/>Anda bisa membuat atau mengubah ukuran partisi. - + Reuse %1 as home partition for %2. Gunakan kembali %1 sebagai partisi home untuk %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Pilih sebuah partisi untuk diiris, kemudian seret bilah di bawah untuk mengubah ukuran</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Lokasi Boot loader: - + <strong>Select a partition to install on</strong> <strong>Pilih sebuah partisi untuk memasang</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Sebuah partisi sistem EFI tidak ditemukan pada sistem ini. Silakan kembali dan gunakan pemartisian manual untuk mengeset %1. - + The EFI system partition at %1 will be used for starting %2. Partisi sistem EFI di %1 akan digunakan untuk memulai %2. - + EFI system partition: Partisi sistem EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Tampaknya media penyimpanan ini tidak mengandung sistem operasi. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Hapus disk</strong><br/>Aksi ini akan <font color="red">menghapus</font> semua berkas yang ada pada media penyimpanan terpilih. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instal berdampingan dengan</strong><br/>Installer akan mengiris sebuah partisi untuk memberi ruang bagi %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Ganti sebuah partisi</strong><br/> Ganti partisi dengan %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Media penyimpanan ini mengandung %1. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Media penyimpanan ini telah mengandung sistem operasi. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Media penyimpanan ini telah mengandung beberapa sistem operasi. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Perngkat penyimpanan ini sudah terdapat sistem operasi, tetapi tabel partisi <strong>%1</strong>berbeda dari yang dibutuhkan <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Perangkat penyimpanan ini terdapat partisi yang <strong>terpasang</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Perangkat penyimpanan ini merupakan bagian dari sebuah <strong>perangkat RAID yang tidak aktif</strong>. - + No Swap Tidak pakai SWAP - + Reuse Swap Gunakan kembali SWAP - + Swap (no Hibernate) Swap (tanpa hibernasi) - + Swap (with Hibernate) Swap (dengan hibernasi) - + Swap to file Swap ke file @@ -755,27 +774,27 @@ Instalasi akan ditutup dan semua perubahan akan hilang. Config - + Set keyboard model to %1.<br/> Setel model papan ketik ke %1.<br/> - + Set keyboard layout to %1/%2. Setel tata letak papan ketik ke %1/%2. - + Set timezone to %1/%2. Terapkan zona waktu ke %1/%2 - + The system language will be set to %1. Bahasa sistem akan disetel ke %1. - + The numbers and dates locale will be set to %1. Nomor dan tanggal lokal akan disetel ke %1. @@ -810,98 +829,98 @@ Instalasi akan ditutup dan semua perubahan akan hilang. Instalasi Jaringan. (Dinonfungsikan: Tak mampu menarik daftar paket, periksa sambungan jaringanmu) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Komputer ini tidak memenuhi syarat minimum untuk memasang %1.<br/>Instalasi tidak dapat dilanjutkan. <a href="#details">Lebih rinci...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Komputer ini tidak memenuhi beberapa syarat yang dianjurkan untuk memasang %1. Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. - + This program will ask you some questions and set up %2 on your computer. Program ini akan mengajukan beberapa pertanyaan dan menyetel %2 pada komputer Anda. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Selamat datang ke program Calamares untuk %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. Nama pengguna Anda terlalu panjang. - + '%1' is not allowed as username. '%1' tidak diperbolehkan sebagai nama pengguna. - + Your username must start with a lowercase letter or underscore. Nama penggunamu harus diawali dengan huruf kecil atau garis bawah. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Hostname Anda terlalu pendek. - + Your hostname is too long. Hostname Anda terlalu panjang. - + '%1' is not allowed as hostname. '%1' tidak diperbolehkan sebagai hostname. - + Only letters, numbers, underscore and hyphen are allowed. Hanya huruf, angka, garis bawah, dan tanda penghubung yang diperbolehkan. - + Your passwords do not match! Sandi Anda tidak sama! - + OK! @@ -957,11 +976,16 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1420,6 +1444,16 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.FS Label: Label FS: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1449,8 +1483,8 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Konfirmasi kata sandi - - + + Please enter the same passphrase in both boxes. Silakan masukkan kata sandi yang sama di kedua kotak. @@ -1539,32 +1573,32 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Mulai ulang seka&rang - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Selesai.</h1><br>%1 sudah terinstal di komputer Anda.<br/>Anda dapat memulai ulang ke sistem baru atau lanjut menggunakan lingkungan Live %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalasi Gagal</h1><br/>%1 tidak bisa diinstal pada komputermu.<br/>Pesan galatnya adalah: %2. @@ -1598,12 +1632,18 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Memformat partisi %1 dengan sistem berkas %2. - + The installer failed to format partition %1 on disk '%2'. Installer gagal memformat partisi %1 pada disk '%2'.'%2'. @@ -1611,12 +1651,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1656,27 +1696,27 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.menjalankan installer sebagai administrator (root) - + The setup program is not running with administrator rights. Installer tidak dijalankan dengan kewenangan administrator. - + The installer is not running with administrator rights. Installer tidak dijalankan dengan kewenangan administrator. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Layar terlalu kecil untuk menampilkan installer. @@ -1976,35 +2016,35 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. LuksBootKeyFileJob - + Configuring LUKS key file. Mengkonfigurasi file kunci LUKS - - + + No partitions are defined. Tidak ada partisi yang didefinisikan. - - - + + + Encrypted rootfs setup error Kesalahan penyiapan rootfs yang terenkripsi - + Root partition %1 is LUKS but no passphrase has been set. Partisi root %1 merupakan LUKS tetapi frasa sandi tidak ditetapkan - + Could not create LUKS key file for root partition %1. Tidak dapat membuat file kunci LUKS untuk partisi root %1 - + Could not configure LUKS key file on partition %1. Tidak dapat mengkonfigurasi file kunci LUKS pada partisi %1 @@ -2030,12 +2070,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Map - + Timezone: %1 Zona Waktu: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2045,100 +2085,112 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. NetInstallViewStep - + Package selection Pemilihan paket - + Office software Perangkat lunak perkantoran - + Office package Paket perkantoran - + Browser software Perangkat lunak peramban - + Browser package Paket peramban - + Web browser Peramban web - + Kernel + label for netinstall module, Linux kernel Kernel - + Services + label for netinstall module, system services Servis - + Login + label for netinstall module, choose login manager Masuk - + Desktop + label for netinstall module, choose desktop environment Desktop - - Applications - Aplikasi - - - + Communication + label for netinstall module Komunikasi - + Development + label for netinstall module Pengembangan - - - Office - - - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module - Utilities + Gaming + label for netinstall module + + + Utilities + label for netinstall module + + + + + Applications + Aplikasi + NotesQmlViewStep @@ -2187,24 +2239,24 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. - - - + + + Timezone: %1 Zona Waktu: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2470,7 +2522,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Ada kesalahan yang tidak diketahui - + Password is empty @@ -2508,22 +2560,6 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3052,7 +3088,7 @@ Keluaran: QObject - + %1 (%2) %1 (%2) @@ -3375,12 +3411,12 @@ Keluaran: ResultsListDialog - + For best results, please ensure that this computer: Untuk hasil terbaik, mohon pastikan bahwa komputer ini: - + System requirements Kebutuhan sistem @@ -3808,22 +3844,22 @@ Keluaran: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Klik disini untuk informasi lebih lanjut tentang umpan balik pengguna </span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4011,44 +4047,19 @@ Keluaran: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Selamat datang di Calamares installer untuk %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Selamat datang di installer %1.</h1> - - - %1 support Dukungan %1 - + About %1 setup - + About %1 installer Tentang installer %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Hak cipta 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Hak cipta 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Terimakasih kepada <a href="https://calamares.io/team/">Tim Calamares</a>dan <a href="https://www.transifex.com/calamares/calamares/">Tim penerjemah Calamares </a>.<br/><br/><a href="https://calamares.io/">Calamares</a>pengembangan disponsori oleh <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4113,34 +4124,7 @@ Keluaran: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Hak cipta 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Hak cipta 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Terimakasih kepada <a href='https://calamares.io/team/'>Tim Calamares</a> - dan <a href='https://www.transifex.com/calamares/calamares/'>Tim penerjemah - Calamares</a><br/><br/> - <a href='https://calamares.io/'>Calamares</a> - pengembangan disponsori oleh<br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a>- - Liberating Software. - - - + Back @@ -4240,17 +4224,17 @@ Keluaran: Model Papan Ketik: - + Layouts - + Type here to test your keyboard Ketik di sini untuk mencoba papan ketik Anda - + Variants @@ -4377,102 +4361,102 @@ Keluaran: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. root tidak boleh digunakan sebagai nama pengguna. - + What is the name of this computer? Apakah nama dari komputer ini? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Pilih sebuah kata sandi untuk menjaga keamanan akun Anda. - + Password - + Repeat Password Ulangi Kata Sandi - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality Validasi kualitas kata sandi - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Ketikan kotak ini dicentang, pengecekan kekuatan kata sandi akan dilakukan dan anda tidak akan dapat menggunakan kata sandi yang lemah. - + Log in automatically without asking for the password Masuk ke dalam sesi secara otomatis tanpa menanyakan kata sandi - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Hanya huruf, angka, garis bawah, dan tanda hubung yang diperbolehkan, minimal dua karakter. - + Reuse user password as root password Gunakan kata sandi pengguna sebagai kata sandi root - + Use the same password for the administrator account. Gunakan sandi yang sama untuk akun administrator. - + Choose a root password to keep your account safe. - + Root Password Kata Sandi Root - + Repeat Root Password Ulangi Kata Sandi - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ie.ts b/lang/calamares_ie.ts index 90f623268..161f152d7 100644 --- a/lang/calamares_ie.ts +++ b/lang/calamares_ie.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Finit @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -482,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Configiration de %1 - + %1 Installer Installator de %1 @@ -526,149 +545,149 @@ The installer will quit and all changes will be lost. Redimensionar un gruppe de tomes - + Select storage de&vice: - - - - + + + + Current: Actual: - + After: Pos: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Localisation del bootloader: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: Partition de sistema EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap Sin swap - + Reuse Swap Reusar un swap - + Swap (no Hibernate) Swap (sin hivernation) - + Swap (with Hibernate) Swap (con hivernation) - + Swap to file Swap in un file @@ -756,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -811,97 +830,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Benevenit al configurator Calamares por %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Benevenit al configurator de %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Benevenit al installator Calamares por %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Benevenit al installator de %1</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -957,11 +976,16 @@ The installer will quit and all changes will be lost. + Packages + Paccages + + + Install option: <strong>%1</strong> - + None @@ -1420,6 +1444,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1449,8 +1483,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1539,32 +1573,32 @@ The installer will quit and all changes will be lost. &Reiniciar nu - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1598,12 +1632,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1611,12 +1651,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1656,27 +1696,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1976,35 +2016,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. Null partition es definit. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2030,12 +2070,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 Zone horari: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2045,100 +2085,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection Selection de paccages - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel + label for netinstall module, Linux kernel Nucleo - + Services + label for netinstall module, system services Servicios - - - Login - - - Desktop + Login + label for netinstall module, choose login manager - Applications - Applicationes - - - - Communication - Communication + Desktop + label for netinstall module, choose desktop environment + - Development - + Communication + label for netinstall module + Communication - Office - Officie - - - - Multimedia + Development + label for netinstall module + + + Office + label for netinstall module + Officie + - Internet + Multimedia + label for netinstall module - Theming - Temas + Internet + label for netinstall module + - Gaming - Ludes + Theming + label for netinstall module + Temas + Gaming + label for netinstall module + Ludes + + + Utilities + label for netinstall module Utensiles + + + Applications + Applicationes + NotesQmlViewStep @@ -2187,24 +2239,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 Zone horari: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2479,7 +2531,7 @@ The installer will quit and all changes will be lost. Ínconosset errore - + Password is empty Li contrasigne es vacui @@ -2517,22 +2569,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - Paccages - - - - PackageChooserViewStep - - - Packages - Paccages - - PackageModel @@ -3058,7 +3094,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3381,12 +3417,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3814,22 +3850,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4017,44 +4053,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Benevenit al configurator Calamares por %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Benevenit al configurator de %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Benevenit al installator Calamares por %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Benevenit al installator de %1.</h1> - - - %1 support Suporte de %1 - + About %1 setup Pri li configurator de %1 - + About %1 installer Pri li installator de %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>por %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Mersí al <a href="https://calamares.io/team/">equip de Calamares</a> e li <a href="https://www.transifex.com/calamares/calamares/">equip de traduction de Calamares</a>.<br/><br/>Developation de <a href="https://calamares.io/">Calamares</a> es suportet de <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - «Liberating Software». - WelcomeQmlViewStep @@ -4119,23 +4130,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back Retro @@ -4235,17 +4230,17 @@ Output: Modelle de tastatura: - + Layouts Arangeamentes - + Type here to test your keyboard Tippa ti-ci por provar vor tastatura - + Variants Variantes @@ -4372,102 +4367,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts index 8d0947c4b..1686617a9 100644 --- a/lang/calamares_is.ts +++ b/lang/calamares_is.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Greinar viðmótshluta - + Debug information Villuleitarupplýsingar @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Búið @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -483,12 +502,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 uppsetningarforrit @@ -527,149 +546,149 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Eyðublað - + Select storage de&vice: Veldu geymslu tæ&ki: - - - - + + + + Current: Núverandi: - + After: Eftir: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Handvirk disksneiðing</strong><br/>Þú getur búið til eða breytt stærð disksneiða sjálft. - + Reuse %1 as home partition for %2. Endurnota %1 sem heimasvæðis disksneið fyrir %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Veldu disksneið til að minnka, dragðu síðan botnstikuna til að breyta stærðinni</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Staðsetning ræsistjóra - + <strong>Select a partition to install on</strong> <strong>Veldu disksneið til að setja upp á </strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. EFI kerfisdisksneið er hvergi að finna á þessu kerfi. Farðu til baka og notaðu handvirka skiptingu til að setja upp %1. - + The EFI system partition at %1 will be used for starting %2. EFI kerfisdisksneið á %1 mun verða notuð til að ræsa %2. - + EFI system partition: EFI kerfisdisksneið: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Þetta geymslu tæki hefur mörg stýrikerfi á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Eyða disk</strong><br/>Þetta mun <font color="red">eyða</font> öllum gögnum á þessu valdna geymslu tæki. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Setja upp samhliða</strong><br/>Uppsetningarforritið mun minnka disksneið til að búa til pláss fyrir %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Skipta út disksneið</strong><br/>Skiptir disksneið út með %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Þetta geymslu tæki hefur %1 á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Þetta geymslu tæki hefur stýrikerfi á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Þetta geymslu tæki hefur mörg stýrikerfi á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -757,27 +776,27 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. Tungumál kerfisins verður sett sem %1. - + The numbers and dates locale will be set to %1. @@ -812,97 +831,97 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Þessi tölva uppfyllir ekki lágmarkskröfur um uppsetningu %1.<br/>Uppsetningin getur ekki haldið áfram. <a href="#details">Upplýsingar...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Þessi tölva uppfyllir ekki lágmarkskröfur um uppsetningu %1.<br/>Uppsetningin getur haldið áfram, en sumir eiginleikar gætu verið óvirk. - + This program will ask you some questions and set up %2 on your computer. Þetta forrit mun spyrja þig nokkurra spurninga og setja upp %2 á tölvunni þinni. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. Notandanafnið þitt er of langt. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Notandanafnið þitt er of stutt. - + Your hostname is too long. Notandanafnið þitt er of langt. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Lykilorð passa ekki! - + OK! @@ -958,11 +977,16 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. + Packages + Pakkar + + + Install option: <strong>%1</strong> - + None @@ -1421,6 +1445,16 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1450,8 +1484,8 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Staðfesta lykilorð - - + + Please enter the same passphrase in both boxes. Vinsamlegast sláðu inn sama lykilorðið í báða kassana. @@ -1540,32 +1574,32 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. &Endurræsa núna - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Allt klárt.</h1><br/>%1 hefur verið sett upp á tölvunni þinni.<br/>Þú getur nú endurræst í nýja kerfið, eða halda áfram að nota %2 Lifandi umhverfi. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1599,12 +1633,18 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Forsníða disksneið %1 með %2 skráakerfinu. - + The installer failed to format partition %1 on disk '%2'. Uppsetningarforritinu mistókst að forsníða disksneið %1 á diski '%2'. @@ -1612,12 +1652,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1657,27 +1697,27 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Uppsetningarforritið er ekki keyrandi með kerfisstjóraheimildum. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Skjárinn er of lítill til að birta uppsetningarforritið. @@ -1977,35 +2017,35 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2031,12 +2071,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2046,98 +2086,110 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. NetInstallViewStep - + Package selection Valdir pakkar - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2188,24 +2240,24 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2480,7 +2532,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Óþekkt villa - + Password is empty @@ -2518,22 +2570,6 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. - - PackageChooserQmlViewStep - - - Packages - Pakkar - - - - PackageChooserViewStep - - - Packages - Pakkar - - PackageModel @@ -3059,7 +3095,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3382,12 +3418,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: Fyrir bestu niðurstöður, skaltu tryggja að þessi tölva: - + System requirements Kerfiskröfur @@ -3815,22 +3851,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4018,44 +4054,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Velkomin til Calamares uppsetningarforritið fyrir %1</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Velkomin í %1 uppsetninguna.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Velkomin til Calamares uppsetningar fyrir %1</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Velkomin í %1 uppsetningarforritið.</h1> - - - %1 support %1 stuðningur - + About %1 setup Um %1 uppsetninguna - + About %1 installer Um %1 uppsetningarforrrit - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4120,23 +4131,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4236,17 +4231,17 @@ Output: Lyklaborðs tegund: - + Layouts - + Type here to test your keyboard Skrifaðu hér til að prófa lyklaborðið - + Variants @@ -4373,102 +4368,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? Hvað er nafnið á þessari tölvu? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Veldu lykilorð til að halda reikningnum þínum öruggum. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. Nota sama lykilorð fyrir kerfisstjóra reikning. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts index a9529e851..e6aa3f65c 100644 --- a/lang/calamares_it_IT.ts +++ b/lang/calamares_it_IT.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Albero dei Widget - + Debug information Informazioni di debug @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Fatto @@ -261,23 +280,25 @@ Il controllo dei requisiti per il modulo <i>%1</i> è completo. - + Waiting for %n module(s). In attesa del(i) modulo(i) %n. In attesa di %n modulo(i). + In attesa di %n modulo(i). - + (%n second(s)) (%n secondo) (%n secondo(i)) + (%n secondo(i)) - + System-requirements checking is complete. Il controllo dei requisiti di sistema è completo. @@ -483,12 +504,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse CalamaresWindow - + %1 Setup Program %1 Programma d'installazione - + %1 Installer %1 Programma di installazione @@ -527,149 +548,149 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Modulo - + Select storage de&vice: Selezionare un dispositivo di me&moria: - - - - + + + + Current: Corrente: - + After: Dopo: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Partizionamento manuale</strong><br/>Si possono creare o ridimensionare le partizioni manualmente. - + Reuse %1 as home partition for %2. Riutilizzare %1 come partizione home per &2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Selezionare una partizione da ridurre, trascina la barra inferiore per ridimensionare</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 sarà ridotta a %2MiB ed una nuova partizione di %3MiB sarà creata per %4 - + Boot loader location: Posizionamento del boot loader: - + <strong>Select a partition to install on</strong> <strong>Selezionare la partizione sulla quale si vuole installare</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Impossibile trovare una partizione EFI di sistema. Si prega di tornare indietro ed effettuare un partizionamento manuale per configurare %1. - + The EFI system partition at %1 will be used for starting %2. La partizione EFI di sistema su %1 sarà usata per avviare %2. - + EFI system partition: Partizione EFI di sistema: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Questo dispositivo di memoria non sembra contenere alcun sistema operativo. Come si vuole procedere?<br/>Si potranno comunque rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Cancellare disco</strong><br/>Questo <font color="red">cancellerà</font> tutti i dati attualmente presenti sul dispositivo di memoria. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Installare a fianco</strong><br/>Il programma di installazione ridurrà una partizione per dare spazio a %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Sostituire una partizione</strong><br/>Sostituisce una partizione con %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Questo dispositivo di memoria ha %1. Come si vuole procedere?<br/>Si potranno comunque rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Questo dispositivo di memoria contenere già un sistema operativo. Come si vuole procedere?<br/>Si potranno comunque rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Questo dispositivo di memoria contenere diversi sistemi operativi. Come si vuole procedere?<br/>Comunque si potranno rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap No Swap - + Reuse Swap Riutilizza Swap - + Swap (no Hibernate) Swap (senza ibernazione) - + Swap (with Hibernate) Swap (con ibernazione) - + Swap to file Swap su file @@ -757,27 +778,27 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Config - + Set keyboard model to %1.<br/> Impostare il modello di tastiera a %1.<br/> - + Set keyboard layout to %1/%2. Impostare il layout della tastiera a %1/%2. - + Set timezone to %1/%2. Imposta fuso orario a %1/%2. - + The system language will be set to %1. La lingua di sistema sarà impostata a %1. - + The numbers and dates locale will be set to %1. I numeri e le date locali saranno impostati a %1. @@ -812,97 +833,97 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Installazione di rete. (Disabilitata: impossibile recuperare le liste dei pacchetti, controllare la connessione di rete) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Questo computer non soddisfa i requisiti minimi per la configurazione di %1.<br/>La configurazione non può continuare. <a href="#details">Dettagli...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Questo computer non soddisfa i requisiti minimi per installare %1. <br/>L'installazione non può continuare. <a href="#details">Dettagli...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Questo computer non soddisfa alcuni requisiti raccomandati per la configurazione di %1.<br/>La configurazione può continuare ma alcune funzionalità potrebbero essere disabilitate. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Questo computer non soddisfa alcuni requisiti consigliati per l'installazione di %1.<br/>L'installazione può continuare ma alcune funzionalità potrebbero non essere disponibili. - + This program will ask you some questions and set up %2 on your computer. Questo programma chiederà alcune informazioni e configurerà %2 sul computer. - + <h1>Welcome to the Calamares setup program for %1</h1> Benvenuto nel programma di installazione Calamares di %1 - + <h1>Welcome to %1 setup</h1> Benvenuto nell'installazione di %1 - + <h1>Welcome to the Calamares installer for %1</h1> Benvenuto nel programma di installazione Calamares di %1 - + <h1>Welcome to the %1 installer</h1> Benvenuto nel programma di installazione di %1 - + Your username is too long. Il nome utente è troppo lungo. - + '%1' is not allowed as username. '%1' non è consentito come nome utente. - + Your username must start with a lowercase letter or underscore. Il tuo username deve iniziare con una lettera minuscola o un trattino basso. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Solo lettere minuscole, numeri, trattini e trattini bassi sono permessi. - + Your hostname is too short. Hostname è troppo corto. - + Your hostname is too long. Hostname è troppo lungo. - + '%1' is not allowed as hostname. '%1' non è consentito come nome host. - + Only letters, numbers, underscore and hyphen are allowed. Solo lettere, numeri, trattini e trattini bassi sono permessi. - + Your passwords do not match! Le password non corrispondono! - + OK! OK! @@ -958,11 +979,16 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse + Packages + Pacchetti + + + Install option: <strong>%1</strong> Opzione di installazione: <strong>%1</strong> - + None Nessuno @@ -1421,6 +1447,16 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse FS Label: Etichetta FS: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1450,8 +1486,8 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Confermare frase di accesso - - + + Please enter the same passphrase in both boxes. Si prega di immettere la stessa frase di accesso in entrambi i riquadri. @@ -1540,32 +1576,32 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse &Riavviare ora - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Tutto eseguito.</h1><br/>%1 è stato configurato sul tuo computer.<br/>Adesso puoi iniziare a utilizzare il tuo nuovo sistema. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Quando questa casella è selezionata, il tuo computer verrà riavviato immediatamente quando clicchi su <span style="font-style:italic;">Finito</span> oppure chiudi il programma di setup.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Tutto fatto.</ h1><br/>%1 è stato installato sul computer.<br/>Ora è possibile riavviare il sistema, o continuare a utilizzare l'ambiente Live di %2 . - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Quando questa casella è selezionata, il tuo sistema si riavvierà immediatamente quando clicchi su <span style="font-style:italic;">Fatto</span> o chiudi il programma di installazione.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Installazione fallita</h1><br/>%1 non è stato installato sul tuo computer.<br/>Il messaggio di errore è: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Installazione Fallita</h1><br/>%1 non è stato installato sul tuo computer.<br/>Il messaggio di errore è: %2 @@ -1599,12 +1635,18 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Formatta la partizione <strong>%1</strong> di dimensione <strong>%3MiB </strong> con il file system <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formattazione della partizione %1 con file system %2. - + The installer failed to format partition %1 on disk '%2'. Il programma di installazione non è riuscito a formattare la partizione %1 sul disco '%2'. @@ -1612,12 +1654,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse GeneralRequirements - + has at least %1 GiB available drive space ha almeno %1 GiB di spazio disponibile - + There is not enough drive space. At least %1 GiB is required. Non c'è abbastanza spazio sul disco. E' richiesto almeno %1 GiB @@ -1657,27 +1699,27 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse sta eseguendo il programma di installazione come amministratore (root) - + The setup program is not running with administrator rights. Il programma di installazione non è stato lanciato con i permessi di amministratore. - + The installer is not running with administrator rights. Il programma di installazione non è stato avviato con i diritti di amministrazione. - + has a screen large enough to show the whole installer ha uno schermo abbastanza grande da mostrare l'intero programma di installazione - + The screen is too small to display the setup program. Lo schermo è troppo piccolo per mostrare il programma di installazione - + The screen is too small to display the installer. Schermo troppo piccolo per mostrare il programma d'installazione. @@ -1977,35 +2019,35 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse LuksBootKeyFileJob - + Configuring LUKS key file. Configurazione in corso del file chiave LUKS. - - + + No partitions are defined. Non è stata specificata alcuna partizione. - - - + + + Encrypted rootfs setup error Errore nella configurazione del rootfs crittato - + Root partition %1 is LUKS but no passphrase has been set. La partizione root %1 è LUKS ma non sono state configurate passphrase. - + Could not create LUKS key file for root partition %1. Impossibile creare il file chiave LUKS per la partizione root %1. - + Could not configure LUKS key file on partition %1. Impossibile configurare il file chiave LUKS per la partizione %1. @@ -2031,12 +2073,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Map - + Timezone: %1 Fuso orario: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2046,100 +2088,112 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse NetInstallViewStep - + Package selection Selezione del pacchetto - + Office software Software per ufficio - + Office package Pacchetto per ufficio - + Browser software Software navigazione web - + Browser package Pacchetto navigazione web - + Web browser Browser web - + Kernel + label for netinstall module, Linux kernel Kernel - + Services + label for netinstall module, system services Servizi - + Login + label for netinstall module, choose login manager Accesso - + Desktop + label for netinstall module, choose desktop environment Ambiente desktop - - Applications - Applicazioni - - - + Communication + label for netinstall module Comunicazione - + Development + label for netinstall module Sviluppo - + Office + label for netinstall module Ufficio - + Multimedia + label for netinstall module Multimedia - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Personalizzazione tema - + Gaming + label for netinstall module Giochi - + Utilities + label for netinstall module Utilità + + + Applications + Applicazioni + NotesQmlViewStep @@ -2188,24 +2242,24 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse - - - + + + Timezone: %1 Fuso orario: %1 - + Select your preferred Zone within your Region. - + Zones Zone - + You can fine-tune Language and Locale settings below. @@ -2288,6 +2342,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse + @@ -2326,6 +2381,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse + @@ -2334,6 +2390,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse + @@ -2342,6 +2399,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse + @@ -2350,6 +2408,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse + @@ -2363,6 +2422,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse + @@ -2371,6 +2431,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse + @@ -2379,6 +2440,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse + @@ -2387,6 +2449,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse + @@ -2480,7 +2543,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Errore sconosciuto - + Password is empty Password vuota @@ -2518,22 +2581,6 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Si prega di scegliere un prodotto dalla lista. Il prodotto selezionato verrà installato. - - PackageChooserQmlViewStep - - - Packages - Pacchetti - - - - PackageChooserViewStep - - - Packages - Pacchetti - - PackageModel @@ -3062,7 +3109,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3385,12 +3432,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: Per ottenere prestazioni ottimali, assicurarsi che questo computer: - + System requirements Requisiti di sistema @@ -3818,22 +3865,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Cliccare qui per maggiori informazioni sulla valutazione degli utenti</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4021,44 +4068,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Benvenuto nel programma di installazione Calamares di %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Benvenuto nell'installazione di %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Benvenuti nel programma di installazione Calamares per %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Benvenuto nel programma d'installazione di %1.</h1> - - - %1 support supporto %1 - + About %1 setup Informazioni sul sistema di configurazione %1 - + About %1 installer Informazioni sul programma di installazione %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>per %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Grazie al <a href="https://calamares.io/team/">Team di Calamares </a> ed al <a href="https://www.transifex.com/calamares/calamares/">team dei traduttori di Calamares</a>.<br/><br/>Lo sviluppo di <a href="https://calamares.io/">Calamares</a> è sponsorizzato da <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4123,23 +4145,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back Indietro @@ -4239,17 +4245,17 @@ Output: Modello della tastiera: - + Layouts Schemi - + Type here to test your keyboard Digitare qui per provare la tastiera - + Variants Varianti @@ -4397,102 +4403,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. Solo lettere minuscole, numeri, trattini e trattini bassi sono permessi. - + root is not allowed as username. - + What is the name of this computer? Qual è il nome di questo computer? - + Computer Name Nome Computer - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Scegliere una password per rendere sicuro il tuo account. - + Password Password - + Repeat Password Ripetere Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quando questa casella è selezionata, la robustezza della password viene verificata e non sarà possibile utilizzare password deboli. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. Usare la stessa password per l'account amministratore. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ja-Hira.ts b/lang/calamares_ja-Hira.ts index 2798da7fa..10dd88794 100644 --- a/lang/calamares_ja-Hira.ts +++ b/lang/calamares_ja-Hira.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done @@ -261,21 +280,21 @@ - + Waiting for %n module(s). - + (%n second(s)) - + System-requirements checking is complete. @@ -480,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -524,149 +543,149 @@ The installer will quit and all changes will be lost. - + Select storage de&vice: - - - - + + + + Current: - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -754,27 +773,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -809,97 +828,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -955,11 +974,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1418,6 +1442,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1447,8 +1481,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1537,32 +1571,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1596,12 +1630,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1609,12 +1649,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1654,27 +1694,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1974,35 +2014,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2028,12 +2068,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2043,98 +2083,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2185,24 +2237,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2468,7 +2520,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2506,22 +2558,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3047,7 +3083,7 @@ Output: QObject - + %1 (%2) @@ -3370,12 +3406,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3803,22 +3839,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4006,44 +4042,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4108,23 +4119,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4224,17 +4219,17 @@ Output: - + Layouts - + Type here to test your keyboard - + Variants @@ -4361,102 +4356,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts index 1926116e6..375fe8834 100644 --- a/lang/calamares_ja.ts +++ b/lang/calamares_ja.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ ウィジェットツリー - + Debug information デバッグ情報 @@ -171,7 +190,7 @@ Calamares::JobThread - + Done 完了 @@ -261,21 +280,21 @@ モジュール <i>%1</i> に必要なパッケージの確認が完了しました。 - + Waiting for %n module(s). %n 個のモジュールを待機しています。 - + (%n second(s)) (%n 秒(s)) - + System-requirements checking is complete. 要求されるシステムの確認を終了しました。 @@ -486,12 +505,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 セットアッププログラム - + %1 Installer %1 インストーラー @@ -530,149 +549,149 @@ The installer will quit and all changes will be lost. フォーム - + Select storage de&vice: ストレージデバイスを選択 (&V): - - - - + + + + Current: 現在: - + After: 後: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>手動パーティション</strong><br/>パーティションを自分で作成またはサイズ変更することができます。 - + Reuse %1 as home partition for %2. %1 を %2 のホームパーティションとして再利用する - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>縮小するパーティションを選択し、下のバーをドラッグしてサイズを変更して下さい</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 は %2MiB に縮小され、%4 に新しい %3MiB のパーティションが作成されます。 - + Boot loader location: ブートローダーの場所: - + <strong>Select a partition to install on</strong> <strong>インストールするパーティションの選択</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. システムにEFIシステムパーティションが存在しません。%1 のセットアップのため、元に戻り、手動パーティショニングを使用してください。 - + The EFI system partition at %1 will be used for starting %2. %1 の EFI システム パーティションは、%2 の起動に使用されます。 - + EFI system partition: EFI システムパーティション: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. このストレージデバイスにはオペレーティングシステムが存在しないようです。何を行いますか？<br/>ストレージデバイスに対する変更を行う前に、変更点をレビューし、確認することができます。 - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>ディスクの消去</strong><br/>選択したストレージデバイス上のデータがすべて <font color="red">削除</font>されます。 - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>共存してインストール</strong><br/>インストーラは %1 用の空きスペースを確保するため、パーティションを縮小します。 - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>パーティションの置換</strong><br/>パーティションを %1 に置き換えます。 - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. このストレージデバイスには %1 が存在します。何を行いますか？<br/>ストレージデバイスに対する変更を行う前に、変更点をレビューし、確認することができます。 - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. このストレージデバイスにはすでにオペレーティングシステムが存在します。何を行いますか？<br/>ストレージデバイスに対する変更を行う前に、変更点をレビューし、確認することができます。 - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. このストレージデバイスには複数のオペレーティングシステムが存在します。何を行いますか？<br />ストレージデバイスに対する変更を行う前に、変更点をレビューし、確認することができます。 - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> このストレージデバイスにはすでにオペレーティングシステムがインストールされていますが、パーティションテーブル <strong>%1</strong> は必要な <strong>%2</strong> とは異なります。<br/> - + This storage device has one of its partitions <strong>mounted</strong>. このストレージデバイスにはパーティションの1つが<strong>マウントされています</strong>。 - + This storage device is a part of an <strong>inactive RAID</strong> device. このストレージデバイスは<strong>非アクティブなRAID</strong>デバイスの一部です。 - + No Swap スワップを使用しない - + Reuse Swap スワップを再利用 - + Swap (no Hibernate) スワップ(ハイバーネートなし) - + Swap (with Hibernate) スワップ(ハイバーネート) - + Swap to file ファイルにスワップ @@ -760,27 +779,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> キーボードのモデルを %1 に設定する。<br/> - + Set keyboard layout to %1/%2. キーボードのレイアウトを %1/%2 に設定する。 - + Set timezone to %1/%2. タイムゾーンを %1/%2 に設定する。 - + The system language will be set to %1. システムの言語を %1 に設定する。 - + The numbers and dates locale will be set to %1. 数値と日付のロケールを %1 に設定する。 @@ -815,97 +834,97 @@ The installer will quit and all changes will be lost. ネットワークインストール。(無効: パッケージリストを取得できません。ネットワーク接続を確認してください。) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> このコンピューターは %1 をセットアップするための最低要件を満たしていません。<br/>セットアップは続行できません。 <a href="#details">詳細...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> このコンピューターは %1 をインストールするための最低要件を満たしていません。<br/>インストールは続行できません。<a href="#details">詳細...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. このコンピューターは、 %1 をセットアップするための推奨条件をいくつか満たしていません。<br/>インストールは続行しますが、一部の機能が無効になる場合があります。 - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. このコンピューターは、 %1 をインストールするための推奨条件をいくつか満たしていません。<br/>インストールは続行しますが、一部の機能が無効になる場合があります。 - + This program will ask you some questions and set up %2 on your computer. このプログラムはあなたにいくつか質問をして、コンピューターに %2 を設定します。 - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>%1 のCalamaresセットアッププログラムへようこそ</h1> - + <h1>Welcome to %1 setup</h1> <h1>%1 のセットアップへようこそ</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>%1 のCalamaresインストーラーへようこそ</h1> - + <h1>Welcome to the %1 installer</h1> <h1>%1 インストーラーへようこそ</h1> - + Your username is too long. ユーザー名が長すぎます。 - + '%1' is not allowed as username. '%1' はユーザー名として許可されていません。 - + Your username must start with a lowercase letter or underscore. ユーザー名はアルファベットの小文字または _ で始めてください。 - + Only lowercase letters, numbers, underscore and hyphen are allowed. 使用できるのはアルファベットの小文字と数字と _ と - だけです。 - + Your hostname is too short. ホスト名が短すぎます。 - + Your hostname is too long. ホスト名が長過ぎます。 - + '%1' is not allowed as hostname. '%1' はホスト名として許可されていません。 - + Only letters, numbers, underscore and hyphen are allowed. 使用できるのはアルファベットと数字と _ と - だけです。 - + Your passwords do not match! パスワードが一致していません！ - + OK! OK! @@ -962,11 +981,16 @@ The installer will quit and all changes will be lost. + Packages + パッケージ + + + Install option: <strong>%1</strong> インストールオプション: <strong>%1</strong> - + None なし @@ -1425,6 +1449,16 @@ The installer will quit and all changes will be lost. FS Label: FSラベル: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1454,8 +1488,8 @@ The installer will quit and all changes will be lost. パスフレーズの確認 - - + + Please enter the same passphrase in both boxes. 両方のボックスに同じパスフレーズを入力してください。 @@ -1544,32 +1578,32 @@ The installer will quit and all changes will be lost. 今すぐ再起動 (&R) - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>すべて完了しました。</h1><br/>%1 はコンピューターにセットアップされました。<br/>今から新しいシステムを開始することができます。 - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>このボックスをチェックすると、 <span style="font-style:italic;">実行</span>をクリックするかプログラムを閉じると直ちにシステムが再起動します。</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>すべて完了しました。</h1><br/>%1 がコンピューターにインストールされました。<br/>再起動して新しいシステムを使用することもできますし、%2 ライブ環境の使用を続けることもできます。 - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>このボックスをチェックすると、 <span style="font-style:italic;">実行</span>をクリックするかインストーラーを閉じると直ちにシステムが再起動します。</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>セットアップに失敗しました。</h1><br/>%1 はコンピューターにセットアップされていません。<br/>エラーメッセージ: %2 - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>インストールに失敗しました</h1><br/>%1 はコンピューターにインストールされませんでした。<br/>エラーメッセージ: %2. @@ -1603,12 +1637,18 @@ The installer will quit and all changes will be lost. <strong>%3MiB</strong> のパーティション <strong>%1</strong> をファイルシステム <strong>%2</strong> でフォーマットする。 - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. ファイルシステム %2 でパーティション %1 をフォーマットしています。 - + The installer failed to format partition %1 on disk '%2'. インストーラーはディスク '%2' 上のパーティション %1 のフォーマットに失敗しました。 @@ -1616,12 +1656,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space 利用可能な容量が少なくとも %1 GiB - + There is not enough drive space. At least %1 GiB is required. 空き容量が十分ではありません。少なくとも %1 GiB 必要です。 @@ -1661,27 +1701,27 @@ The installer will quit and all changes will be lost. は管理者（root）としてインストーラーを実行しています - + The setup program is not running with administrator rights. セットアッププログラムは管理者権限で実行されていません。 - + The installer is not running with administrator rights. インストーラーは管理者権限で実行されていません。 - + has a screen large enough to show the whole installer にはインストーラー全体を表示できる大きさの画面があります - + The screen is too small to display the setup program. 画面が小さすぎてセットアッププログラムを表示できません。 - + The screen is too small to display the installer. 画面が小さすぎてインストーラーを表示できません。 @@ -1981,35 +2021,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. LUKSキーファイルを設定しています。 - - + + No partitions are defined. パーティションが定義されていません。 - - - + + + Encrypted rootfs setup error 暗号化された rootfs のセットアップエラー - + Root partition %1 is LUKS but no passphrase has been set. ルートパーティション %1 はLUKSですが、パスワードが設定されていません。 - + Could not create LUKS key file for root partition %1. ルートパーティション %1 のLUKSキーファイルを作成できませんでした。 - + Could not configure LUKS key file on partition %1. パーティション %1 でLUKSキーファイルを設定できませんでした。 @@ -2035,12 +2075,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 タイムゾーン: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2053,100 +2093,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection パッケージの選択 - + Office software オフィスソフトウェア - + Office package オフィスパッケージ - + Browser software ブラウザソフトウェア - + Browser package ブラウザパッケージ - + Web browser ウェブブラウザ - + Kernel + label for netinstall module, Linux kernel カーネル - + Services + label for netinstall module, system services サービス - + Login + label for netinstall module, choose login manager ログイン - + Desktop + label for netinstall module, choose desktop environment デスクトップ - - Applications - アプリケーション - - - + Communication + label for netinstall module コミュニケーション - + Development + label for netinstall module 開発 - + Office + label for netinstall module オフィス - + Multimedia + label for netinstall module マルチメディア - + Internet + label for netinstall module インターネット - + Theming + label for netinstall module テーマ - + Gaming + label for netinstall module ゲーム - + Utilities + label for netinstall module ユーティリティー + + + Applications + アプリケーション + NotesQmlViewStep @@ -2195,24 +2247,24 @@ The installer will quit and all changes will be lost. 希望する地域を選択するか、デフォルトの設定を使用してください。 - - - + + + Timezone: %1 タイムゾーン: %1 - + Select your preferred Zone within your Region. 地域内の優先ゾーンを選択してください。 - + Zones ゾーン - + You can fine-tune Language and Locale settings below. 以下の言語とロケールの設定を微調整できます。 @@ -2478,7 +2530,7 @@ The installer will quit and all changes will be lost. 未知のエラー - + Password is empty パスワードが空です @@ -2516,22 +2568,6 @@ The installer will quit and all changes will be lost. リストから製品を選んでください。選択した製品がインストールされます。 - - PackageChooserQmlViewStep - - - Packages - パッケージ - - - - PackageChooserViewStep - - - Packages - パッケージ - - PackageModel @@ -3060,7 +3096,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3386,12 +3422,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: 良好な結果を得るために、このコンピューターについて以下の項目を確認してください： - + System requirements システム要件 @@ -3819,22 +3855,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">ユーザーフィードバックについての詳しい情報については、ここをクリックしてください</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. 追跡することにより、%1 はインストールの頻度、インストールされているハードウェア、使用されているアプリケーションを確認できます。送信内容を確認するには、各エリアの横にあるヘルプアイコンをクリックしてください。 - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. これを選択すると、インストールとハードウェアに関する情報が送信されます。この情報は、インストールの完了後に<b>1度だけ</b>送信されます。 - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. これを選択すると、<b>マシン</b>のインストール、ハードウェア、アプリケーションに関する情報が定期的に %1 に送信されます。 - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. これを選択すると、<b>ユーザーの</b>インストール、ハードウェア、アプリケーション、アプリケーションの使用パターンに関する情報が定期的に %1 に送信されます。 @@ -4022,44 +4058,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>%1 Calamares セットアッププログラムにようこそ</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>%1 セットアップへようこそ</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>%1 Calamares インストーラーにようこそ</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>%1 インストーラーへようこそ。</h1> - - - %1 support %1 サポート - + About %1 setup %1 セットアップについて - + About %1 installer %1 インストーラーについて - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4124,34 +4135,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back 戻る @@ -4256,17 +4240,17 @@ Output: キーボードモデル: - + Layouts レイアウト - + Type here to test your keyboard ここでタイプしてキーボードをテストしてください - + Variants バリアント @@ -4415,102 +4399,102 @@ Output: 複数のユーザーがこのコンピューターを使用する場合は、インストール後に複数のアカウントを作成できます。 - + Only lowercase letters, numbers, underscore and hyphen are allowed. 使用できるのはアルファベットの小文字と数字と _ と - だけです。 - + root is not allowed as username. root はユーザー名として許可されていません。 - + What is the name of this computer? このコンピューターの名前は何ですか？ - + Computer Name コンピューターの名前 - + This name will be used if you make the computer visible to others on a network. この名前は、コンピューターをネットワーク上の他のユーザーに表示する場合に使用されます。 - + localhost is not allowed as hostname. localhost はユーザー名として許可されていません。 - + Choose a password to keep your account safe. アカウントを安全に使うため、パスワードを選択してください - + Password パスワード - + Repeat Password パスワードを再度入力 - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. 同じパスワードを2回入力して、入力エラーをチェックできるようにします。適切なパスワードは文字、数字、句読点が混在する8文字以上のもので、定期的に変更する必要があります。 - + Validate passwords quality パスワードの品質を検証する - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. このボックスをオンにするとパスワードの強度チェックが行われ、弱いパスワードを使用できなくなります。 - + Log in automatically without asking for the password パスワードを要求せずに自動的にログインする - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. 使用できるのはアルファベットと数字と _ と - で、2文字以上必要です。 - + Reuse user password as root password rootパスワードとしてユーザーパスワードを再利用する - + Use the same password for the administrator account. 管理者アカウントと同じパスワードを使用する。 - + Choose a root password to keep your account safe. アカウントを安全に保つために、rootパスワードを選択してください。 - + Root Password rootパスワード - + Repeat Root Password rootパスワードを再入力 - + Enter the same password twice, so that it can be checked for typing errors. 同じパスワードを2回入力して、入力エラーをチェックできるようにします。 diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts index 4b00ab06c..703fd73ab 100644 --- a/lang/calamares_kk.ts +++ b/lang/calamares_kk.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information Жөндеу ақпараты @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Дайын @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -482,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -526,149 +545,149 @@ The installer will quit and all changes will be lost. - + Select storage de&vice: - - - - + + + + Current: - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: EFI жүйелік бөлімі: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -756,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -811,97 +830,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -957,11 +976,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1420,6 +1444,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1449,8 +1483,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1539,32 +1573,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1598,12 +1632,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1611,12 +1651,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1656,27 +1696,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1976,35 +2016,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2030,12 +2070,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2045,98 +2085,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2187,24 +2239,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2479,7 +2531,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2517,22 +2569,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3058,7 +3094,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3381,12 +3417,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3814,22 +3850,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4017,44 +4053,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support %1 қолдауы - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4119,23 +4130,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4235,17 +4230,17 @@ Output: - + Layouts - + Type here to test your keyboard - + Variants @@ -4372,102 +4367,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts index d73bff139..68c4b64c9 100644 --- a/lang/calamares_kn.ts +++ b/lang/calamares_kn.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -482,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -526,149 +545,149 @@ The installer will quit and all changes will be lost. - + Select storage de&vice: - - - - + + + + Current: ಪ್ರಸಕ್ತ: - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -756,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -811,97 +830,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -957,11 +976,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1420,6 +1444,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1449,8 +1483,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1539,32 +1573,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1598,12 +1632,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1611,12 +1651,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1656,27 +1696,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1976,35 +2016,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2030,12 +2070,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2045,98 +2085,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2187,24 +2239,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2479,7 +2531,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2517,22 +2569,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3058,7 +3094,7 @@ Output: QObject - + %1 (%2) @@ -3381,12 +3417,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3814,22 +3850,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4017,44 +4053,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4119,23 +4130,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4235,17 +4230,17 @@ Output: - + Layouts - + Type here to test your keyboard - + Variants @@ -4372,102 +4367,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts index 2f504899f..d042111ed 100644 --- a/lang/calamares_ko.ts +++ b/lang/calamares_ko.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ 위젯 트리 - + Debug information 디버그 정보 @@ -171,7 +190,7 @@ Calamares::JobThread - + Done 완료 @@ -261,21 +280,21 @@ <i>%1</i> 모듈에 대한 요구사항 검사가 완료되었습니다. - + Waiting for %n module(s). %n 모듈(들)을 기다리는 중. - + (%n second(s)) (%n 초) - + System-requirements checking is complete. 시스템 요구사항 검사가 완료 되었습니다. @@ -486,12 +505,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 설치 프로그램 - + %1 Installer %1 설치 관리자 @@ -530,149 +549,149 @@ The installer will quit and all changes will be lost. 형식 - + Select storage de&vice: 저장 장치 선택 (&v) - - - - + + + + Current: 현재: - + After: 이후: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>수동 파티션 작업</strong><br/>직접 파티션을 만들거나 크기를 조정할 수 있습니다. - + Reuse %1 as home partition for %2. %2의 홈 파티션으로 %1을 재사용합니다. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>축소할 파티션을 선택한 다음 하단 막대를 끌어 크기를 조정합니다.</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1이 %2MiB로 축소되고 %4에 대해 새 %3MiB 파티션이 생성됩니다. - + Boot loader location: 부트 로더 위치 : - + <strong>Select a partition to install on</strong> <strong>설치할 파티션을 선택합니다.</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. 이 시스템에서는 EFI 시스템 파티션을 찾을 수 없습니다. 돌아가서 수동 파티션 작업을 사용하여 %1을 설정하세요. - + The EFI system partition at %1 will be used for starting %2. %1의 EFI 시스템 파티션은 %2의 시작으로 사용될 것입니다. - + EFI system partition: EFI 시스템 파티션: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. 이 저장 장치에는 운영 체제가없는 것 같습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>디스크 지우기</strong><br/>그러면 선택한 저장 장치에 현재 있는 모든 데이터가 <font color="red">삭제</font>됩니다. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>함께 설치</strong><br/>설치 관리자가 파티션을 축소하여 %1 공간을 확보합니다. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>파티션 바꾸기</strong><br/>파티션을 %1로 바꿉니다. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. 이 저장 장치에 %1이 있습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. 이 저장 장치에는 이미 운영 체제가 있습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. 이 저장 장치에는 여러 개의 운영 체제가 있습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> 이 스토리지 장치에는 이미 운영 체제가 설치되어 있으나 <strong>%1</strong> 파티션 테이블이 필요로 하는 <strong>%2</strong>와 다릅니다.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. 이 스토리지 장치는 하나 이상의 <strong>마운트된</strong> 파티션을 갖고 있습니다. - + This storage device is a part of an <strong>inactive RAID</strong> device. 이 스토리지 장치는 <strong>비활성화된 RAID</strong> 장치의 일부입니다. - + No Swap 스왑 없음 - + Reuse Swap 스왑 재사용 - + Swap (no Hibernate) 스왑 (최대 절전모드 아님) - + Swap (with Hibernate) 스왑 (최대 절전모드 사용) - + Swap to file 파일로 스왑 @@ -760,27 +779,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> 키보드 모델을 %1로 설정합니다.<br/> - + Set keyboard layout to %1/%2. 키보드 레이아웃을 %1/%2로 설정합니다. - + Set timezone to %1/%2. 표준시간대를 %1/%2로 설정합니다. - + The system language will be set to %1. 시스템 언어가 %1로 설정됩니다. - + The numbers and dates locale will be set to %1. 숫자와 날짜 로케일이 %1로 설정됩니다. @@ -815,97 +834,97 @@ The installer will quit and all changes will be lost. 네트워크 설치. (불가: 패키지 목록을 가져올 수 없습니다. 네트워크 연결을 확인해주세요) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> 이 컴퓨터는 %1 설치를 위한 최소 요구 사항을 충족하지 않습니다.<br/>설치를 계속할 수 없습니다.<a href="#details">세부 정보...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> 이 컴퓨터는 %1 설치를 위한 최소 요구 사항을 충족하지 않습니다.<br/>설치를 계속할 수 없습니다. <a href="#details">세부 사항입니다...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. 이 컴퓨터는 %1 설치를 위한 권장 요구 사항 중 일부를 충족하지 않습니다.<br/>설치를 계속할 수는 있지만 일부 기능을 사용하지 않도록 설정할 수도 있습니다. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. 이 컴퓨터는 %1 설치를 위한 권장 요구 사항 중 일부를 충족하지 않습니다.<br/>설치를 계속할 수 있지만 일부 기능을 사용하지 않도록 설정할 수 있습니다. - + This program will ask you some questions and set up %2 on your computer. 이 프로그램은 몇 가지 질문을 하고 컴퓨터에 %2을 설정합니다. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1> 깔라마레스 설치 프로그램 %1에 오신 것을 환영합니다</h1> - + <h1>Welcome to %1 setup</h1> <h1>%1 설치에 오신 것을 환영합니다</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>깔라마레스 설치 관리자 %1에 오신 것을 환영합니다</h1> - + <h1>Welcome to the %1 installer</h1> <h1>%1 설치 관리자에 오신 것을 환영합니다</h1> - + Your username is too long. 사용자 이름이 너무 깁니다. - + '%1' is not allowed as username. '%1'은 사용자 이름으로 허용되지 않습니다. - + Your username must start with a lowercase letter or underscore. 사용자 이름은 소문자 또는 밑줄로 시작해야 합니다. - + Only lowercase letters, numbers, underscore and hyphen are allowed. 소문자, 숫자, 밑줄 및 하이픈만 허용됩니다. - + Your hostname is too short. 호스트 이름이 너무 짧습니다. - + Your hostname is too long. 호스트 이름이 너무 깁니다. - + '%1' is not allowed as hostname. '%1'은 호스트 이름으로 허용되지 않습니다. - + Only letters, numbers, underscore and hyphen are allowed. 문자, 숫자, 밑줄 및 하이픈만 허용됩니다. - + Your passwords do not match! 암호가 일치하지 않습니다! - + OK! 확인! @@ -961,11 +980,16 @@ The installer will quit and all changes will be lost. + Packages + 패키지 + + + Install option: <strong>%1</strong> 설치 옵션: <strong>%1</strong> - + None 없음 @@ -1424,6 +1448,16 @@ The installer will quit and all changes will be lost. FS Label: 파일시스템 레이블: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1453,8 +1487,8 @@ The installer will quit and all changes will be lost. 암호 확인 - - + + Please enter the same passphrase in both boxes. 암호와 암호 확인 상자에 동일한 값을 입력해주세요. @@ -1543,32 +1577,32 @@ The installer will quit and all changes will be lost. 지금 재시작 (&R) - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>모두 완료.</h1><br/>%1이 컴퓨터에 설정되었습니다.<br/>이제 새 시스템을 사용할 수 있습니다. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>이 확인란을 선택하면 <span style="font-style:italic;">완료</span>를 클릭하거나 설치 프로그램을 닫으면 시스템이 즉시 다시 시작됩니다.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>모두 완료되었습니다.</h1><br/>%1이 컴퓨터에 설치되었습니다.<br/>이제 새 시스템으로 다시 시작하거나 %2 라이브 환경을 계속 사용할 수 있습니다. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>이 확인란을 선택하면 <span style="font-style:italic;">완료</span>를 클릭하거나 설치 관리자를 닫으면 시스템이 즉시 다시 시작됩니다.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>설치 실패</h1><br/>%1이 컴퓨터에 설정되지 않았습니다.<br/>오류 메시지 : %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>설치에 실패했습니다.</h1><br/>%1이 컴퓨터에 설치되지 않았습니다.<br/>오류 메시지는 %2입니다. @@ -1602,12 +1636,18 @@ The installer will quit and all changes will be lost. <strong>%3MiB</strong> 파티션 <strong>%1</strong>을 파일 시스템 <strong>%2</strong>로 포맷합니다. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. %1 파티션을 %2 파일 시스템으로 포맷하는 중입니다. - + The installer failed to format partition %1 on disk '%2'. 설치 관리자가 '%2' 디스크에 있는 %1 파티션을 포맷하지 못했습니다. @@ -1615,12 +1655,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space %1 GiB 이상의 사용 가능한 드라이브 공간이 있음 - + There is not enough drive space. At least %1 GiB is required. 드라이브 공간이 부족합니다. %1 GiB 이상이 필요합니다. @@ -1660,27 +1700,27 @@ The installer will quit and all changes will be lost. 설치 관리자를 관리자(루트)로 실행 중입니다 - + The setup program is not running with administrator rights. 설치 프로그램이 관리자 권한으로 실행되고 있지 않습니다. - + The installer is not running with administrator rights. 설치 관리자가 관리자 권한으로 동작하고 있지 않습니다. - + has a screen large enough to show the whole installer 전체 설치 관리자를 표시할 수 있을 만큼 큰 화면이 있습니다 - + The screen is too small to display the setup program. 화면이 너무 작아서 설정 프로그램을 표시할 수 없습니다. - + The screen is too small to display the installer. 설치 관리자를 표시하기에는 화면이 너무 작습니다. @@ -1980,35 +2020,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. LUKS 키 파일 구성 중. - - + + No partitions are defined. 파티션이 정의되지 않았습니다. - - - + + + Encrypted rootfs setup error 암호화된 rootfs 설정 오류 - + Root partition %1 is LUKS but no passphrase has been set. 루트 파티션 %1이(가) LUKS이지만 암호가 설정되지 않았습니다. - + Could not create LUKS key file for root partition %1. 루트 파티션 %1에 대한 LUKS 키 파일을 생성할 수 없습니다. - + Could not configure LUKS key file on partition %1. 파티션 %1에 LUKS 키 파일을 설정할 수 없습니다. @@ -2034,12 +2074,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 표준시간대: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2051,100 +2091,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection 패키지 선택 - + Office software 오피스 소프트웨어 - + Office package 오피스 패키지 - + Browser software 브라우저 소프트웨어 - + Browser package 브라우저 패키지 - + Web browser 웹 브라우저 - + Kernel + label for netinstall module, Linux kernel 커널 - + Services + label for netinstall module, system services 서비스 - + Login + label for netinstall module, choose login manager 로그인 - + Desktop + label for netinstall module, choose desktop environment 데스크탑 - - Applications - 애플리케이션 - - - + Communication + label for netinstall module 통신 - + Development + label for netinstall module 개발 - + Office + label for netinstall module 오피스 - + Multimedia + label for netinstall module 멀티미디어 - + Internet + label for netinstall module 인터넷 - + Theming + label for netinstall module 테마 - + Gaming + label for netinstall module 게임 - + Utilities + label for netinstall module 유틸리티 + + + Applications + 애플리케이션 + NotesQmlViewStep @@ -2193,24 +2245,24 @@ The installer will quit and all changes will be lost. 원하는 지역을 선택하거나, 기본 설정을 사용하십시오. - - - + + + Timezone: %1 표준시간대: %1 - + Select your preferred Zone within your Region. 선호하는 표준시간대와 지역을 선택하세요. - + Zones 표준시간대 - + You can fine-tune Language and Locale settings below. 아래에서 언어 및 로케일을 상세하게 설정할 수 있습니다. @@ -2476,7 +2528,7 @@ The installer will quit and all changes will be lost. 알 수 없는 오류 - + Password is empty 비밀번호가 비어 있습니다 @@ -2514,22 +2566,6 @@ The installer will quit and all changes will be lost. 목록에서 제품을 선택하십시오. 선택한 제품이 설치됩니다. - - PackageChooserQmlViewStep - - - Packages - 패키지 - - - - PackageChooserViewStep - - - Packages - 패키지 - - PackageModel @@ -3058,7 +3094,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3384,12 +3420,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: 최상의 결과를 얻으려면 이 컴퓨터가 다음 사항을 충족해야 합니다. - + System requirements 시스템 요구 사항 @@ -3817,22 +3853,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">사용자 피드백에 대한 자세한 정보를 보려면 여기를 클릭하세요.</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. 트래킹을 통해 %1이(가) 얼마나 자주 설치되는지, 어떤 하드웨어에 설치되어 있고 어떤 응용 프로그램이 사용되는지 확인할 수 있습니다. 전송할 내용을 보려면 각 영역 옆에 있는 도움말 아이콘을 클릭하십시오. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. 이 옵션을 선택하면 설치 및 하드웨어에 대한 정보가 전송됩니다. 이 정보는 설치가 완료된 후 <b>한 번만</b> 전송됩니다. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. 이 옵션을 선택하면 <b>컴퓨터</b> 설치, 하드웨어 및 응용 프로그램에 대한 정보를 %1에게 주기적으로 보냅니다. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. 이를 선택하면 <b>사용자</b> 설치, 하드웨어, 응용 프로그램 및 응용 프로그램 사용 패턴에 대한 정보를 정기적으로 %1에게 보냅니다. @@ -4020,44 +4056,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>%1용 Calamares 설정 프로그램에 오신 것을 환영합니다.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>%1 설치에 오신 것을 환영합니다.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>%1용 Calamares 설치 관리자에 오신 것을 환영합니다.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>%1 설치 관리자에 오신 것을 환영합니다.</h1> - - - %1 support %1 지원 - + About %1 setup %1 설치 정보 - + About %1 installer %1 설치 관리자에 대하여 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/><a href="https://calamares.io/team/">Calamares 팀</a>과 <a href="https://www.transifex.com/calamares/calamares/">Calamares 번역 팀</a> 덕분입니다.<br/><br/><a href="https://calamares.io/">Calamares</a> 개발은 <br/><a href="http://www.blue-systems.com/">Blue Systems</a>에서 후원합니다 - Liberating Software. - WelcomeQmlViewStep @@ -4122,34 +4133,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - <a href='https://calamares.io/team/'>Calamares 팀</a>과 - <a href='https://www.transifex.com/calamares/calamares/'>Calamares 번역 팀</a> - 에게 감사드립니다.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - 개발 후원: <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back 뒤로 @@ -4254,17 +4238,17 @@ Output: 키보드 모델: - + Layouts 레이아웃 - + Type here to test your keyboard 키보드를 테스트하기 위해 여기에 입력하세요 - + Variants 변형 @@ -4413,102 +4397,102 @@ Output: 다수의 사용자가 이 컴퓨터를 사용하는 경우, 설치를 마친 후에 여러 계정을 만들 수 있습니다. - + Only lowercase letters, numbers, underscore and hyphen are allowed. 소문자, 숫자, 밑줄 및 하이픈만 허용됩니다. - + root is not allowed as username. root는 사용자 이름으로 허용되지 않습니다. - + What is the name of this computer? 이 컴퓨터의 이름은 무엇인가요? - + Computer Name 컴퓨터 이름 - + This name will be used if you make the computer visible to others on a network. 이 이름은 네트워크의 다른 사용자가 이 컴퓨터를 볼 수 있게 하는 경우에 사용됩니다. - + localhost is not allowed as hostname. localhost는 호스트 이름으로 허용되지 않습니다. - + Choose a password to keep your account safe. 사용자 계정의 보안을 유지하기 위한 암호를 선택하세요. - + Password 비밀번호 - + Repeat Password 비밀번호 반복 - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. 입력 오류를 확인할 수 있도록 동일한 암호를 두 번 입력합니다. 올바른 암호에는 문자, 숫자 및 구두점이 혼합되어 있으며 길이는 8자 이상이어야 하며 정기적으로 변경해야 합니다. - + Validate passwords quality 암호 품질 검증 - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. 이 확인란을 선택하면 비밀번호 강도 검사가 수행되며 불충분한 비밀번호를 사용할 수 없습니다. - + Log in automatically without asking for the password 암호를 묻지 않고 자동으로 로그인합니다 - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. 문자, 숫자, 밑줄 및 하이픈만 허용되며, 최소 2자 이상이어야 합니다. - + Reuse user password as root password 사용자 암호를 루트 암호로 재사용합니다 - + Use the same password for the administrator account. 관리자 계정에 대해 같은 암호를 사용합니다. - + Choose a root password to keep your account safe. 당신의 계정을 안전하게 보호하기 위해서 루트 암호를 선택하세요. - + Root Password 루트 암호 - + Repeat Root Password 루트 암호 확인 - + Enter the same password twice, so that it can be checked for typing errors. 입력 오류를 확인하기 위해서 동일한 암호를 두번 입력해주세요. diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts index 61a9eb42e..87f090046 100644 --- a/lang/calamares_lo.ts +++ b/lang/calamares_lo.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done @@ -261,21 +280,21 @@ - + Waiting for %n module(s). - + (%n second(s)) - + System-requirements checking is complete. @@ -480,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -524,149 +543,149 @@ The installer will quit and all changes will be lost. - + Select storage de&vice: - - - - + + + + Current: - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -754,27 +773,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -809,97 +828,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -955,11 +974,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1418,6 +1442,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1447,8 +1481,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1537,32 +1571,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1596,12 +1630,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1609,12 +1649,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1654,27 +1694,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1974,35 +2014,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2028,12 +2068,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2043,98 +2083,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2185,24 +2237,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2468,7 +2520,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2506,22 +2558,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3047,7 +3083,7 @@ Output: QObject - + %1 (%2) @@ -3370,12 +3406,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3803,22 +3839,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4006,44 +4042,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4108,23 +4119,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4224,17 +4219,17 @@ Output: - + Layouts - + Type here to test your keyboard - + Variants @@ -4361,102 +4356,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts index c18e4a0a0..57dc84476 100644 --- a/lang/calamares_lt.ts +++ b/lang/calamares_lt.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + <h1>%1</h1><br/><strong>%2,<br/> skirta %3</strong><br/><br/> + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + Dėkojame <a href="https://calamares.io/team/">Calamares komandai</a> ir <a href="https://www.transifex.com/calamares/calamares/">Calamares vertėjų komandai</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> plėtojimą remia <br/><a href="http://www.blue-systems.com/">„Blue Systems“</a> – Išlaisvinanti programinė įranga. + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + Autorių teisės %1-%2 %3 &lt;%4&gt;<br/> + + AutoMountManagementJob @@ -137,7 +156,7 @@ Valdiklių medis - + Debug information Derinimo informacija @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Atlikta @@ -261,7 +280,7 @@ Reikalavimų tikrinimas <i>%1</i> moduliui yra užbaigtas. - + Waiting for %n module(s). Laukiama %n modulio. @@ -271,7 +290,7 @@ - + (%n second(s)) (%n sekundė) @@ -281,7 +300,7 @@ - + System-requirements checking is complete. Sistemos reikalavimų tikrinimas yra užbaigtas. @@ -492,12 +511,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. CalamaresWindow - + %1 Setup Program %1 sąrankos programa - + %1 Installer %1 diegimo programa @@ -536,149 +555,149 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Forma - + Select storage de&vice: Pasirinkite atminties įr&enginį: - - - - + + + + Current: Dabartinis: - + After: Po: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Rankinis skaidymas</strong><br/>Galite patys kurti ar keisti skaidinių dydžius. - + Reuse %1 as home partition for %2. Pakartotinai naudoti %1 kaip namų skaidinį, skirtą %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Pasirinkite, kurį skaidinį sumažinti, o tuomet vilkite juostą, kad pakeistumėte skaidinio dydį</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 bus sumažintas iki %2MiB ir naujas %3MiB skaidinys bus sukurtas sistemai %4. - + Boot loader location: Paleidyklės vieta: - + <strong>Select a partition to install on</strong> <strong>Pasirinkite kuriame skaidinyje įdiegti</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Šioje sistemoje niekur nepavyko rasti EFI skaidinio. Prašome grįžti ir naudoti rankinį skaidymą, kad nustatytumėte %1. - + The EFI system partition at %1 will be used for starting %2. %2 paleidimui bus naudojamas EFI sistemos skaidinys, esantis ties %1. - + EFI system partition: EFI sistemos skaidinys: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Atrodo, kad šiame įrenginyje nėra operacinės sistemos. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Ištrinti diską</strong><br/>Tai <font color="red">ištrins</font> visus, pasirinktame atminties įrenginyje, esančius duomenis. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Įdiegti šalia</strong><br/>Diegimo programa sumažins skaidinį, kad atlaisvintų vietą sistemai %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Pakeisti skaidinį</strong><br/>Pakeičia skaidinį ir įrašo %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Šiame atminties įrenginyje jau yra %1. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Šiame atminties įrenginyje jau yra operacinė sistema. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Šiame atminties įrenginyje jau yra kelios operacinės sistemos. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Šiame atminties įrenginyje jau yra operacinė sistema, bet skaidinių lentelė <strong>%1</strong> yra kitokia nei reikiama <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Vienas iš šio atminties įrenginio skaidinių yra <strong>prijungtas</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Šis atminties įrenginys yra <strong>neaktyvaus RAID</strong> įrenginio dalis. - + No Swap Be sukeitimų skaidinio - + Reuse Swap Iš naujo naudoti sukeitimų skaidinį - + Swap (no Hibernate) Sukeitimų skaidinys (be užmigdymo) - + Swap (with Hibernate) Sukeitimų skaidinys (su užmigdymu) - + Swap to file Sukeitimų failas @@ -766,27 +785,27 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Config - + Set keyboard model to %1.<br/> Nustatyti klaviatūros modelį kaip %1.<br/> - + Set keyboard layout to %1/%2. Nustatyti klaviatūros išdėstymą kaip %1/%2. - + Set timezone to %1/%2. Nustatyti laiko juostą į %1/%2. - + The system language will be set to %1. Sistemos kalba bus nustatyta į %1. - + The numbers and dates locale will be set to %1. Skaičių ir datų lokalė bus nustatyta į %1. @@ -821,97 +840,97 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Tinklo diegimas. (Išjungta: Nepavyksta gauti paketų sąrašus, patikrinkite savo tinklo ryšį) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Šis kompiuteris netenkina minimalių %1 nustatymo reikalavimų.<br/>Sąranka negali būti tęsiama. <a href="#details">Išsamiau...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Šis kompiuteris netenkina minimalių %1 diegimo reikalavimų.<br/>Diegimas negali būti tęsiamas. <a href="#details">Išsamiau...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Šis kompiuteris netenkina kai kurių %1 nustatymui rekomenduojamų reikalavimų.<br/>Sąranką galima tęsti, tačiau kai kurios funkcijos gali būti išjungtos. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Šis kompiuteris netenkina kai kurių %1 diegimui rekomenduojamų reikalavimų.<br/>Diegimą galima tęsti, tačiau kai kurios funkcijos gali būti išjungtos. - + This program will ask you some questions and set up %2 on your computer. Programa užduos kelis klausimus ir padės įsidiegti %2. - + <h1>Welcome to the Calamares setup program for %1</h1> </h1>Jus sveikina Calamares sąrankos programa, skirta %1 sistemai.</h1> - + <h1>Welcome to %1 setup</h1> <h1>Jus sveikina %1 sąranka</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Jus sveikina Calamares diegimo programa, skirta %1 sistemai</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Jus sveikina %1 diegimo programa</h1> - + Your username is too long. Jūsų naudotojo vardas yra pernelyg ilgas. - + '%1' is not allowed as username. „%1“ neleidžiama naudoti kaip naudotojo vardą. - + Your username must start with a lowercase letter or underscore. Jūsų naudotojo vardas privalo prasidėti mažąja raide arba pabraukimo brūkšniu. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Yra leidžiamos tik mažosios raidės, skaitmenys, pabraukimo brūkšniai ir brūkšneliai. - + Your hostname is too short. Jūsų kompiuterio vardas yra pernelyg trumpas. - + Your hostname is too long. Jūsų kompiuterio vardas yra pernelyg ilgas. - + '%1' is not allowed as hostname. „%1“ neleidžiama naudoti kaip kompiuterio vardą. - + Only letters, numbers, underscore and hyphen are allowed. Yra leidžiamos tik raidės, skaitmenys, pabraukimo brūkšniai ir brūkšneliai. - + Your passwords do not match! Jūsų slaptažodžiai nesutampa! - + OK! Gerai! @@ -967,11 +986,16 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. + Packages + Paketai + + + Install option: <strong>%1</strong> Diegimo parinktis: <strong>%1</strong> - + None Nėra @@ -1430,6 +1454,16 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. FS Label: FS etiketė: + + + Passphrase for existing partition + Esamo skaidinio slaptafrazė + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Nepavyko iššifruoti %1 skaidinio, naudojant pateiktą slaptafrazę.<br/><br/>Taisykite skaidinį dar kartą ir nurodykite teisingą slaptafrazę arba ištrinkite šį ir sukurkite naują šifruotą skaidinį. + EncryptWidget @@ -1459,8 +1493,8 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Patvirtinkite slaptafrazę - - + + Please enter the same passphrase in both boxes. Prašome abiejuose langeliuose įrašyti tą pačią slaptafrazę. @@ -1549,32 +1583,32 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. &Paleisti iš naujo dabar - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Viskas atlikta.</h1><br/>%1 sistema jūsų kompiuteryje jau nustatyta.<br/>Dabar galite pradėti naudotis savo naująja sistema. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Pažymėjus šį langelį, jūsų sistema nedelsiant pasileis iš naujo, kai spustelėsite <span style="font-style:italic;">Atlikta</span> ar užversite sąrankos programą.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Viskas atlikta.</h1><br/>%1 sistema jau įdiegta.<br/>Galite iš naujo paleisti kompiuterį dabar ir naudotis savo naująja sistema; arba galite tęsti naudojimąsi %2 sistema demonstracinėje aplinkoje. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Pažymėjus šį langelį, jūsų sistema nedelsiant pasileis iš naujo, kai spustelėsite <span style="font-style:italic;">Atlikta</span> ar užversite diegimo programą.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Sąranka nepavyko</h1><br/>%1 nebuvo nustatyta jūsų kompiuteryje.<br/>Klaidos pranešimas buvo: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Diegimas nepavyko</h1><br/>%1 nebuvo įdiegta jūsų kompiuteryje.<br/>Klaidos pranešimas buvo: %2. @@ -1608,12 +1642,18 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Formatuoti <strong>%3MiB</strong> skaidinį <strong>%1</strong> su <strong>%2</strong> failų sistema. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formatuojamas skaidinys %1 su %2 failų sistema. - + The installer failed to format partition %1 on disk '%2'. Diegimo programai nepavyko formatuoti „%2“ disko skaidinio %1. @@ -1621,12 +1661,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. GeneralRequirements - + has at least %1 GiB available drive space turi bent %1 GiB laisvos vietos diske - + There is not enough drive space. At least %1 GiB is required. Neužtenka vietos diske. Reikia bent %1 GiB. @@ -1666,27 +1706,27 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. vykdo diegimo programą pagrindinio naudotojo (root) teisėmis - + The setup program is not running with administrator rights. Sąrankos programa yra vykdoma be administratoriaus teisių. - + The installer is not running with administrator rights. Diegimo programa yra vykdoma be administratoriaus teisių. - + has a screen large enough to show the whole installer turi ekraną, pakankamai didelį, kad rodytų visą diegimo programą - + The screen is too small to display the setup program. Ekranas yra per mažas, kad būtų parodyta sąrankos programa. - + The screen is too small to display the installer. Ekranas yra per mažas, kad būtų parodyta diegimo programa. @@ -1986,35 +2026,35 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. LuksBootKeyFileJob - + Configuring LUKS key file. Konfigūruojamas LUKS raktų failas. - - + + No partitions are defined. Nėra jokių apibrėžtų skaidinių. - - - + + + Encrypted rootfs setup error Šifruoto rootfs sąrankos klaida - + Root partition %1 is LUKS but no passphrase has been set. Šaknies skaidinys %1 yra LUKS, tačiau nebuvo nustatyta jokia slaptafrazė. - + Could not create LUKS key file for root partition %1. Nepavyko šakniniam skaidiniui %1 sukurti LUKS rakto failo. - + Could not configure LUKS key file on partition %1. Nepavyko konfigūruoti LUKS rakto failo skaidinyje %1. @@ -2040,12 +2080,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Map - + Timezone: %1 Laiko juosta: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2057,100 +2097,112 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. NetInstallViewStep - + Package selection Paketų pasirinkimas - + Office software Raštinės programinė įranga - + Office package Raštinės paketas - + Browser software Naršyklės programinė įranga - + Browser package Naršyklės paketas - + Web browser Saityno naršyklė - + Kernel + label for netinstall module, Linux kernel Branduolys - + Services + label for netinstall module, system services Tarnybos - + Login + label for netinstall module, choose login manager Prisijungimas - + Desktop + label for netinstall module, choose desktop environment Darbalaukis - - Applications - Programos - - - + Communication + label for netinstall module Komunikacija - + Development + label for netinstall module Plėtojimas - + Office + label for netinstall module Raštinė - + Multimedia + label for netinstall module Multimedija - + Internet + label for netinstall module Internetas - + Theming + label for netinstall module Apipavidalinimas - + Gaming + label for netinstall module Žaidimai - + Utilities + label for netinstall module Paslaugų programos + + + Applications + Programos + NotesQmlViewStep @@ -2199,24 +2251,24 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Pasirinkite pageidaujamą regioną arba naudokite numatytuosius nustatymus. - - - + + + Timezone: %1 Laiko juosta: %1 - + Select your preferred Zone within your Region. Pasirinkite pageidaujamą sritį regiono ribose. - + Zones Sritys - + You can fine-tune Language and Locale settings below. Žemiau galite derinti kalbos ir lokalės nustatymus. @@ -2509,7 +2561,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Nežinoma klaida - + Password is empty Slaptažodis yra tuščias @@ -2547,22 +2599,6 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Pasirinkite iš sąrašo produktą. Pasirinktas produktas bus įdiegtas. - - PackageChooserQmlViewStep - - - Packages - Paketai - - - - PackageChooserViewStep - - - Packages - Paketai - - PackageModel @@ -3091,7 +3127,7 @@ Išvestis: QObject - + %1 (%2) %1 (%2) @@ -3417,12 +3453,12 @@ Išvestis: ResultsListDialog - + For best results, please ensure that this computer: Norėdami pasiekti geriausių rezultatų, įsitikinkite kad šis kompiuteris: - + System requirements Sistemos reikalavimai @@ -3850,22 +3886,22 @@ Išvestis: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Išsamesnei informacijai apie naudotojų grįžtamąjį ryšį, spustelėkite čia</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Sekimas padeda matyti kaip dažnai yra įdiegiama %1, kokioje aparatinėje įrangoje ji yra įdiegiama bei kokios yra naudojamos programos. Norėdami pamatyti kas bus išsiųsta, šalia kiekvienos srities spustelėkite pagalbos piktogramą. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Tai pažymėdami, išsiųsite informaciją apie savo diegimą ir aparatinę įrangą. Ši informacija bus išsiųsta tik <b>vieną kartą</b>, užbaigus diegimą. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Tai pažymėdami, jūs periodiškai siųsite informaciją apie savo <b>kompiuterio</b> diegimą, aparatinę įrangą ir programas į %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Tai pažymėję, reguliariai į %1 siųsite informaciją apie savo <b>naudotojo</b> diegimą, aparatinę įrangą, programas bei naudojimosi programomis šablonus. @@ -4053,44 +4089,19 @@ Išvestis: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Jus sveikina Calamares sąrankos programa, skirta %1 sistemai.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Jus sveikina %1 sąranka.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Jus sveikina Calamares diegimo programa, skirta %1 sistemai.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Jus sveikina %1 diegimo programa.</h1> - - - %1 support %1 palaikymas - + About %1 setup Apie %1 sąranką - + About %1 installer Apie %1 diegimo programą - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>skirta %3</strong><br/><br/>Autorių teisės 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Autorių teisės 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Dėkojame <a href="https://calamares.io/team/">Calamares komandai</a> ir <a href="https://www.transifex.com/calamares/calamares/">Calamares vertėjų komandai</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> plėtojimą remia <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Išlaisvinanti programinė įranga. - WelcomeQmlViewStep @@ -4155,34 +4166,7 @@ Išvestis: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - skirta %3</strong><br/><br/> - Autorių teisės 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Autorių teisės 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Dėkojame <a href='https://calamares.io/team/'>Calamares komandai</a> - ir <a href='https://www.transifex.com/calamares/calamares/'>Calamares - vertėjų komandai</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - plėtojimą remia <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Išlaisvinanti programinė įranga. - - - + Back Atgal @@ -4287,17 +4271,17 @@ Išvestis: Klaviatūros modelis: - + Layouts Išdėstymai - + Type here to test your keyboard Rašykite čia ir išbandykite savo klaviatūrą - + Variants Variantai @@ -4446,102 +4430,102 @@ Išvestis: Jei šiuo kompiuteriu naudosis keli žmonės, po diegimo galėsite sukurti papildomas paskyras. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Yra leidžiamos tik mažosios raidės, skaitmenys, pabraukimo brūkšniai ir brūkšneliai. - + root is not allowed as username. root neleidžiama naudoti kaip naudotojo vardą. - + What is the name of this computer? Koks šio kompiuterio vardas? - + Computer Name Kompiuterio vardas - + This name will be used if you make the computer visible to others on a network. Šis vardas bus naudojamas, jeigu padarysite savo kompiuterį matomą kitiems naudotojams tinkle. - + localhost is not allowed as hostname. localhost neleidžiama naudoti kaip naudotojo vardą. - + Choose a password to keep your account safe. Apsaugokite savo paskyrą slaptažodžiu - + Password Slaptažodis - + Repeat Password Pakartokite slaptažodį - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Norint įsitikinti, kad rašydami slaptažodį nesuklydote, įrašykite tą patį slaptažodį du kartus. Stiprus slaptažodis yra raidžių, skaičių ir punktuacijos ženklų mišinys, jis turi būti mažiausiai aštuonių simbolių, be to, turėtų būti reguliariai keičiamas. - + Validate passwords quality Tikrinti slaptažodžių kokybę - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Pažymėjus šį langelį, bus atliekamas slaptažodžio stiprumo tikrinimas ir negalėsite naudoti silpną slaptažodį. - + Log in automatically without asking for the password Prisijungti automatiškai, neklausiant slaptažodžio - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Yra leidžiamos tik raidės, skaitmenys, pabraukimo brūkšniai ir brūkšneliai, mažiausiai du simboliai. - + Reuse user password as root password Naudotojo slaptažodį naudoti pakartotinai kaip pagrindinio naudotojo (root) slaptažodį - + Use the same password for the administrator account. Naudoti tokį patį slaptažodį administratoriaus paskyrai. - + Choose a root password to keep your account safe. Pasirinkite pagrindinio naudotojo (root) slaptažodį, kad apsaugotumėte savo paskyrą. - + Root Password Pagrindinio naudotojo (Root) slaptažodis - + Repeat Root Password Pakartokite pagrindinio naudotojo (Root) slaptažodį - + Enter the same password twice, so that it can be checked for typing errors. Norint įsitikinti, kad rašydami slaptažodį nesuklydote, įrašykite tą patį slaptažodį du kartus. diff --git a/lang/calamares_lv.ts b/lang/calamares_lv.ts index 12269c477..55606c4bc 100644 --- a/lang/calamares_lv.ts +++ b/lang/calamares_lv.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -270,7 +289,7 @@ - + (%n second(s)) @@ -279,7 +298,7 @@ - + System-requirements checking is complete. @@ -484,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -528,149 +547,149 @@ The installer will quit and all changes will be lost. - + Select storage de&vice: - - - - + + + + Current: - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -758,27 +777,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -813,97 +832,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -959,11 +978,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1422,6 +1446,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1451,8 +1485,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1541,32 +1575,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1600,12 +1634,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1613,12 +1653,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1658,27 +1698,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1978,35 +2018,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2032,12 +2072,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2047,98 +2087,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2189,24 +2241,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2490,7 +2542,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2528,22 +2580,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3069,7 +3105,7 @@ Output: QObject - + %1 (%2) @@ -3392,12 +3428,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3825,22 +3861,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4028,44 +4064,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4130,23 +4141,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4246,17 +4241,17 @@ Output: - + Layouts - + Type here to test your keyboard - + Variants @@ -4383,102 +4378,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts index 6c360797d..30c0cfa27 100644 --- a/lang/calamares_mk.ts +++ b/lang/calamares_mk.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Готово @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -482,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -526,149 +545,149 @@ The installer will quit and all changes will be lost. - + Select storage de&vice: - - - - + + + + Current: - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -756,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -811,97 +830,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -957,11 +976,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1420,6 +1444,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1449,8 +1483,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1539,32 +1573,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1598,12 +1632,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1611,12 +1651,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1656,27 +1696,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1976,35 +2016,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2030,12 +2070,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2045,98 +2085,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2187,24 +2239,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2479,7 +2531,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2517,22 +2569,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3058,7 +3094,7 @@ Output: QObject - + %1 (%2) @@ -3381,12 +3417,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3814,22 +3850,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4017,44 +4053,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4119,23 +4130,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4235,17 +4230,17 @@ Output: - + Layouts - + Type here to test your keyboard - + Variants @@ -4372,102 +4367,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ml.ts b/lang/calamares_ml.ts index 3341d89c2..fbd5ba644 100644 --- a/lang/calamares_ml.ts +++ b/lang/calamares_ml.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ വിഡ്ജറ്റ് ട്രീ - + Debug information ഡീബഗ് വിവരങ്ങൾ @@ -171,7 +190,7 @@ Calamares::JobThread - + Done പൂർത്തിയായി @@ -261,7 +280,7 @@ <i>%1</i>മൊഡ്യൂളിനായുള്ള ആവശ്യകതകൾ പരിശോധിക്കൽ പൂർത്തിയായിരിക്കുന്നു. - + Waiting for %n module(s). %n മൊഡ്യൂളിനായി കാത്തിരിക്കുന്നു. @@ -269,7 +288,7 @@ - + (%n second(s)) (%1 സെക്കൻഡ്) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. സിസ്റ്റം-ആവശ്യകതകളുടെ പരിശോധന പൂർത്തിയായി. @@ -484,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 സജ്ജീകരണപ്രയോഗം - + %1 Installer %1 ഇൻസ്റ്റാളർ @@ -528,149 +547,149 @@ The installer will quit and all changes will be lost. ഫോം - + Select storage de&vice: സംഭരണിയ്ക്കുള്ള ഉപകരണം തിരഞ്ഞെടുക്കൂ: - - - - + + + + Current: നിലവിലുള്ളത്: - + After: ശേഷം: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>സ്വമേധയാ ഉള്ള പാർട്ടീഷനിങ്</strong><br/>നിങ്ങൾക്ക് സ്വയം പാർട്ടീഷനുകൾ സൃഷ്ടിക്കാനോ വലുപ്പം മാറ്റാനോ കഴിയും. - + Reuse %1 as home partition for %2. %2 നുള്ള ഹോം പാർട്ടീഷനായി %1 വീണ്ടും ഉപയോഗിക്കൂ. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>ചുരുക്കുന്നതിന് ഒരു പാർട്ടീഷൻ തിരഞ്ഞെടുക്കുക, എന്നിട്ട് വലുപ്പം മാറ്റാൻ ചുവടെയുള്ള ബാർ വലിക്കുക. - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 %2MiB ആയി ചുരുങ്ങുകയും %4 ന് ഒരു പുതിയ %3MiB പാർട്ടീഷൻ സൃഷ്ടിക്കുകയും ചെയ്യും. - + Boot loader location: ബൂട്ട് ലോഡറിന്റെ സ്ഥാനം: - + <strong>Select a partition to install on</strong> <strong>ഇൻസ്റ്റാൾ ചെയ്യാനായി ഒരു പാർട്ടീഷൻ തിരഞ്ഞെടുക്കുക</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. ഈ സിസ്റ്റത്തിൽ എവിടെയും ഒരു ഇ.എഫ്.ഐ സിസ്റ്റം പാർട്ടീഷൻ കണ്ടെത്താനായില്ല. %1 സജ്ജീകരിക്കുന്നതിന് ദയവായി തിരികെ പോയി മാനുവൽ പാർട്ടീഷനിംഗ് ഉപയോഗിക്കുക. - + The EFI system partition at %1 will be used for starting %2. %1 ലെ ഇഎഫ്ഐ സിസ്റ്റം പാർട്ടീഷൻ %2 ആരംഭിക്കുന്നതിന് ഉപയോഗിക്കും. - + EFI system partition: ഇഎഫ്ഐ സിസ്റ്റം പാർട്ടീഷൻ - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. ഈ ഡറ്റോറേജ്‌ ഉപകരണത്തിൽ ഒരു ഓപ്പറേറ്റിംഗ് സിസ്റ്റം ഉണ്ടെന്ന് തോന്നുന്നില്ല. നിങ്ങൾ എന്താണ് ചെയ്യാൻ ആഗ്രഹിക്കുന്നത്?<br/>സ്റ്റോറേജ് ഉപകരണത്തിൽ എന്തെങ്കിലും മാറ്റം വരുത്തുന്നതിനുമുമ്പ് നിങ്ങൾക്ക് നിങ്ങളുടെ ചോയ്‌സുകൾ അവലോകനം ചെയ്യാനും സ്ഥിരീകരിക്കാനും കഴിയും.  - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>ഡിസ്ക് മായ്ക്കൂ</strong><br/>ഈ പ്രവൃത്തി തെരെഞ്ഞെടുത്ത സ്റ്റോറേജ് ഉപകരണത്തിലെ എല്ലാ ഡാറ്റയും <font color="red">മായ്‌ച്ച്കളയും</font>. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>ഇതിനൊപ്പം ഇൻസ്റ്റാൾ ചെയ്യുക</strong><br/>%1 ന് ഇടം നൽകുന്നതിന് ഇൻസ്റ്റാളർ ഒരു പാർട്ടീഷൻ ചുരുക്കും. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>ഒരു പാർട്ടീഷൻ പുനഃസ്ഥാപിക്കുക</strong><br/>ഒരു പാർട്ടീഷന് %1 ഉപയോഗിച്ച് പുനഃസ്ഥാപിക്കുന്നു. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. ഈ സ്റ്റോറേജ് ഉപകരണത്തിൽ %1 ഉണ്ട്.നിങ്ങൾ എന്താണ് ചെയ്യാൻ ആഗ്രഹിക്കുന്നത്?<br/>സ്റ്റോറേജ് ഉപകരണത്തിൽ എന്തെങ്കിലും മാറ്റം വരുത്തുന്നതിനുമുമ്പ് നിങ്ങളുടെ ചോയ്‌സുകൾ അവലോകനം ചെയ്യാനും സ്ഥിരീകരിക്കാനും നിങ്ങൾക്ക് കഴിയും. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. ഈ സ്റ്റോറേജ് ഉപകരണത്തിൽ ഇതിനകം ഒരു ഓപ്പറേറ്റിംഗ് സിസ്റ്റം ഉണ്ട്. നിങ്ങൾ എന്താണ് ചെയ്യാൻ ആഗ്രഹിക്കുന്നത്?<br/>സ്റ്റോറേജ് ഉപകരണത്തിൽ എന്തെങ്കിലും മാറ്റം വരുത്തുന്നതിനുമുമ്പ് നിങ്ങൾക്ക് നിങ്ങളുടെ ചോയ്‌സുകൾ അവലോകനം ചെയ്യാനും സ്ഥിരീകരിക്കാനും കഴിയും.  - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. ഈ സ്റ്റോറേജ് ഉപകരണത്തിൽ ഒന്നിലധികം ഓപ്പറേറ്റിംഗ് സിസ്റ്റങ്ങളുണ്ട്. നിങ്ങൾ എന്താണ് ചെയ്യാൻ ആഗ്രഹിക്കുന്നത്?<br/>സ്റ്റോറേജ് ഉപകരണത്തിൽ എന്തെങ്കിലും മാറ്റം വരുത്തുന്നതിനുമുമ്പ് നിങ്ങൾക്ക് നിങ്ങളുടെ ചോയ്‌സുകൾ അവലോകനം ചെയ്യാനും സ്ഥിരീകരിക്കാനും കഴിയും.  - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap സ്വാപ്പ് വേണ്ട - + Reuse Swap സ്വാപ്പ് വീണ്ടും ഉപയോഗിക്കൂ - + Swap (no Hibernate) സ്വാപ്പ് (ഹൈബർനേഷൻ ഇല്ല) - + Swap (with Hibernate) സ്വാപ്പ് (ഹൈബർനേഷനോട് കൂടി) - + Swap to file ഫയലിലേക്ക് സ്വാപ്പ് ചെയ്യുക @@ -758,27 +777,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> കീബോർഡ് മോഡൽ %1 എന്നതായി ക്രമീകരിക്കുക.<br/> - + Set keyboard layout to %1/%2. കീബോർഡ് വിന്യാസം %1%2 എന്നതായി ക്രമീകരിക്കുക. - + Set timezone to %1/%2. - + The system language will be set to %1. സിസ്റ്റം ഭാഷ %1 ആയി സജ്ജമാക്കും. - + The numbers and dates locale will be set to %1. സംഖ്യ & തീയതി രീതി %1 ആയി ക്രമീകരിക്കും. @@ -813,97 +832,97 @@ The installer will quit and all changes will be lost. നെറ്റ്‌വർക്ക് ഇൻസ്റ്റാളേഷൻ. (അപ്രാപ്‌തമാക്കി: പാക്കേജ് ലിസ്റ്റുകൾ നേടാനായില്ല, നിങ്ങളുടെ നെറ്റ്‌വർക്ക് കണക്ഷൻ പരിശോധിക്കുക) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> %1 സജ്ജീകരിക്കുന്നതിനുള്ള ഏറ്റവും കുറഞ്ഞ ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>സജ്ജീകരണം തുടരാനാവില്ല. <a href="#details">വിവരങ്ങൾ...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> %1 ഇൻസ്റ്റാൾ ചെയ്യുന്നതിനുള്ള ഏറ്റവും കുറഞ്ഞ ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>ഇൻസ്റ്റളേഷൻ തുടരാനാവില്ല. <a href="#details">വിവരങ്ങൾ...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. %1 സജ്ജീകരിക്കുന്നതിനുള്ള ചില ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>സജ്ജീകരണം തുടരാം, പക്ഷേ ചില സവിശേഷതകൾ നിഷ്ക്രിയമായിരിക്കാം. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. %1 ഇൻസ്റ്റാൾ ചെയ്യാൻ ശുപാർശ ചെയ്യപ്പെട്ടിട്ടുള്ള ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>ഇൻസ്റ്റളേഷൻ തുടരാം, പക്ഷേ ചില സവിശേഷതകൾ നിഷ്ക്രിയമായിരിക്കാം. - + This program will ask you some questions and set up %2 on your computer. ഈ പ്രക്രിയ താങ്കളോട് ചില ചോദ്യങ്ങൾ ചോദിക്കുകയും %2 താങ്കളുടെ കമ്പ്യൂട്ടറിൽ സജ്ജീകരിക്കുകയും ചെയ്യും. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. നിങ്ങളുടെ ഉപയോക്തൃനാമം വളരെ വലുതാണ്. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. താങ്കളുടെ ഉപയോക്തൃനാമം ഒരു ചെറിയ അക്ഷരമോ അണ്ടർസ്കോറോ ഉപയോഗിച്ച് വേണം തുടങ്ങാൻ. - + Only lowercase letters, numbers, underscore and hyphen are allowed. ചെറിയ അക്ഷരങ്ങൾ, അക്കങ്ങൾ, അണ്ടർസ്കോർ, ഹൈഫൺ എന്നിവയേ അനുവദിച്ചിട്ടുള്ളൂ. - + Your hostname is too short. നിങ്ങളുടെ ഹോസ്റ്റ്നാമം വളരെ ചെറുതാണ് - + Your hostname is too long. നിങ്ങളുടെ ഹോസ്റ്റ്നാമം ദൈർഘ്യമേറിയതാണ് - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. അക്ഷരങ്ങൾ, അക്കങ്ങൾ, അണ്ടർസ്കോർ, ഹൈഫൺ എന്നിവയേ അനുവദിച്ചിട്ടുള്ളൂ. - + Your passwords do not match! നിങ്ങളുടെ പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല! - + OK! @@ -959,11 +978,16 @@ The installer will quit and all changes will be lost. + Packages + പാക്കേജുകൾ + + + Install option: <strong>%1</strong> - + None @@ -1422,6 +1446,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1451,8 +1485,8 @@ The installer will quit and all changes will be lost. രഹസ്യവാചകം സ്ഥിരീകരിക്കുക - - + + Please enter the same passphrase in both boxes. രണ്ട് പെട്ടികളിലും ഒരേ രഹസ്യവാചകം നല്‍കുക, @@ -1541,32 +1575,32 @@ The installer will quit and all changes will be lost. ഇപ്പോൾ റീസ്റ്റാർട്ട് ചെയ്യുക (&R) - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>എല്ലാം പൂർത്തിയായി.</h1><br/>%1 താങ്കളുടെ കമ്പ്യൂട്ടറിൽ സജ്ജമാക്കപ്പെട്ടിരിക്കുന്നു. <br/>താങ്കൾക്ക് താങ്കളുടെ പുതിയ സിസ്റ്റം ഉപയോഗിച്ച് തുടങ്ങാം. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>ഈ ബോക്സിൽ ശെരിയിട്ടാൽ,നിങ്ങളുടെ സിസ്റ്റം <span style="font-style:italic;">പൂർത്തിയായി </span>അമർത്തുമ്പോഴോ സജ്ജീകരണ പ്രോഗ്രാം അടയ്ക്കുമ്പോഴോ ഉടൻ പുനരാരംഭിക്കും. - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>എല്ലാം പൂർത്തിയായി.</h1><br/> %1 നിങ്ങളുടെ കമ്പ്യൂട്ടറിൽ ഇൻസ്റ്റാൾ ചെയ്തു. <br/>നിങ്ങൾക്ക് ഇപ്പോൾ നിങ്ങളുടെ പുതിയ സിസ്റ്റത്തിലേക്ക് പുനരാരംഭിക്കാം അല്ലെങ്കിൽ %2 ലൈവ് എൻവയോൺമെൻറ് ഉപയോഗിക്കുന്നത് തുടരാം. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>ഈ ബോക്സിൽ ശെരിയിട്ടാൽ,നിങ്ങളുടെ സിസ്റ്റം <span style="font-style:italic;">പൂർത്തിയായി </span>അമർത്തുമ്പോഴോ സജ്ജീകരണ പ്രോഗ്രാം അടയ്ക്കുമ്പോഴോ ഉടൻ പുനരാരംഭിക്കും. - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>സജ്ജീകരണം പരാജയപ്പെട്ടു</h1><br/>നിങ്ങളുടെ കമ്പ്യൂട്ടറിൽ %1 സജ്ജമാക്കിയിട്ടില്ല.<br/>പിശക് സന്ദേശം ഇതായിരുന്നു: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>ഇൻസ്റ്റാളേഷൻ പരാജയപ്പെട്ടു</h1><br/> നിങ്ങളുടെ കമ്പ്യൂട്ടറിൽ %1 സജ്ജമാക്കിയിട്ടില്ല.<br/>പിശക് സന്ദേശം ഇതായിരുന്നു: %2. @@ -1600,12 +1634,18 @@ The installer will quit and all changes will be lost. ഫയൽ സിസ്റ്റം <strong>%2</strong> ഉപയോഗിച്ച് %3 MiB പാർട്ടീഷൻ <strong>%1</strong> ഫോർമാറ്റ് ചെയ്യുക. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. ഫയൽ സിസ്റ്റം %2 ഉപയോഗിച്ച് പാർട്ടീഷൻ‌%1 ഫോർമാറ്റ് ചെയ്യുന്നു. - + The installer failed to format partition %1 on disk '%2'. ഡിസ്ക് '%2'ൽ ഉള്ള പാർട്ടീഷൻ‌ %1 ഫോർമാറ്റ് ചെയ്യുന്നതിൽ ഇൻസ്റ്റാളർ പരാജയപ്പെട്ടു. @@ -1613,12 +1653,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space %1 GiB ഡിസ്ക്സ്പെയ്സ് എങ്കിലും ലഭ്യമായിരിക്കണം. - + There is not enough drive space. At least %1 GiB is required. ആവശ്യത്തിനു ഡിസ്ക്സ്പെയ്സ് ലഭ്യമല്ല. %1 GiB എങ്കിലും വേണം. @@ -1658,27 +1698,27 @@ The installer will quit and all changes will be lost. ഇൻസ്റ്റാളർ കാര്യനിർവാഹകരിൽ ഒരാളായിട്ടാണ് (root) പ്രവർത്തിപ്പിക്കുന്നത് - + The setup program is not running with administrator rights. സെറ്റപ്പ് പ്രോഗ്രാം അഡ്മിനിസ്ട്രേറ്റർ അവകാശങ്ങൾ ഇല്ലാതെയാണ് പ്രവർത്തിക്കുന്നത്. - + The installer is not running with administrator rights. ഇൻസ്റ്റാളർ അഡ്മിനിസ്ട്രേറ്റർ അവകാശങ്ങൾ ഇല്ലാതെയാണ് പ്രവർത്തിക്കുന്നത് - + has a screen large enough to show the whole installer മുഴുവൻ ഇൻസ്റ്റാളറും കാണിക്കാൻ തക്ക വലിപ്പമുള്ള ഒരു സ്ക്രീനുണ്ട് - + The screen is too small to display the setup program. സജ്ജീകരണ പ്രയോഗം കാണിക്കാൻ തക്ക വലുപ്പം സ്ക്രീനിനില്ല. - + The screen is too small to display the installer. ഇൻസ്റ്റാളർ കാണിക്കാൻ തക്ക വലുപ്പം സ്ക്രീനിനില്ല. @@ -1978,35 +2018,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. LUKS കീ ഫയൽ ക്രമീകരിക്കുന്നു. - - + + No partitions are defined. പാര്‍ട്ടീഷ്യനുകള്‍ നിര്‍വ്വചിച്ചിട്ടില്ല - - - + + + Encrypted rootfs setup error എന്‍ക്രിപ്റ്റുചെയ്ത റൂട്ട് എഫ്എസ് സജ്ജീകരണത്തില്‍ പ്രശ്നമുണ്ടു് - + Root partition %1 is LUKS but no passphrase has been set. റൂട്ട് പാർട്ടീഷൻ %1 LUKS ആണ് പക്ഷേ രഹസ്യവാക്കൊന്നും ക്രമീകരിച്ചിട്ടില്ല. - + Could not create LUKS key file for root partition %1. റൂട്ട് പാർട്ടീഷൻ %1ന് വേണ്ടി LUKS കീ ഫയൽ നിർമ്മിക്കാനായില്ല. - + Could not configure LUKS key file on partition %1. @@ -2032,12 +2072,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2047,98 +2087,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection പാക്കേജു് തിരഞ്ഞെടുക്കല്‍ - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2189,24 +2241,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2481,7 +2533,7 @@ The installer will quit and all changes will be lost. അപരിചിതമായ പിശക് - + Password is empty രഹസ്യവാക്ക് ശൂന്യമാണ് @@ -2519,22 +2571,6 @@ The installer will quit and all changes will be lost. പട്ടികയിൽ നിന്നും ഒരു ഉത്പന്നം തിരഞ്ഞെടുക്കുക. തിരഞ്ഞെടുത്ത ഉത്പന്നം ഇൻസ്റ്റാൾ ചെയ്യപ്പെടുക. - - PackageChooserQmlViewStep - - - Packages - പാക്കേജുകൾ - - - - PackageChooserViewStep - - - Packages - പാക്കേജുകൾ - - PackageModel @@ -3063,7 +3099,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3386,12 +3422,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: മികച്ച ഫലങ്ങൾക്കായി ഈ കമ്പ്യൂട്ടർ താഴെപ്പറയുന്നവ നിറവേറ്റുന്നു എന്നുറപ്പുവരുത്തുക: - + System requirements സിസ്റ്റം ആവശ്യകതകൾ @@ -3819,22 +3855,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">ഉപയോക്തൃ ഫീഡ്‌ബാക്കിനെക്കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾക്ക് ഇവിടെ ക്ലിക്കുചെയ്യുക</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4022,44 +4058,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>%1 -നായുള്ള കലാമാരേസ് സജ്ജീകരണപ്രക്രിയയിലേയ്ക്ക് സ്വാഗതം.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>%1 സജ്ജീകരണത്തിലേക്ക് സ്വാഗതം.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>%1 -നായുള്ള കലാമാരേസ് ഇൻസ്റ്റാളറിലേക്ക് സ്വാഗതം.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>%1 ഇൻസ്റ്റാളറിലേക്ക് സ്വാഗതം</h1> - - - %1 support %1 പിന്തുണ - + About %1 setup %1 സജ്ജീകരണത്തെക്കുറിച്ച് - + About %1 installer %1 ഇൻസ്റ്റാളറിനെ കുറിച്ച് - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4124,23 +4135,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back പുറകോട്ട് @@ -4240,17 +4235,17 @@ Output: കീബോഡ് മാതൃക: - + Layouts - + Type here to test your keyboard നിങ്ങളുടെ കീബോർഡ് പരിശോധിക്കുന്നതിന് ഇവിടെ ടൈപ്പുചെയ്യുക - + Variants @@ -4377,102 +4372,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. ചെറിയ അക്ഷരങ്ങൾ, അക്കങ്ങൾ, അണ്ടർസ്കോർ, ഹൈഫൺ എന്നിവയേ അനുവദിച്ചിട്ടുള്ളൂ. - + root is not allowed as username. - + What is the name of this computer? ഈ കമ്പ്യൂട്ടറിന്റെ നാമം എന്താണ് ? - + Computer Name കമ്പ്യൂട്ടറിന്റെ പേര് - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. localhost അനുവദനീയമായ ഒരു ഹോസ്റ്റ്‌നെയിം അല്ല. - + Choose a password to keep your account safe. നിങ്ങളുടെ അക്കൗണ്ട് സുരക്ഷിതമായി സൂക്ഷിക്കാൻ ഒരു രഹസ്യവാക്ക് തിരഞ്ഞെടുക്കുക. - + Password രഹസ്യവാക്ക് - + Repeat Password രഹസ്യവാക്ക് വീണ്ടും - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality രഹസ്യവാക്കിന്റെ ഗുണനിലവാരം ഉറപ്പുവരുത്തുക - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. ഈ കള്ളി തിരഞ്ഞെടുക്കുമ്പോൾ, രഹസ്യവാക്കിന്റെ ബലപരിശോധന നടപ്പിലാക്കുകയും, ആയതിനാൽ താങ്കൾക്ക് ദുർബലമായ ഒരു രഹസ്യവാക്ക് ഉപയോഗിക്കാൻ സാധിക്കാതെ വരുകയും ചെയ്യും. - + Log in automatically without asking for the password രഹസ്യവാക്ക് ചോദിക്കാതെ സ്വയം പ്രവേശിക്കുക - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. അക്ഷരങ്ങൾ, അക്കങ്ങൾ, ഹൈഫൻ, അണ്ടർസ്കോർ എന്നിവ മാത്രമേ അനുവദിക്കപ്പെട്ടിട്ടുള്ളൂ, കുറഞ്ഞത് രണ്ടെണ്ണമെങ്കിലും. - + Reuse user password as root password ഉപയോക്തൃ രഹസ്യവാക്ക് റൂട്ട് രഹസ്യവാക്കായി പുനരുപയോഗിക്കുക - + Use the same password for the administrator account. അഡ്മിനിസ്ട്രേറ്റർ അക്കൗണ്ടിനും ഇതേ രഹസ്യവാക്ക് ഉപയോഗിക്കുക. - + Choose a root password to keep your account safe. താങ്കളുടെ അക്കൗണ്ട് സുരക്ഷിതമാക്കാൻ ഒരു റൂട്ട് രഹസ്യവാക്ക് തിരഞ്ഞെടുക്കുക. - + Root Password റൂട്ട് രഹസ്യവാക്ക് - + Repeat Root Password റൂട്ട് രഹസ്യവാക്ക് വീണ്ടും - + Enter the same password twice, so that it can be checked for typing errors. ടൈപ്പിങ്ങ് പിഴവുകളില്ല എന്നുറപ്പിക്കുന്നതിനായി ഒരേ രഹസ്യവാക്ക് രണ്ട് തവണ നൽകുക. diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts index b0df05ff7..64ed5c815 100644 --- a/lang/calamares_mr.ts +++ b/lang/calamares_mr.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information दोषमार्जन माहिती @@ -171,7 +190,7 @@ Calamares::JobThread - + Done पूर्ण झाली @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -482,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 अधिष्ठापक @@ -526,149 +545,149 @@ The installer will quit and all changes will be lost. स्वरुप - + Select storage de&vice: - - - - + + + + Current: सद्या : - + After: नंतर : - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -756,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -811,97 +830,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. तुमचा वापरकर्तानाव खूप लांब आहे - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. तुमचा संगणकनाव खूप लहान आहे - + Your hostname is too long. तुमचा संगणकनाव खूप लांब आहे - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! तुमचा परवलीशब्द जुळत नाही - + OK! @@ -957,11 +976,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1420,6 +1444,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1449,8 +1483,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1539,32 +1573,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1598,12 +1632,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1611,12 +1651,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1656,27 +1696,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1976,35 +2016,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2030,12 +2070,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2045,98 +2085,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2187,24 +2239,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2479,7 +2531,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2517,22 +2569,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3058,7 +3094,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3381,12 +3417,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements प्रणालीची आवशक्यता @@ -3814,22 +3850,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4017,44 +4053,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>‌%1 साठी असलेल्या अधिष्ठापकमध्ये स्वागत आहे.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>‌%1 अधिष्ठापकमधे स्वागत आहे.</h1> - - - %1 support %1 पाठबळ - + About %1 setup - + About %1 installer %1 अधिष्ठापक बद्दल - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4119,23 +4130,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4235,17 +4230,17 @@ Output: - + Layouts - + Type here to test your keyboard - + Variants @@ -4372,102 +4367,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts index 34a1da399..d63580e9f 100644 --- a/lang/calamares_nb.ts +++ b/lang/calamares_nb.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information Debug informasjon @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Ferdig @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -483,12 +502,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Installasjonsprogram @@ -527,149 +546,149 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.Form - + Select storage de&vice: - - - - + + + + Current: - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Manuell partisjonering</strong><br/>Du kan opprette eller endre størrelse på partisjoner selv. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -757,27 +776,27 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. Config - + Set keyboard model to %1.<br/> Sett tastaturmodell til %1.<br/> - + Set keyboard layout to %1/%2. Sett tastaturoppsett til %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -812,97 +831,97 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Denne datamaskinen oppfyller ikke minimumskravene for installering %1.<br/> Installeringen kan ikke fortsette. <a href="#details">Detaljer..</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. Brukernavnet ditt er for langt. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -958,11 +977,16 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1421,6 +1445,16 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1450,8 +1484,8 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - - + + Please enter the same passphrase in both boxes. @@ -1540,32 +1574,32 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.&Start på nytt nå - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Innnstallasjonen mislyktes</h1><br/>%1 har ikke blitt installert på datamaskinen din.<br/>Feilmeldingen var: %2. @@ -1599,12 +1633,18 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formaterer partisjon %1 med filsystem %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1612,12 +1652,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1657,27 +1697,27 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1977,35 +2017,35 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2031,12 +2071,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2046,98 +2086,110 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2188,24 +2240,24 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2480,7 +2532,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.Ukjent feil - + Password is empty @@ -2518,22 +2570,6 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3059,7 +3095,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3382,12 +3418,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements Systemkrav @@ -3815,22 +3851,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4018,44 +4054,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4120,23 +4131,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4236,17 +4231,17 @@ Output: Tastaturmodell: - + Layouts - + Type here to test your keyboard Skriv her for å teste tastaturet ditt - + Variants @@ -4373,102 +4368,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts index ff3da70e3..0a1f2cf22 100644 --- a/lang/calamares_ne_NP.ts +++ b/lang/calamares_ne_NP.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done सकियो @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -482,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -526,149 +545,149 @@ The installer will quit and all changes will be lost. फारम - + Select storage de&vice: - - - - + + + + Current: - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: बूट लोडरको स्थान - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap swap छैन - + Reuse Swap swap पुनः प्रयोग गर्नुहोस - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -756,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -811,97 +830,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> %1 को लागि Calamares Setup Programमा स्वागत छ । - + <h1>Welcome to %1 setup</h1> %1 को Setupमा स्वागत छ । - + <h1>Welcome to the Calamares installer for %1</h1> %1 को लागि Calamares Installerमा स्वागत छ । - + <h1>Welcome to the %1 installer</h1> %1 को Installerमा स्वागत छ । - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! पासवर्डहरू मिलेन ।  - + OK! @@ -957,11 +976,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1420,6 +1444,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1449,8 +1483,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1539,32 +1573,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1598,12 +1632,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1611,12 +1651,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1656,27 +1696,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1976,35 +2016,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2030,12 +2070,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2045,98 +2085,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2187,24 +2239,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2479,7 +2531,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2517,22 +2569,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3058,7 +3094,7 @@ Output: QObject - + %1 (%2) @@ -3381,12 +3417,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3814,22 +3850,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4017,44 +4053,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4119,23 +4130,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4235,17 +4230,17 @@ Output: - + Layouts - + Type here to test your keyboard - + Variants @@ -4372,102 +4367,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts index dff6f478d..c8f46aa1d 100644 --- a/lang/calamares_nl.ts +++ b/lang/calamares_nl.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Widget-boom - + Debug information Debug informatie @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Gereed @@ -261,7 +280,7 @@ Vereistencontrole voor module <i>%1</i> is voltooid. - + Waiting for %n module(s). Wachten op %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) (%n seconde) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. Systeemvereistencontrole is voltooid. @@ -488,12 +507,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. CalamaresWindow - + %1 Setup Program %1 Voorbereidingsprogramma - + %1 Installer %1 Installatieprogramma @@ -532,149 +551,149 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Formulier - + Select storage de&vice: Selecteer &opslagmedium: - - - - + + + + Current: Huidig: - + After: Na: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Handmatig partitioneren</strong><br/>Je maakt of wijzigt zelf de partities. - + Reuse %1 as home partition for %2. Hergebruik %1 als home-partitie voor %2 - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Selecteer een partitie om te verkleinen, en sleep vervolgens de onderste balk om het formaat te wijzigen</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 zal verkleind worden tot %2MiB en een nieuwe %3MiB partitie zal worden aangemaakt voor %4. - + Boot loader location: Bootloader locatie: - + <strong>Select a partition to install on</strong> <strong>Selecteer een partitie om op te installeren</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Er werd geen EFI systeempartitie gevonden op dit systeem. Gelieve terug te gaan en manueel te partitioneren om %1 in te stellen. - + The EFI system partition at %1 will be used for starting %2. De EFI systeempartitie op %1 zal gebruikt worden om %2 te starten. - + EFI system partition: EFI systeempartitie: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Dit opslagmedium lijkt geen besturingssysteem te bevatten. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Wis schijf</strong><br/>Dit zal alle huidige gegevens op de geselecteerd opslagmedium <font color="red">verwijderen</font>. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Installeer ernaast</strong><br/>Het installatieprogramma zal een partitie verkleinen om plaats te maken voor %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Vervang een partitie</strong><br/>Vervangt een partitie met %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Dit opslagmedium bevat %1. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Dit opslagmedium bevat reeds een besturingssysteem. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Dit opslagmedium bevat meerdere besturingssystemen. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Dit opslagmedium bevat al een besturingssysteem, maar de partitietabel <strong>%1</strong> is anders dan het benodigde <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Dit opslagmedium heeft een van de partities <strong>gemount</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Dit opslagmedium maakt deel uit van een <strong>inactieve RAID</strong> apparaat. - + No Swap Geen wisselgeheugen - + Reuse Swap Wisselgeheugen hergebruiken - + Swap (no Hibernate) Wisselgeheugen (geen Sluimerstand) - + Swap (with Hibernate) Wisselgeheugen ( met Sluimerstand) - + Swap to file Wisselgeheugen naar bestand @@ -762,27 +781,27 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Config - + Set keyboard model to %1.<br/> Instellen toetsenbord model naar %1.<br/> - + Set keyboard layout to %1/%2. Instellen toetsenbord lay-out naar %1/%2. - + Set timezone to %1/%2. Zet tijdzone naar %1/%2. - + The system language will be set to %1. De taal van het systeem zal worden ingesteld op %1. - + The numbers and dates locale will be set to %1. De getal- en datumnotatie worden ingesteld op %1. @@ -817,97 +836,97 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Netwerkinstallatie. (Uitgeschakeld: kon de pakketlijsten niet binnenhalen, controleer de netwerkconnectie) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Deze computer voldoet niet aan de minimumvereisten om %1 te installeren.<br/>De voorbereiding kan niet doorgaan. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Deze computer voldoet niet aan de minimumvereisten om %1 te installeren.<br/>De installatie kan niet doorgaan. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Deze computer voldoet niet aan enkele van de aanbevolen specificaties om %1 voor te bereiden.<br/>De installatie kan doorgaan, maar sommige functies kunnen uitgeschakeld zijn. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Deze computer voldoet niet aan enkele van de aanbevolen specificaties om %1 te installeren.<br/>De installatie kan doorgaan, maar sommige functies kunnen uitgeschakeld zijn. - + This program will ask you some questions and set up %2 on your computer. Dit programma stelt je enkele vragen en installeert %2 op jouw computer. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Welkom in het Calamares voorbereidingsprogramma voor %1.</h1> - + <h1>Welcome to %1 setup</h1> <h1>Welkom in het %1 voorbereidingsprogramma.</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Welkom in het Calamares installatieprogramma voor %1.</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Welkom in het %1 installatieprogramma.</h1> - + Your username is too long. De gebruikersnaam is te lang. - + '%1' is not allowed as username. De gebruikersnaam '%1' is niet toegestaan. - + Your username must start with a lowercase letter or underscore. Je gebruikersnaam moet beginnen met een kleine letter of laag streepje. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Alleen kleine letters, nummerse en (laag) streepjes zijn toegestaan. - + Your hostname is too short. De hostnaam is te kort. - + Your hostname is too long. De hostnaam is te lang. - + '%1' is not allowed as hostname. De hostnaam '%1' is niet toegestaan. - + Only letters, numbers, underscore and hyphen are allowed. Alleen letters, nummers en (laag) streepjes zijn toegestaan. - + Your passwords do not match! Je wachtwoorden komen niet overeen! - + OK! @@ -963,11 +982,16 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. + Packages + Pakketten + + + Install option: <strong>%1</strong> - + None @@ -1426,6 +1450,16 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1455,8 +1489,8 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Bevestig wachtwoordzin - - + + Please enter the same passphrase in both boxes. Gelieve in beide velden dezelfde wachtwoordzin in te vullen. @@ -1545,32 +1579,32 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. &Nu herstarten - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Klaar.</h1><br/>%1 is op je computer geïnstalleerd.<br/>Je mag nu beginnen met het gebruiken van je nieuwe systeem. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Wanneer dit vakje aangevinkt is, zal het systeem herstarten van zodra je op <span style=" font-style:italic;">Voltooid</span> klikt, of het voorbereidingsprogramma afsluit.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Klaar.</h1><br/>%1 is op je computer geïnstalleerd.<br/>Je mag je nieuwe systeem nu herstarten of de %2 Live omgeving blijven gebruiken. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Wanneer dit vakje aangevinkt is, zal het systeem herstarten van zodra je op <span style=" font-style:italic;">Voltooid</span> klikt, of het installatieprogramma afsluit.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Installatie Mislukt</h1><br/>%1 werd niet op de computer geïnstalleerd. <br/>De foutboodschap was: %2 - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Installatie Mislukt</h1><br/>%1 werd niet op de computer geïnstalleerd. <br/>De foutboodschap was: %2 @@ -1604,12 +1638,18 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Formatteer <strong>%3MiB</strong> partitie <strong>%1</strong> met bestandsysteem <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Partitie %1 formatteren met bestandssysteem %2. - + The installer failed to format partition %1 on disk '%2'. Installatieprogramma heeft gefaald om partitie %1 op schijf %2 te formateren. @@ -1617,12 +1657,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. GeneralRequirements - + has at least %1 GiB available drive space tenminste %1 GiB vrije schijfruimte heeft - + There is not enough drive space. At least %1 GiB is required. Er is niet genoeg schijfruimte. Tenminste %1 GiB is vereist. @@ -1662,27 +1702,27 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. is het installatieprogramma aan het uitvoeren als administrator (root) - + The setup program is not running with administrator rights. Het voorbereidingsprogramma draait zonder administratorrechten. - + The installer is not running with administrator rights. Het installatieprogramma draait zonder administratorrechten. - + has a screen large enough to show the whole installer heeft een scherm groot genoeg om het hele installatieprogramma te weergeven - + The screen is too small to display the setup program. Het scherm is te klein on het voorbereidingsprogramma te laten zien. - + The screen is too small to display the installer. Het scherm is te klein on het installatieprogramma te laten zien. @@ -1982,35 +2022,35 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. LuksBootKeyFileJob - + Configuring LUKS key file. LUKS-sleutelbestand configureren. - - + + No partitions are defined. Geen partities gedefineerd. - - - + + + Encrypted rootfs setup error Versleutelde rootfs installatiefout - + Root partition %1 is LUKS but no passphrase has been set. Rootpartitie %1 is LUKS maar er is een wachtwoord ingesteld. - + Could not create LUKS key file for root partition %1. Kon het LUKS-sleutelbestand niet aanmaken voor rootpartitie %1. - + Could not configure LUKS key file on partition %1. Kon het LUKS-sleutelbestand niet aanmaken op partitie %1. @@ -2036,12 +2076,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Map - + Timezone: %1 Tijdzone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2051,100 +2091,112 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. NetInstallViewStep - + Package selection Pakketkeuze - + Office software Kantoor software - + Office package Kantoorpakket - + Browser software Browser software - + Browser package Browserpakket - + Web browser Webbrowser - + Kernel + label for netinstall module, Linux kernel Kernel - + Services + label for netinstall module, system services Diensten - + Login + label for netinstall module, choose login manager Login - + Desktop + label for netinstall module, choose desktop environment Desktop - - Applications - Applicaties - - - + Communication + label for netinstall module Communicatie - + Development + label for netinstall module Ontwikkelen - + Office + label for netinstall module Kantoor - + Multimedia + label for netinstall module Multimedia - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Thema - + Gaming + label for netinstall module Spellen - + Utilities + label for netinstall module Gereedschappen + + + Applications + Applicaties + NotesQmlViewStep @@ -2193,24 +2245,24 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. - - - + + + Timezone: %1 Tijdzone: %1 - + Select your preferred Zone within your Region. Selecteer een voorkeurs tijdzone binnen uw regio. - + Zones Zones - + You can fine-tune Language and Locale settings below. U kunt hieronder gedetailleerde taal- en weergave-instellingen kiezen. @@ -2485,7 +2537,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Onbekende fout - + Password is empty Wachtwoord is leeg @@ -2523,22 +2575,6 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Kies een product van de lijst. Het geselecteerde product zal worden geïnstalleerd. - - PackageChooserQmlViewStep - - - Packages - Pakketten - - - - PackageChooserViewStep - - - Packages - Pakketten - - PackageModel @@ -3067,7 +3103,7 @@ Uitvoer: QObject - + %1 (%2) %1 (%2) @@ -3391,12 +3427,12 @@ De installatie kan niet doorgaan. ResultsListDialog - + For best results, please ensure that this computer: Voor de beste resultaten is het aangeraden dat deze computer: - + System requirements Systeemvereisten @@ -3824,22 +3860,22 @@ De installatie kan niet doorgaan. <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Klik hier voor meer informatie over gebruikersfeedback</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Tracken helpt %1 te zien hoe vaak het geïnstalleerd wordt. op welke hardware het geïnstalleerd is en welke applicaties worden gebruikt. Om te zien wat er verzonden wordt, klik het help-pictogram naast elke optie. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Door dit aan te vinken zal er informatie verstuurd worden over jouw installatie en hardware. Deze informatie zal slechts <b> eenmaal</b> verstuurd worden na het afronden van de installatie. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Door dit aan te vinken zal periodiek informatie verstuurd worden naar %1 over je <b>apparaat</b>installatie, hardware en toepassingen. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Door dit aan te vinken zal regelmatig informatie verstuurd worden naar %1 over jouw installatie, hardware, toepassingen en gebruikspatronen. @@ -4027,44 +4063,19 @@ De installatie kan niet doorgaan. - <h1>Welcome to the Calamares setup program for %1.</h1> - Welkome in het Calamares voorbereidingsprogramma voor %1. - - - - <h1>Welcome to %1 setup.</h1> - <h1>Welkom in het %1 installatieprogramma.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Welkom in het Calamares installatieprogramma voor %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Welkom in het %1 installatieprogramma.</h1> - - - %1 support %1 ondersteuning - + About %1 setup Over %1 installatieprogramma. - + About %1 installer Over het %1 installatieprogramma - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>voor %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> Met dank aan <a href="https://calamares.io/team/">het Calamares team</a> en <a href="https://www.transifex.com/calamares/calamares/">het Calamares vertaalteam</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> ontwikkeling gesponsord door <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4129,23 +4140,7 @@ De installatie kan niet doorgaan. about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>voor %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> Met dank aan <a href="https://calamares.io/team/">het Calamares team</a> en <a href="https://www.transifex.com/calamares/calamares/">het Calamares vertaalteam</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> ontwikkeling gesponsord door <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - - + Back Terug @@ -4249,17 +4244,17 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige Toetsenbord model: - + Layouts Indeling - + Type here to test your keyboard Typ hier om uw toetsenbord te testen - + Variants Varianten @@ -4406,102 +4401,102 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige Als meer dan één persoon deze computer zal gebruiken, kan je meerdere accounts aanmaken na installatie. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Alleen kleine letters, nummerse en (laag) streepjes zijn toegestaan. - + root is not allowed as username. - + What is the name of this computer? Wat is de naam van deze computer? - + Computer Name Computer Naam - + This name will be used if you make the computer visible to others on a network. Deze naam zal worden gebruikt als u de computer zichtbaar maakt voor anderen op een netwerk. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Kies een wachtwoord om uw account veilig te houden. - + Password Wachtwoord - + Repeat Password Herhaal wachtwoord - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Voer hetzelfde wachtwoord twee keer in, zodat het gecontroleerd kan worden op tikfouten. Een goed wachtwoord bevat een combinatie van letters, cijfers en leestekens, is ten minste acht tekens lang, en zou regelmatig moeten worden gewijzigd. - + Validate passwords quality Controleer wachtwoorden op gelijkheid - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Wanneer dit vakje is aangevinkt, wachtwoordssterkte zal worden gecontroleerd en je zal geen zwak wachtwoord kunnen gebruiken. - + Log in automatically without asking for the password Automatisch aanmelden zonder wachtwoord te vragen - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password Hergebruik gebruikerswachtwoord als root (administratie) wachtwoord. - + Use the same password for the administrator account. Gebruik hetzelfde wachtwoord voor het administratoraccount. - + Choose a root password to keep your account safe. Kies een root (administratie) wachtwoord om je account veilig te houden. - + Root Password Root (Administratie) Wachtwoord - + Repeat Root Password Herhaal Root Wachtwoord - + Enter the same password twice, so that it can be checked for typing errors. Voer hetzelfde wachtwoord twee keer in, zodat het gecontroleerd kan worden op tikfouten. diff --git a/lang/calamares_oc.ts b/lang/calamares_oc.ts index ad8d41b3a..4e9e88152 100644 --- a/lang/calamares_oc.ts +++ b/lang/calamares_oc.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information Informacions de desbugatge @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Fach @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) (%n segonda) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -482,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer Installador de %1 @@ -526,149 +545,149 @@ The installer will quit and all changes will be lost. - + Select storage de&vice: - - - - + + + + Current: Actual : - + After: Aprèp : - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Emplaçament del gestionari d'aviada : - + <strong>Select a partition to install on</strong> <strong>Seleccionar una particion ont installar</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: Particion sistèma EFI : - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -756,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -811,97 +830,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>La benvenguda al programa d’installacion de Calamares per %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>La benvenguda a la configuracion de %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>La benvenguda a l’installador de Calamares per %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>La benvenguda a l’installador de %1</h1> - + Your username is too long. Vòstre nom d’utilizaire es tròp long. - + '%1' is not allowed as username. « %1 » es pas permés coma nom d’utilizaire. - + Your username must start with a lowercase letter or underscore. Vòstre nom d’utilizaire deu començar per una minuscula o un jonhent bas. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Son solament permeses las letras minusculas, nombres, jonhents basses e los tirets. - + Your hostname is too short. Vòstre nom d’òste es tròp cort. - + Your hostname is too long. Vòstre nom d’òste es tròp long. - + '%1' is not allowed as hostname. « %1 » es pas permés coma nom d’òste. - + Only letters, numbers, underscore and hyphen are allowed. Son solament permeses las letras, nombres, jonhents basses e los tirets. - + Your passwords do not match! Los senhals correspondon pas ! - + OK! D’acòrd ! @@ -957,11 +976,16 @@ The installer will quit and all changes will be lost. + Packages + Paquets + + + Install option: <strong>%1</strong> - + None @@ -1420,6 +1444,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1449,8 +1483,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1539,32 +1573,32 @@ The installer will quit and all changes will be lost. &Reaviar ara - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1598,12 +1632,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1611,12 +1651,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1656,27 +1696,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1976,35 +2016,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2030,12 +2070,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 Fus orari : %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2045,100 +2085,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection Seleccion dels paquets - + Office software - + Office package - + Browser software - + Browser package Percórrer lo paquet - + Web browser Navegador web - + Kernel + label for netinstall module, Linux kernel Nuclèu - + Services + label for netinstall module, system services Servicis - + Login + label for netinstall module, choose login manager Connexion - + Desktop + label for netinstall module, choose desktop environment Burèu - - Applications - Aplicacions - - - + Communication + label for netinstall module Comunicacion - + Development + label for netinstall module Desvolopament - + Office + label for netinstall module Burotica - + Multimedia + label for netinstall module Multimèdia - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Personalizacion - + Gaming + label for netinstall module Jòc - + Utilities + label for netinstall module Utilitaris + + + Applications + Aplicacions + NotesQmlViewStep @@ -2187,24 +2239,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 Fus orari : %1 - + Select your preferred Zone within your Region. - + Zones Zònas - + You can fine-tune Language and Locale settings below. @@ -2479,7 +2531,7 @@ The installer will quit and all changes will be lost. Error desconeguda - + Password is empty Lo senhal es void @@ -2517,22 +2569,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - Paquets - - - - PackageChooserViewStep - - - Packages - Paquets - - PackageModel @@ -3058,7 +3094,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3381,12 +3417,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3814,22 +3850,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4017,44 +4053,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>La benvenguda al programa d’installacion de Calamares per %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>La benvenguda a la configuracion de %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>La benvenguda a l’installador de Calamares per %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>La benvenguda a l’installador de %1.</h1> - - - %1 support Assisténcia %1 - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4119,23 +4130,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back Tornar @@ -4236,17 +4231,17 @@ Output: Modèl de clavièr : - + Layouts Agençament - + Type here to test your keyboard Picatz aicí per ensajar lo clavièr - + Variants @@ -4373,102 +4368,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. Son solament permeses las letras, nombres, jonhents basses e los tirets. - + root is not allowed as username. - + What is the name of this computer? Cossí s’apèla aqueste ordenador ? - + Computer Name Nom de l’ordenador - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password Senhal - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts index d959b2e67..f64b13de8 100644 --- a/lang/calamares_pl.ts +++ b/lang/calamares_pl.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information Informacje debugowania @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Ukończono @@ -261,7 +280,7 @@ - + Waiting for %n module(s). Oczekiwanie na %n moduł. @@ -271,7 +290,7 @@ - + (%n second(s)) @@ -281,7 +300,7 @@ - + System-requirements checking is complete. @@ -487,12 +506,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. CalamaresWindow - + %1 Setup Program - + %1 Installer Instalator %1 @@ -531,149 +550,149 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Formularz - + Select storage de&vice: &Wybierz urządzenie przechowywania: - - - - + + + + Current: Bieżący: - + After: Po: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Ręczne partycjonowanie</strong><br/>Możesz samodzielnie utworzyć lub zmienić rozmiar istniejących partycji. - + Reuse %1 as home partition for %2. Użyj ponownie %1 jako partycji domowej dla %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Wybierz partycję do zmniejszenia, a następnie przeciągnij dolny pasek, aby zmienić jej rozmiar</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Położenie programu rozruchowego: - + <strong>Select a partition to install on</strong> <strong>Wybierz partycję, na której przeprowadzona będzie instalacja</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Nigdzie w tym systemie nie można odnaleźć partycji systemowej EFI. Prosimy się cofnąć i użyć ręcznego partycjonowania dysku do ustawienia %1. - + The EFI system partition at %1 will be used for starting %2. Partycja systemowa EFI na %1 będzie użyta do uruchamiania %2. - + EFI system partition: Partycja systemowa EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. To urządzenie pamięci masowej prawdopodobnie nie posiada żadnego systemu operacyjnego. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Wyczyść dysk</strong><br/>Ta operacja <font color="red">usunie</font> wszystkie dane obecnie znajdujące się na wybranym urządzeniu przechowywania. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Zainstaluj obok siebie</strong><br/>Instalator zmniejszy partycję, aby zrobić miejsce dla %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Zastąp partycję</strong><br/>Zastępowanie partycji poprzez %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. To urządzenie pamięci masowej posiada %1. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. To urządzenie pamięci masowej posiada już system operacyjny. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. To urządzenie pamięci masowej posiada kilka systemów operacyjnych. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap Brak przestrzeni wymiany - + Reuse Swap Użyj ponownie przestrzeni wymiany - + Swap (no Hibernate) Przestrzeń wymiany (bez hibernacji) - + Swap (with Hibernate) Przestrzeń wymiany (z hibernacją) - + Swap to file Przestrzeń wymiany do pliku @@ -761,27 +780,27 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. Config - + Set keyboard model to %1.<br/> Ustaw model klawiatury na %1.<br/> - + Set keyboard layout to %1/%2. Ustaw model klawiatury na %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. Język systemu zostanie ustawiony na %1. - + The numbers and dates locale will be set to %1. Format liczb i daty zostanie ustawiony na %1. @@ -816,97 +835,97 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Instalacja sieciowa. (Wyłączona: Nie można pobrać listy pakietów, sprawdź swoje połączenie z siecią) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Ten komputer nie spełnia minimalnych wymagań, niezbędnych do instalacji %1.<br/>Instalacja nie może być kontynuowana. <a href="#details">Szczegóły...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Ten komputer nie spełnia wszystkich, zalecanych do instalacji %1 wymagań.<br/>Instalacja może być kontynuowana, ale niektóre opcje mogą być niedostępne. - + This program will ask you some questions and set up %2 on your computer. Ten program zada Ci garść pytań i ustawi %2 na Twoim komputerze. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. Twoja nazwa użytkownika jest za długa. - + '%1' is not allowed as username. '%1' nie może zostać użyte jako nazwa użytkownika. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Twoja nazwa komputera jest za krótka. - + Your hostname is too long. Twoja nazwa komputera jest za długa. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Twoje hasła nie są zgodne! - + OK! OK! @@ -962,11 +981,16 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. + Packages + Pakiety + + + Install option: <strong>%1</strong> - + None @@ -1425,6 +1449,16 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1454,8 +1488,8 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Potwierdź hasło - - + + Please enter the same passphrase in both boxes. Użyj tego samego hasła w obu polach. @@ -1544,32 +1578,32 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.&Uruchom ponownie teraz - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Wszystko gotowe.</h1><br/>%1 został zainstalowany na Twoim komputerze.<br/>Możesz teraz ponownie uruchomić komputer, aby przejść do nowego systemu, albo kontynuować używanie środowiska live %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalacja nie powiodła się</h1><br/>Nie udało się zainstalować %1 na Twoim komputerze.<br/>Komunikat o błędzie: %2. @@ -1603,12 +1637,18 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formatowanie partycji %1 z systemem plików %2. - + The installer failed to format partition %1 on disk '%2'. Instalator nie mógł sformatować partycji %1 na dysku '%2'. @@ -1616,12 +1656,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1661,27 +1701,27 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Instalator jest uruchomiony bez praw administratora. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Zbyt niska rozdzielczość ekranu, aby wyświetlić instalator. @@ -1981,35 +2021,35 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. LuksBootKeyFileJob - + Configuring LUKS key file. Konfigurowanie pliku klucza LUKS. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2035,12 +2075,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. Map - + Timezone: %1 Strefa czasowa: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2050,98 +2090,110 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. NetInstallViewStep - + Package selection Wybór pakietów - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2192,24 +2244,24 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. - - - + + + Timezone: %1 Strefa czasowa: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2502,7 +2554,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Nieznany błąd - + Password is empty Hasło jest puste @@ -2540,22 +2592,6 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. - - PackageChooserQmlViewStep - - - Packages - Pakiety - - - - PackageChooserViewStep - - - Packages - Pakiety - - PackageModel @@ -3084,7 +3120,7 @@ Wyjście: QObject - + %1 (%2) %1 (%2) @@ -3408,12 +3444,12 @@ i nie uruchomi się ResultsListDialog - + For best results, please ensure that this computer: Dla osiągnięcia najlepszych rezultatów upewnij się, że ten komputer: - + System requirements Wymagania systemowe @@ -3841,22 +3877,22 @@ i nie uruchomi się <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Naciśnij, aby dowiedzieć się więcej o uzyskiwaniu informacji zwrotnych.</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4044,44 +4080,19 @@ i nie uruchomi się - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - <h1>Witamy w ustawianiu %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Witamy w instalatorze Calamares dla systemu %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Witamy w instalatorze %1.</h1> - - - %1 support Wsparcie %1 - + About %1 setup - + About %1 installer O instalatorze %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4146,23 +4157,7 @@ i nie uruchomi się about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back Wstecz @@ -4262,17 +4257,17 @@ i nie uruchomi się Model klawiatury: - + Layouts - + Type here to test your keyboard Napisz coś tutaj, aby sprawdzić swoją klawiaturę - + Variants @@ -4399,102 +4394,102 @@ i nie uruchomi się - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? Jaka jest nazwa tego komputera? - + Computer Name Nazwa Komputera - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Wybierz hasło, aby chronić swoje konto. - + Password Hasło - + Repeat Password Powtórz Hasło - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. Użyj tego samego hasła dla konta administratora. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index c56666afd..779bf20fb 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Árvore de widgets - + Debug information Informações de depuração @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Concluído @@ -261,23 +280,25 @@ A verificação de requisitos para o módulo <i>%1</i> está completa. - + Waiting for %n module(s). Esperando por %n módulo. Esperando por %n módulos. + Esperando por %n módulos. - + (%n second(s)) (%n segundo) (%n segundos) + (%n segundos) - + System-requirements checking is complete. Verificação de requisitos do sistema completa. @@ -488,12 +509,12 @@ O instalador será fechado e todas as alterações serão perdidas. CalamaresWindow - + %1 Setup Program Programa de configuração %1 - + %1 Installer Instalador %1 @@ -532,149 +553,149 @@ O instalador será fechado e todas as alterações serão perdidas.Formulário - + Select storage de&vice: Selecione o dispositivo de armazenamento: - - - - + + + + Current: Atual: - + After: Depois: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Particionamento manual</strong><br/>Você pode criar ou redimensionar partições. - + Reuse %1 as home partition for %2. Reutilizar %1 como partição home para %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Selecione uma partição para reduzir, então arraste a barra de baixo para redimensionar</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 será reduzida para %2MiB e uma nova partição de %3MiB será criada para %4. - + Boot loader location: Local do gerenciador de inicialização: - + <strong>Select a partition to install on</strong> <strong>Selecione uma partição para instalação</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Uma partição de sistema EFI não pôde ser encontrada neste dispositivo. Por favor, volte e use o particionamento manual para gerenciar %1. - + The EFI system partition at %1 will be used for starting %2. A partição de sistema EFI em %1 será utilizada para iniciar %2. - + EFI system partition: Partição de sistema EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Parece que não há um sistema operacional neste dispositivo de armazenamento. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Apagar disco</strong><br/>Isto <font color="red">excluirá</font> todos os dados presentes atualmente no dispositivo de armazenamento selecionado. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instalar lado a lado</strong><br/>O instalador reduzirá uma partição para liberar espaço para %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Substituir uma partição</strong><br/>Substitui uma partição com %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Este dispositivo de armazenamento possui %1 nele. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Já há um sistema operacional neste dispositivo de armazenamento. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Há diversos sistemas operacionais neste dispositivo de armazenamento. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> O dispositivo de armazenamento já possui um sistema operacional, mas a tabela de partições <strong>%1</strong> é diferente da necessária <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. O dispositivo de armazenamento tem uma de suas partições <strong>montada</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. O dispositivo de armazenamento é parte de um dispositivo <strong>RAID inativo</strong>. - + No Swap Sem swap - + Reuse Swap Reutilizar swap - + Swap (no Hibernate) Swap (sem hibernação) - + Swap (with Hibernate) Swap (com hibernação) - + Swap to file Swap em arquivo @@ -762,27 +783,27 @@ O instalador será fechado e todas as alterações serão perdidas. Config - + Set keyboard model to %1.<br/> Definir o modelo de teclado para %1.<br/> - + Set keyboard layout to %1/%2. Definir o layout do teclado para %1/%2. - + Set timezone to %1/%2. Definir o fuso horário para %1/%2. - + The system language will be set to %1. O idioma do sistema será definido como %1. - + The numbers and dates locale will be set to %1. A localidade dos números e datas será definida como %1. @@ -817,97 +838,97 @@ O instalador será fechado e todas as alterações serão perdidas.Instalação pela Rede. (Desabilitada: Não foi possível adquirir lista de pacotes, verifique sua conexão com a internet) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Este computador não satisfaz os requisitos mínimos para configurar %1.<br/>A configuração não pode continuar. <a href="#details">Detalhes...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Este computador não satisfaz os requisitos mínimos para instalar %1.<br/>A instalação não pode continuar. <a href="#details">Detalhes...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Este computador não satisfaz alguns dos requisitos recomendados para configurar %1.<br/>A configuração pode continuar, mas alguns recursos podem ser desativados. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Este computador não satisfaz alguns dos requisitos recomendados para instalar %1.<br/>A instalação pode continuar, mas alguns recursos podem ser desativados. - + This program will ask you some questions and set up %2 on your computer. Este programa irá fazer-lhe algumas perguntas e configurar %2 no computador. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Bem-vindo ao programa de configuração Calamares para %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Bem-vindo à configuração de %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Bem-vindo ao instalador Calamares para %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Bem-vindo ao instalador de %1</h1> - + Your username is too long. O nome de usuário é grande demais. - + '%1' is not allowed as username. '%1' não é permitido como nome de usuário. - + Your username must start with a lowercase letter or underscore. Seu nome de usuário deve começar com uma letra minúscula ou com um sublinhado. - + Only lowercase letters, numbers, underscore and hyphen are allowed. É permitido apenas letras minúsculas, números, sublinhado e hífen. - + Your hostname is too short. O nome da máquina é muito curto. - + Your hostname is too long. O nome da máquina é muito grande. - + '%1' is not allowed as hostname. '%1' não é permitido como nome da máquina. - + Only letters, numbers, underscore and hyphen are allowed. É permitido apenas letras, números, sublinhado e hífen. - + Your passwords do not match! As senhas não estão iguais! - + OK! OK! @@ -963,11 +984,16 @@ O instalador será fechado e todas as alterações serão perdidas. + Packages + Pacotes + + + Install option: <strong>%1</strong> Instalar opção: <strong>%1</strong> - + None Nenhum @@ -1426,6 +1452,16 @@ O instalador será fechado e todas as alterações serão perdidas.FS Label: Etiqueta do FS: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1455,8 +1491,8 @@ O instalador será fechado e todas as alterações serão perdidas.Confirme a frase-chave - - + + Please enter the same passphrase in both boxes. Por favor, insira a mesma frase-chave nos dois campos. @@ -1545,32 +1581,32 @@ O instalador será fechado e todas as alterações serão perdidas.&Reiniciar agora - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Tudo concluído.</h1><br/>%1 foi configurado no seu computador.<br/>Agora você pode começar a usar seu novo sistema. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Quando essa caixa for marcada, seu sistema irá reiniciar imediatamente quando você clicar em <span style="font-style:italic;">Concluído</span> ou fechar o programa de configuração.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Tudo pronto.</h1><br/>%1 foi instalado no seu computador.<br/>Agora você pode reiniciar seu novo sistema ou continuar usando o ambiente Live %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Quando essa caixa for marcada, seu sistema irá reiniciar imediatamente quando você clicar em <span style="font-style:italic;">Concluído</span> ou fechar o instalador.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>A configuração falhou</h1><br/>%1 não foi configurado no seu computador.<br/>A mensagem de erro foi: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>A instalação falhou</h1><br/>%1 não foi instalado em seu computador.<br/>A mensagem de erro foi: %2. @@ -1604,12 +1640,18 @@ O instalador será fechado e todas as alterações serão perdidas.Formatar partição de <strong>%3MiB</strong> <strong>%1</strong> com o sistema de arquivos <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formatando partição %1 com o sistema de arquivos %2. - + The installer failed to format partition %1 on disk '%2'. O instalador falhou em formatar a partição %1 no disco '%2'. @@ -1617,12 +1659,12 @@ O instalador será fechado e todas as alterações serão perdidas. GeneralRequirements - + has at least %1 GiB available drive space tenha pelo menos %1 GiB disponível de espaço no disco - + There is not enough drive space. At least %1 GiB is required. Não há espaço suficiente no disco. Pelo menos %1 GiB é requerido. @@ -1662,27 +1704,27 @@ O instalador será fechado e todas as alterações serão perdidas.está executando o instalador como administrador (root) - + The setup program is not running with administrator rights. O programa de configuração não está sendo executado com direitos de administrador. - + The installer is not running with administrator rights. O instalador não está sendo executado com permissões de administrador. - + has a screen large enough to show the whole installer tem uma tela grande o suficiente para mostrar todo o instalador - + The screen is too small to display the setup program. A tela é muito pequena para exibir o programa de configuração. - + The screen is too small to display the installer. A tela é muito pequena para exibir o instalador. @@ -1982,35 +2024,35 @@ O instalador será fechado e todas as alterações serão perdidas. LuksBootKeyFileJob - + Configuring LUKS key file. Configurando o arquivo de chave do LUKS. - - + + No partitions are defined. Nenhuma partição está definida. - - - + + + Encrypted rootfs setup error Erro de configuração de rootfs encriptado - + Root partition %1 is LUKS but no passphrase has been set. A partição raiz %1 é LUKS, mas nenhuma senha foi definida. - + Could not create LUKS key file for root partition %1. Não foi possível criar o arquivo de chave LUKS para a partição raiz %1. - + Could not configure LUKS key file on partition %1. Não foi possível configurar a chave LUKS na partição %1. @@ -2036,12 +2078,12 @@ O instalador será fechado e todas as alterações serão perdidas. Map - + Timezone: %1 Fuso horário: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2053,100 +2095,112 @@ O instalador será fechado e todas as alterações serão perdidas. NetInstallViewStep - + Package selection Seleção de pacotes - + Office software Software de office - + Office package Pacote office - + Browser software Softwares de browser - + Browser package Pacote de browser - + Web browser Navegador de internet - + Kernel + label for netinstall module, Linux kernel Kernel - + Services + label for netinstall module, system services Seriços - + Login + label for netinstall module, choose login manager Login - + Desktop + label for netinstall module, choose desktop environment Área de trabalho - - Applications - Aplicações - - - + Communication + label for netinstall module Comunicação - + Development + label for netinstall module Desenvolvimento - + Office + label for netinstall module Escritório - + Multimedia + label for netinstall module Multimídia - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Temas - + Gaming + label for netinstall module Jogos - + Utilities + label for netinstall module Utilitários + + + Applications + Aplicações + NotesQmlViewStep @@ -2195,24 +2249,24 @@ O instalador será fechado e todas as alterações serão perdidas.Selecione sua região preferida ou use as configurações predefinidas. - - - + + + Timezone: %1 Fuso horário: %1 - + Select your preferred Zone within your Region. Selecione a sua Zona preferida dentro da sua Região. - + Zones Zonas - + You can fine-tune Language and Locale settings below. Você pode ajustar as configurações de Idioma e Localidade abaixo. @@ -2295,6 +2349,7 @@ O instalador será fechado e todas as alterações serão perdidas. A senha contém menos que %n letras minúsculas A senha contém menos que %n letras minúsculas + A senha contém menos que %n letras minúsculas @@ -2333,6 +2388,7 @@ O instalador será fechado e todas as alterações serão perdidas. A senha contém menos que %n dígitos A senha contém menos que %n dígitos + A senha contém menos que %n dígitos @@ -2341,6 +2397,7 @@ O instalador será fechado e todas as alterações serão perdidas. A senha contém menos que %n caracteres em maiúsculo A senha contém menos que %n caracteres em maiúsculo + A senha contém menos que %n caracteres em maiúsculo @@ -2349,6 +2406,7 @@ O instalador será fechado e todas as alterações serão perdidas. A senha contém menos que %n caracteres não alfanuméricos A senha contém menos que %n caracteres não alfanuméricos + A senha contém menos que %n caracteres não alfanuméricos @@ -2357,6 +2415,7 @@ O instalador será fechado e todas as alterações serão perdidas. A senha é menor que %n caracteres A senha é menor que %n caracteres + A senha é menor que %n caracteres @@ -2370,6 +2429,7 @@ O instalador será fechado e todas as alterações serão perdidas. A senha contém menos que %n classes de caracteres A senha contém menos que %n classes de caracteres + A senha contém menos que %n classes de caracteres @@ -2378,6 +2438,7 @@ O instalador será fechado e todas as alterações serão perdidas. A senha contém mais que %n caracteres iguais consecutivamente A senha contém mais que %n caracteres iguais consecutivamente + A senha contém mais que %n caracteres iguais consecutivamente @@ -2386,6 +2447,7 @@ O instalador será fechado e todas as alterações serão perdidas. A senha contém mais que %n caracteres da mesma classe consecutivamente A senha contém mais que %n caracteres da mesma classe consecutivamente + A senha contém mais que %n caracteres da mesma classe consecutivamente @@ -2394,6 +2456,7 @@ O instalador será fechado e todas as alterações serão perdidas. A senha contém uma sequência monotônica maior que %n caracteres A senha contém uma sequência monotônica maior que %n caracteres + A senha contém uma sequência monotônica maior que %n caracteres @@ -2487,7 +2550,7 @@ O instalador será fechado e todas as alterações serão perdidas.Erro desconhecido - + Password is empty A senha está em branco @@ -2525,22 +2588,6 @@ O instalador será fechado e todas as alterações serão perdidas.Por favor, escolha um produto da lista. O produto selecionado será instalado. - - PackageChooserQmlViewStep - - - Packages - Pacotes - - - - PackageChooserViewStep - - - Packages - Pacotes - - PackageModel @@ -3069,7 +3116,7 @@ Saída: QObject - + %1 (%2) %1 (%2) @@ -3395,12 +3442,12 @@ Saída: ResultsListDialog - + For best results, please ensure that this computer: Para melhores resultados, por favor, certifique-se de que este computador: - + System requirements Requisitos do sistema @@ -3828,22 +3875,22 @@ Saída: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Clique aqui para mais informações sobre o feedback do usuário</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. O rastreamento ajuda %1 a ver quão frequentemente ele é instalado, em qual hardware ele é instalado e quais aplicações são usadas. Para ver o que será enviado, por favor, clique no ícone de ajuda próximo a cada área. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Ao selecionar isto você enviará informações sobre sua instalação e hardware. Essa informação será enviada apenas <b>uma vez</b> depois que a instalação terminar. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Ao selecionar isto você enviará periodicamente informações sobre a instalação da sua <b>máquina</b>, hardware e aplicações para %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Ao selecionar isto você enviará periodicamente informações sobre a instalação do seu <b>usuário</b>, hardware, aplicações e padrões de uso das aplicações para %1. @@ -4031,44 +4078,19 @@ Saída: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Bem-vindo ao programa de configuração Calamares para %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Bem-vindo à configuração de %1</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Bem-vindo ao instalador Calamares para %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Bem-vindo ao instalador %1.</h1> - - - %1 support %1 suporte - + About %1 setup Sobre a configuração de %1 - + About %1 installer Sobre o instalador %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>para %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Obrigado ao <a href="https://calamares.io/team/">time Calamares</a> e ao <a href="https://www.transifex.com/calamares/calamares/">time de tradutores do Calamares</a>.<br/><br/>O desenvolvimento do <a href="https://calamares.io/">Calamares</a> é patrocinado pela <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4133,34 +4155,7 @@ Saída: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - para %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Obrigado ao <a href='https://calamares.io/team/'>time Calamares</a> - e ao <a href='https://www.transifex.com/calamares/calamares/'>time de - tradutores do Calamares</a>.<br/><br/> - O desenvolvimento do <a href='https://calamares.io/'>Calamares</a> - é patrocinado pela <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back Voltar @@ -4265,17 +4260,17 @@ Saída: Modelo de teclado: - + Layouts Layouts - + Type here to test your keyboard Escreva aqui para testar o seu teclado - + Variants Variantes @@ -4424,102 +4419,102 @@ Saída: Se mais de uma pessoa for usar este computador, você poderá criar múltiplas contas após a instalação. - + Only lowercase letters, numbers, underscore and hyphen are allowed. É permitido apenas letras minúsculas, números, sublinhado e hífen. - + root is not allowed as username. root não é permitido como um nome de usuário. - + What is the name of this computer? Qual é o nome deste computador? - + Computer Name Nome do computador - + This name will be used if you make the computer visible to others on a network. Este nome será usado se você fizer o computador ficar visível para outros numa rede. - + localhost is not allowed as hostname. localhost não é permitido como hostname. - + Choose a password to keep your account safe. Escolha uma senha para manter a sua conta segura. - + Password Senha - + Repeat Password Repita a senha - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação. Uma boa senha contém uma mistura de letras, números e sinais de pontuação, deve ter pelo menos oito caracteres, e deve ser alterada em intervalos regulares. - + Validate passwords quality Validar qualidade das senhas - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quando esta caixa estiver marcada, será feita a verificação da força da senha e você não poderá usar uma senha fraca. - + Log in automatically without asking for the password Entrar automaticamente sem perguntar pela senha - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. São permitidos apenas letras, números, sublinhado e hífen, com no mínimo dois caracteres. - + Reuse user password as root password Reutilizar a senha de usuário como senha de root - + Use the same password for the administrator account. Usar a mesma senha para a conta de administrador. - + Choose a root password to keep your account safe. Escolha uma senha de root para manter sua conta segura. - + Root Password Senha de Root - + Repeat Root Password Repita a Senha de Root - + Enter the same password twice, so that it can be checked for typing errors. Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação. diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index fcdfc65f2..7c50a375a 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + <h1>%1</h1><br/><strong>%2<br/> para %3</strong><br/><br/> + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + Obrigado à <a href="https://calamares.io/team/">equipa do Calamares</a> e à <a href="https://www.transifex.com/calamares/calamares/">equipa de tradutores do Calamares</a>.<br/><br/> O desenvolvimento do <a href="https://calamares.io/">Calamares</a> é patrocinado pela <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + Direitos de autor %1-%2 %3 &lt;%4&gt;<br/> + + AutoMountManagementJob @@ -137,7 +156,7 @@ Árvore de Widgets - + Debug information Informação de depuração @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Concluído @@ -261,23 +280,25 @@ A verificação de requisitos para o módulo <i>%1</i> está completa. - + Waiting for %n module(s). A aguardar por %n módulo(s). A aguardar por %n módulo(s). + A aguardar por %n módulo(s). - + (%n second(s)) (%n segundo(s)) (%n segundo(s)) + (%n segundo(s)) - + System-requirements checking is complete. A verificação de requisitos de sistema está completa. @@ -488,12 +509,12 @@ O instalador será encerrado e todas as alterações serão perdidas. CalamaresWindow - + %1 Setup Program %1 Programa de Instalação - + %1 Installer %1 Instalador @@ -532,149 +553,149 @@ O instalador será encerrado e todas as alterações serão perdidas.Formulário - + Select storage de&vice: Selecione o dis&positivo de armazenamento: - - - - + + + + Current: Atual: - + After: Depois: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Particionamento manual</strong><br/>Pode criar ou redimensionar partições manualmente. - + Reuse %1 as home partition for %2. Reutilizar %1 como partição home para %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Selecione uma partição para encolher, depois arraste a barra de fundo para redimensionar</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 será encolhida para %2MiB e uma nova %3MiB partição será criada para %4. - + Boot loader location: Localização do carregador de arranque: - + <strong>Select a partition to install on</strong> <strong>Selecione uma partição para instalar</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Nenhuma partição de sistema EFI foi encontrada neste sistema. Por favor volte atrás e use o particionamento manual para configurar %1. - + The EFI system partition at %1 will be used for starting %2. A partição de sistema EFI em %1 será usada para iniciar %2. - + EFI system partition: Partição de sistema EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Este dispositivo de armazenamento aparenta não ter um sistema operativo. O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Apagar disco</strong><br/>Isto irá <font color="red">apagar</font> todos os dados atualmente apresentados no dispositivo de armazenamento selecionado. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instalar paralelamente</strong><br/>O instalador irá encolher a partição para arranjar espaço para %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Substituir a partição</strong><br/>Substitui a partição com %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Este dispositivo de armazenamento tem %1 nele. O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Este dispositivo de armazenamento já tem um sistema operativo nele. O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Este dispositivo de armazenamento tem múltiplos sistemas operativos nele, O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> O dispositivo de armazenamento já possui um sistema operativo, mas a tabela de partições <strong>%1</strong> é diferente da necessária <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. O dispositivo de armazenamento tem uma das suas partições <strong>montada</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. O dispositivo de armazenamento é parte de um dispositivo <strong>RAID inativo</strong>. - + No Swap Sem Swap - + Reuse Swap Reutilizar Swap - + Swap (no Hibernate) Swap (sem Hibernação) - + Swap (with Hibernate) Swap (com Hibernação) - + Swap to file Swap para ficheiro @@ -762,27 +783,27 @@ O instalador será encerrado e todas as alterações serão perdidas. Config - + Set keyboard model to %1.<br/> Definir o modelo do teclado para %1.<br/> - + Set keyboard layout to %1/%2. Definir esquema do teclado para %1/%2. - + Set timezone to %1/%2. Definir fuso horário para %1/%2. - + The system language will be set to %1. O idioma do sistema será definido para %1. - + The numbers and dates locale will be set to %1. Os números e datas locais serão definidos para %1. @@ -817,97 +838,97 @@ O instalador será encerrado e todas as alterações serão perdidas.Instalação de rede. (Desativada: Incapaz de buscar listas de pacotes, verifique a sua ligação de rede) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Este computador não satisfaz os requisitos mínimos para configurar %1.<br/>A configuração não pode continuar. <a href="#details">Detalhes...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Este computador não satisfaz os requisitos mínimos para instalar o %1.<br/>A instalação não pode continuar. <a href="#details">Detalhes...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Este computador não satisfaz alguns dos requisitos recomendados para configurar %1.<br/>A configuração pode continuar, mas algumas funcionalidades podem ser desativadas. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Este computador não satisfaz alguns dos requisitos recomendados para instalar o %1.<br/>A instalação pode continuar, mas algumas funcionalidades poderão ser desativadas. - + This program will ask you some questions and set up %2 on your computer. Este programa vai fazer-lhe algumas perguntas e configurar o %2 no seu computador. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Bem-vindo ao programa de configuração do Calamares para %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Bem-vindo à configuração de %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Bem-vindo ao instalador do Calamares para %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Bem-vindo ao instalador do %1</h1> - + Your username is too long. O seu nome de utilizador é demasiado longo. - + '%1' is not allowed as username. '%1' não é permitido como nome de utilizador. - + Your username must start with a lowercase letter or underscore. O seu nome de utilizador deve começar com uma letra minúscula ou underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Apenas letras minúsculas, números, underscore e hífen são permitidos. - + Your hostname is too short. O nome da sua máquina é demasiado curto. - + Your hostname is too long. O nome da sua máquina é demasiado longo. - + '%1' is not allowed as hostname. '%1' não é permitido como nome da máquina. - + Only letters, numbers, underscore and hyphen are allowed. Apenas letras, números, underscore e hífen são permitidos. - + Your passwords do not match! As suas palavras-passe não coincidem! - + OK! OK! @@ -963,11 +984,16 @@ O instalador será encerrado e todas as alterações serão perdidas. + Packages + Pacotes + + + Install option: <strong>%1</strong> Instalar opção: <strong>%1</strong> - + None Nenhum @@ -1426,6 +1452,16 @@ O instalador será encerrado e todas as alterações serão perdidas.FS Label: Identificação do FS: + + + Passphrase for existing partition + Frase-chave para a partição existente + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Não foi possível desencriptar a partição %1 com a frase-chave introduzida. Edite novamente a partição e introduza a frase-chave correta ou elimine e crie uma nova partição encriptada. + EncryptWidget @@ -1455,8 +1491,8 @@ O instalador será encerrado e todas as alterações serão perdidas.Confirmar frase-chave - - + + Please enter the same passphrase in both boxes. Por favor insira a mesma frase-passe em ambas as caixas. @@ -1545,32 +1581,32 @@ O instalador será encerrado e todas as alterações serão perdidas.&Reiniciar agora - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Tudo concluído.</h1><br/>%1 foi configurado no seu computador.<br/>Pode agora começar a utilizar o seu novo sistema. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Quando esta caixa for marcada, o seu sistema irá reiniciar imediatamente quando clicar em <span style="font-style:italic;">Concluído</span> ou fechar o programa de configuração.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Tudo feito</h1><br/>%1 foi instalado no seu computador.<br/>Pode agora reiniciar para o seu novo sistema, ou continuar a usar o %2 ambiente Live. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Quando esta caixa for marcada, o seu sistema irá reiniciar imediatamente quando clicar em <span style="font-style:italic;">Concluído</span> ou fechar o instalador.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Falha na configuração</h1><br/>%1 não foi configurado no seu computador.<br/>A mensagem de erro foi: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalação Falhada</h1><br/>%1 não foi instalado no seu computador.<br/>A mensagem de erro foi: %2. @@ -1604,12 +1640,18 @@ O instalador será encerrado e todas as alterações serão perdidas.Formatar partição de <strong>%3MiB</strong> <strong>%1</strong> com o sistema de ficheiros <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. A formatar partição %1 com sistema de ficheiros %2. - + The installer failed to format partition %1 on disk '%2'. O instalador falhou ao formatar a partição %1 no disco '%2'. @@ -1617,12 +1659,12 @@ O instalador será encerrado e todas as alterações serão perdidas. GeneralRequirements - + has at least %1 GiB available drive space tem pelo menos %1 GiB de espaço livre em disco - + There is not enough drive space. At least %1 GiB is required. Não existe espaço livre suficiente em disco. É necessário pelo menos %1 GiB. @@ -1662,27 +1704,27 @@ O instalador será encerrado e todas as alterações serão perdidas.está a executar o instalador como um administrador (root) - + The setup program is not running with administrator rights. O programa de instalação está agora a correr com direitos de administrador. - + The installer is not running with administrator rights. O instalador não está a ser executado com permissões de administrador. - + has a screen large enough to show the whole installer tem um ecrã grande o suficiente para mostrar todo o instalador - + The screen is too small to display the setup program. O ecrã é demasiado pequeno para mostrar o programa de instalação. - + The screen is too small to display the installer. O ecrã tem um tamanho demasiado pequeno para mostrar o instalador. @@ -1982,35 +2024,35 @@ O instalador será encerrado e todas as alterações serão perdidas. LuksBootKeyFileJob - + Configuring LUKS key file. A configurar o ficheiro chave do LUKS. - - + + No partitions are defined. Nenhuma partição é definida. - - - + + + Encrypted rootfs setup error Erro de configuração do rootfs criptografado - + Root partition %1 is LUKS but no passphrase has been set. A partição root %1 é LUKS, mas nenhuma palavra-passe foi definida. - + Could not create LUKS key file for root partition %1. Não foi possível criar o ficheiro de chave LUKS para a partição root %1. - + Could not configure LUKS key file on partition %1. Não foi possível configurar a chave LUKS na partição %1. @@ -2036,12 +2078,12 @@ O instalador será encerrado e todas as alterações serão perdidas. Map - + Timezone: %1 Fuso horário: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2053,100 +2095,112 @@ O instalador será encerrado e todas as alterações serão perdidas. NetInstallViewStep - + Package selection Seleção de pacotes - + Office software Programas de Escritório - + Office package Pacote de escritório - + Browser software Software de navegação - + Browser package Pacote de navegador - + Web browser Navegador - + Kernel + label for netinstall module, Linux kernel Kernel - + Services + label for netinstall module, system services Serviços - + Login + label for netinstall module, choose login manager Entrar - + Desktop + label for netinstall module, choose desktop environment Ambiente de trabalho - - Applications - Aplicações - - - + Communication + label for netinstall module Comunicação - + Development + label for netinstall module Desenvolvimento - + Office + label for netinstall module Escritório - + Multimedia + label for netinstall module Multimédia - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Temas - + Gaming + label for netinstall module Jogos - + Utilities + label for netinstall module Utilitários + + + Applications + Aplicações + NotesQmlViewStep @@ -2195,24 +2249,24 @@ O instalador será encerrado e todas as alterações serão perdidas.Selecione a sua Região preferida, ou utilize as definições predefinidas. - - - + + + Timezone: %1 Fuso horário: %1 - + Select your preferred Zone within your Region. Selecione a sua Zona preferida dentro da sua Região. - + Zones Zonas - + You can fine-tune Language and Locale settings below. Pode ajustar as definições de Idioma e Localização abaixo. @@ -2295,6 +2349,7 @@ O instalador será encerrado e todas as alterações serão perdidas. A palavra-passe contém menos que %n letra minúscula A palavra-passe contém menos que %n letras minúsculas + A palavra-passe contém menos que %n letras minúsculas @@ -2333,6 +2388,7 @@ O instalador será encerrado e todas as alterações serão perdidas. A palavra-passe contém menos do que %n dígito A palavra-passe contém menos do que %n dígitos + A palavra-passe contém menos do que %n dígitos @@ -2341,6 +2397,7 @@ O instalador será encerrado e todas as alterações serão perdidas. A palavra-passe contém menos do que %n caracter em maiúscula A palavra-passe contém menos do que %n caracteres em maiúsculas + A palavra-passe contém menos do que %n caracteres em maiúsculas @@ -2349,6 +2406,7 @@ O instalador será encerrado e todas as alterações serão perdidas. A palavra-passe contém menos do que %n caracter não alfanumérico A palavra-passe contém menos do que %n caracteres não alfanuméricos + A palavra-passe contém menos do que %n caracteres não alfanuméricos @@ -2357,6 +2415,7 @@ O instalador será encerrado e todas as alterações serão perdidas. A palavra-passe é menor do que %n caracter A palavra-passe é menor do que %n caracteres + A palavra-passe é menor do que %n caracteres @@ -2370,6 +2429,7 @@ O instalador será encerrado e todas as alterações serão perdidas. A palavra-passe contém menos do que %n classe de caracter A palavra-passe contém menos do que %n classes de caracteres + A palavra-passe contém menos do que %n classes de caracteres @@ -2378,6 +2438,7 @@ O instalador será encerrado e todas as alterações serão perdidas. A palavra-passe contém mais do que %n caracter igual consecutivamente A palavra-passe contém mais do que %n caracteres iguais consecutivamente + A palavra-passe contém mais do que %n caracteres iguais consecutivamente @@ -2386,6 +2447,7 @@ O instalador será encerrado e todas as alterações serão perdidas. A palavra-passe contém mais do que %n caracter da mesma classe consecutivamente A palavra-passe contém mais do que %n caracteres da mesma classe consecutivamente + A palavra-passe contém mais do que %n caracteres da mesma classe consecutivamente @@ -2394,6 +2456,7 @@ O instalador será encerrado e todas as alterações serão perdidas. A palavra-passe contém uma sequência monotónica maior do que %n caracter A palavra-passe contém uma sequência monotónica maior do que %n caracteres + A palavra-passe contém uma sequência monotónica maior do que %n caracteres @@ -2487,7 +2550,7 @@ O instalador será encerrado e todas as alterações serão perdidas.Erro desconhecido - + Password is empty Palavra-passe está vazia @@ -2525,22 +2588,6 @@ O instalador será encerrado e todas as alterações serão perdidas.Por favor, escolha um produto da lista. O produto selecionado será instalado. - - PackageChooserQmlViewStep - - - Packages - Pacotes - - - - PackageChooserViewStep - - - Packages - Pacotes - - PackageModel @@ -3069,7 +3116,7 @@ Saída de Dados: QObject - + %1 (%2) %1 (%2) @@ -3395,12 +3442,12 @@ Saída de Dados: ResultsListDialog - + For best results, please ensure that this computer: Para melhores resultados, por favor certifique-se que este computador: - + System requirements Requisitos de sistema @@ -3828,22 +3875,22 @@ Saída de Dados: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Clique aqui para mais informação acerca do relatório do utilizador</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. O rastreio ajuda %1 a ver quão frequentemente ele é instalado, em qual hardware ele é instalado e quais aplicações são utilizadas. Para ver o que será enviado, por favor, clique no ícone de ajuda próximo a cada área. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Ao selecionar isto irá enviar informações sobre a sua instalação e hardware. Esta informação será enviada apenas <b>uma vez</b> depois que a instalação terminar. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Ao selecionar isto irá enviar periodicamente informações sobre a instalação da sua <b>máquina</b>, hardware e aplicações para %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Ao selecionar isto irá enviar periodicamente informações sobre a instalação do seu <b>utilizador</b>, hardware, aplicações e padrões de utilização das aplicações para %1. @@ -4031,44 +4078,19 @@ Saída de Dados: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Bem vindo ao programa de instalação Calamares para %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Bem vindo à instalação de %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Bem vindo ao instalador Calamares para %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Bem vindo ao instalador do %1.</h1> - - - %1 support Suporte do %1 - + About %1 setup Sobre a instalação de %1 - + About %1 installer Acerca do instalador %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>para o %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Obrigado à <a href="https://calamares.io/team/">equipa Calamares</a> e à <a href="https://www.transifex.com/calamares/calamares/">equipa de tradutores do Calamares</a>.<br/><br/>O desenvolvimento do <a href="https://calamares.io/">Calamares</a> é patrocinado pela <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4133,34 +4155,7 @@ Saída de Dados: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - para %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Obrigado à <a href='https://calamares.io/team/'>equipa Calamares</a> - e à <a href='https://www.transifex.com/calamares/calamares/'>equipa de - tradutores do Calamares</a>.<br/><br/> - O desenvolvimento do <a href='https://calamares.io/'>Calamares</a> - é patrocinado pela <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back Voltar @@ -4265,17 +4260,17 @@ Saída de Dados: Modelo do Teclado: - + Layouts Disposições - + Type here to test your keyboard Escreva aqui para testar a configuração do teclado - + Variants Variantes @@ -4424,102 +4419,102 @@ Saída de Dados: Se mais do que uma pessoa utilizar este computador, poderá criar várias contas após a instalação. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Apenas letras minúsculas, números, underscore e hífen são permitidos. - + root is not allowed as username. root não é permitido como nome de utilizador. - + What is the name of this computer? Qual o nome deste computador? - + Computer Name Nome do computador - + This name will be used if you make the computer visible to others on a network. Este nome será utilizado se tornar o computador visível a outros numa rede. - + localhost is not allowed as hostname. localhost não é permitido como "hostname". - + Choose a password to keep your account safe. Escolha uma palavra-passe para manter a sua conta segura. - + Password Palavra-passe - + Repeat Password Repita a palavra-passe - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Introduzir a mesma palavra-passe duas vezes, para que possa ser verificada a existência de erros de escrita. Uma boa palavra-passe conterá uma mistura de letras, números e pontuação, deve ter pelo menos oito caracteres, e deve ser alterada a intervalos regulares. - + Validate passwords quality Validar qualidade das palavras-passe - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quando esta caixa é assinalada, a verificação da força da palavra-passe é feita e não será possível utilizar uma palavra-passe fraca. - + Log in automatically without asking for the password Iniciar sessão automaticamente sem pedir a palavra-passe - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Apenas são permitidas letras, números, sublinhado e hífen, mínimo de dois caracteres. - + Reuse user password as root password Reutilizar palavra-passe de utilizador como palavra-passe de root - + Use the same password for the administrator account. Usar a mesma palavra-passe para a conta de administrador. - + Choose a root password to keep your account safe. Escolha uma palavra-passe de root para manter a sua conta segura. - + Root Password Palavra-passe de root - + Repeat Root Password Repetir palavra-passe de root - + Enter the same password twice, so that it can be checked for typing errors. Introduzir a mesma palavra-passe duas vezes, para que possa ser verificada a existência de erros de escrita. diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts index d113ad1df..a7584e3ab 100644 --- a/lang/calamares_ro.ts +++ b/lang/calamares_ro.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Arborele de widget - + Debug information Informație pentru depanare @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Gata @@ -261,7 +280,7 @@ Verificarea cerințelor de module <i>%1</i> este completă - + Waiting for %n module(s). @@ -270,7 +289,7 @@ - + (%n second(s)) @@ -279,7 +298,7 @@ - + System-requirements checking is complete. @@ -485,12 +504,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. CalamaresWindow - + %1 Setup Program - + %1 Installer Program de instalare %1 @@ -529,149 +548,149 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Formular - + Select storage de&vice: Selectează dispoziti&vul de stocare: - - - - + + + + Current: Actual: - + After: După: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Partiționare manuală</strong><br/>Puteți crea sau redimensiona partițiile. - + Reuse %1 as home partition for %2. Reutilizează %1 ca partiție home pentru %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Selectează o partiție de micșorat, apoi trageți bara din jos pentru a redimensiona</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Locație boot loader: - + <strong>Select a partition to install on</strong> <strong>Selectează o partiție pe care să se instaleze</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. O partiție de sistem EFI nu poate fi găsită nicăieri în acest sistem. Vă rugăm să reveniți și să partiționați manual pentru a seta %1. - + The EFI system partition at %1 will be used for starting %2. Partiția de sistem EFI de la %1 va fi folosită pentru a porni %2. - + EFI system partition: Partiție de sistem EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Acest dispozitiv de stocare nu pare să aibă un sistem de operare instalat. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte să fie realizate schimbări pe dispozitivul de stocare. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Șterge discul</strong><br/>Aceasta va <font color="red">șterge</font> toate datele prezente pe dispozitivul de stocare selectat. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instalează laolaltă</strong><br/>Instalatorul va micșora o partiție pentru a face loc pentru %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Înlocuiește o partiție</strong><br/>Înlocuiește o partiție cu %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Acest dispozitiv de stocare are %1. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte să fie realizate schimbări pe dispozitivul de stocare. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Acest dispozitiv de stocare are deja un sistem de operare instalat. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte de se realiza schimbări pe dispozitivul de stocare. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Acest dispozitiv de stocare are mai multe sisteme de operare instalate. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte de a se realiza schimbări pe dispozitivul de stocare. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -759,27 +778,27 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. Config - + Set keyboard model to %1.<br/> Setează modelul tastaturii la %1.<br/> - + Set keyboard layout to %1/%2. Setează aranjamentul de tastatură la %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. Limba sistemului va fi %1. - + The numbers and dates locale will be set to %1. Formatul numerelor și datelor calendaristice va fi %1. @@ -814,97 +833,97 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Instalarea rețelei. (Dezactivat: Nu se pot obține listele de pachete, verificați conexiunea la rețea) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Acest calculator nu satisface cerințele minimale pentru instalarea %1.<br/>Instalarea nu poate continua. <a href="#details">Detalii...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Acest calculator nu satisface unele din cerințele recomandate pentru instalarea %1.<br/>Instalarea poate continua, dar unele funcții ar putea fi dezactivate. - + This program will ask you some questions and set up %2 on your computer. Acest program vă va pune mai multe întrebări și va seta %2 pe calculatorul dumneavoastră. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. Numele de utilizator este prea lung. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Hostname este prea scurt. - + Your hostname is too long. Hostname este prea lung. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Parolele nu se potrivesc! - + OK! @@ -960,11 +979,16 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1423,6 +1447,16 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1452,8 +1486,8 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Confirmă fraza secretă - - + + Please enter the same passphrase in both boxes. Introduceți aceeași frază secretă în ambele căsuțe. @@ -1542,32 +1576,32 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.&Repornește acum - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Gata.</h1><br/>%1 a fost instalat pe calculatorul dumneavoastră.<br/>Puteți reporni noul sistem, sau puteți continua să folosiți sistemul de operare portabil %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalarea a eșuat</h1><br/>%1 nu a mai fost instalat pe acest calculator.<br/>Mesajul de eroare era: %2. @@ -1601,12 +1635,18 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Se formatează partiția %1 cu sistemul de fișiere %2. - + The installer failed to format partition %1 on disk '%2'. Programul de instalare nu a putut formata partiția %1 pe discul „%2”. @@ -1614,12 +1654,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1659,27 +1699,27 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Programul de instalare nu rulează cu privilegii de administrator. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Ecranu este prea mic pentru a afișa instalatorul. @@ -1979,35 +2019,35 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2033,12 +2073,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2048,98 +2088,110 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. NetInstallViewStep - + Package selection Selecția pachetelor - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2190,24 +2242,24 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2494,7 +2546,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Eroare necunoscuta - + Password is empty @@ -2532,22 +2584,6 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3076,7 +3112,7 @@ Output QObject - + %1 (%2) %1 (%2) @@ -3399,12 +3435,12 @@ Output ResultsListDialog - + For best results, please ensure that this computer: Pentru rezultate optime, asigurați-vă că acest calculator: - + System requirements Cerințe de sistem @@ -3832,22 +3868,22 @@ Output <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Clic aici pentru mai multe informații despre feedback-ul de la utilizatori</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4035,44 +4071,19 @@ Output - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Bun venit în programul de instalare Calamares pentru %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Bine ați venit la programul de instalare pentru %1.</h1> - - - %1 support %1 suport - + About %1 setup - + About %1 installer Despre programul de instalare %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4137,23 +4148,7 @@ Output about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4253,17 +4248,17 @@ Output Modelul tastaturii: - + Layouts - + Type here to test your keyboard Tastați aici pentru a testa tastatura - + Variants @@ -4390,102 +4385,102 @@ Output - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? Care este numele calculatorului? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Alegeți o parolă pentru a menține contul în siguranță. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. Folosește aceeași parolă pentru contul de administrator. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts index 6ea11589c..a17bc4b8b 100644 --- a/lang/calamares_ru.ts +++ b/lang/calamares_ru.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -109,12 +128,12 @@ Reloads the stylesheet from the branding directory. - + Перезапуск стилей из помеченного каталога Uploads the session log to the configured pastebin. - + Загрузка журнала сессии на pastebin. @@ -129,7 +148,7 @@ Displays the tree of widget names in the log (for stylesheet debugging). - + Отображает дерево имен виджетов в журнале (для отладки стилей). @@ -137,7 +156,7 @@ Дерево виджетов - + Debug information Отладочная информация @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Готово @@ -261,7 +280,7 @@ Проверка требований для модуля <i>%1</i> завершена. - + Waiting for %n module(s). Ожидание %n модуля. @@ -271,7 +290,7 @@ - + (%n second(s)) (%n секунда) @@ -281,7 +300,7 @@ - + System-requirements checking is complete. Проверка соответствия системным требованиям завершена. @@ -335,7 +354,11 @@ %1 Link copied to clipboard - + Журнал установки отправлен в + +%1 + +Ссылка скопирована @@ -487,12 +510,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Программа установки %1 - + %1 Installer Программа установки %1 @@ -502,12 +525,12 @@ The installer will quit and all changes will be lost. Set filesystem label on %1. - + Добавить метку файловой системы на %1. Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>. - + Добавить метку файловой системы <strong>%1</strong> на раздел <strong>%2</strong>. @@ -531,149 +554,149 @@ The installer will quit and all changes will be lost. Форма - + Select storage de&vice: Выбрать устройство &хранения: - - - - + + + + Current: Текущий: - + After: После: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Ручная разметка</strong><br/>Вы можете самостоятельно создавать разделы или изменять их размеры. - + Reuse %1 as home partition for %2. Использовать %1 как домашний раздел для %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Выберите раздел для уменьшения, затем двигайте ползунок, изменяя размер</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 будет уменьшен до %2MB и новый раздел %3MB будет создан для %4. - + Boot loader location: Расположение загрузчика: - + <strong>Select a partition to install on</strong> <strong>Выберите раздел для установки</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Не найдено системного раздела EFI. Пожалуйста, вернитесь назад и выполните ручную разметку %1. - + The EFI system partition at %1 will be used for starting %2. Системный раздел EFI на %1 будет использован для запуска %2. - + EFI system partition: Системный раздел EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Видимо, на этом устройстве нет операционной системы. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Стереть диск</strong><br/>Это <font color="red">удалит</font> все данные, которые сейчас находятся на выбранном устройстве. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Установить рядом</strong><br/>Программа установки уменьшит раздел, чтобы освободить место для %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Заменить раздел</strong><br/>Меняет раздел на %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. На этом устройстве есть %1. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. На этом устройстве уже есть операционная система. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. На этом устройстве есть несколько операционных систем. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + Этот накопитель данных уже имеет операционную систему на нём, но разметка диска <strong>%1</strong> отличается от нужной <strong>%2</strong>. <br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + Этот накопитель данных имеет один из его разделов, <strong>который смонтирован</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + Этот накопитель данных является частью <strong>неактивного устройства RAID</strong> . - + No Swap Без раздела подкачки - + Reuse Swap Использовать существующий раздел подкачки - + Swap (no Hibernate) Swap (без Гибернации) - + Swap (with Hibernate) Swap (с Гибернацией) - + Swap to file Файл подкачки @@ -683,17 +706,17 @@ The installer will quit and all changes will be lost. Successfully unmounted %1. - + Успешно размонтирован %1. Successfully disabled swap %1. - + Успешно отключен раздел swap %1. Successfully cleared swap %1. - + Успешно очищен раздел swap %1. @@ -761,27 +784,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Установить модель клавиатуры на %1.<br/> - + Set keyboard layout to %1/%2. Установить раскладку клавиатуры на %1/%2. - + Set timezone to %1/%2. Установить часовой пояс на %1/%2 - + The system language will be set to %1. Системным языком будет установлен %1. - + The numbers and dates locale will be set to %1. Региональным форматом чисел и дат будет установлен %1. @@ -798,12 +821,12 @@ The installer will quit and all changes will be lost. Network Installation. (Disabled: Internal error) - + Сетевая установка. (Отключено: Внутренняя ошибка) Network Installation. (Disabled: No package list) - + Сетевая установка. (Отключено: Нет списка пакетов). @@ -816,99 +839,99 @@ The installer will quit and all changes will be lost. Установка по сети. (Отключено: не удается получить список пакетов, проверьте сетевое подключение) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Этот компьютер не соответствует минимальным требованиям для установки %1.<br/>Невозможно продолжить установку. <a href="#details">Подробнее...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Этот компьютер не соответствует минимальным требованиям для установки %1.<br/>Невозможно продолжить установку. <a href="#details">Подробнее...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Этот компьютер соответствует не всем рекомендуемым требованиям для установки %1.<br/>Можно продолжить установку, но некоторые возможности могут быть недоступны. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Этот компьютер соответствует не всем рекомендуемым требованиям для установки %1.<br/>Можно продолжить установку, но некоторые возможности могут быть недоступны. - + This program will ask you some questions and set up %2 on your computer. Эта программа задаст вам несколько вопросов и поможет установить %2 на ваш компьютер. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Добро пожаловать в программу установки Calamares для %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Добро пожаловать в программу установки %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Добро пожаловать в программу установки Calamares для %1 .</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Добро пожаловать в программу установки %1 .</h1> - + Your username is too long. Ваше имя пользователя слишком длинное. - + '%1' is not allowed as username. '%1' нельзя использовать как имя пользователя - + Your username must start with a lowercase letter or underscore. Ваше имя пользователя должно начинаться со строчной буквы или подчеркивания. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Допускаются только строчные буквы, числа, символы подчёркивания и дефисы. - + Your hostname is too short. Имя вашего компьютера слишком коротко. - + Your hostname is too long. Имя вашего компьютера слишком длинное. - + '%1' is not allowed as hostname. '%1' нельзя использовать как имя хоста - + Only letters, numbers, underscore and hyphen are allowed. Допускаются только буквы, цифры, символы подчёркивания и дефисы. - + Your passwords do not match! Пароли не совпадают! - + OK! - + Успешно! @@ -923,12 +946,12 @@ The installer will quit and all changes will be lost. The setup of %1 did not complete successfully. - + Настройка %1 завершена неудачно. The installation of %1 did not complete successfully. - + Установка %1 завершена неудачно. @@ -962,13 +985,18 @@ The installer will quit and all changes will be lost. - Install option: <strong>%1</strong> - + Packages + Пакеты - + + Install option: <strong>%1</strong> + Опция установки: <strong>%1</strong> + + + None - + Нет @@ -1084,7 +1112,7 @@ The installer will quit and all changes will be lost. Mountpoint must start with a <tt>/</tt>. - + Точка монтирования должна начинаться с <tt>/</tt>. @@ -1425,6 +1453,16 @@ The installer will quit and all changes will be lost. FS Label: Метка ФС: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1454,8 +1492,8 @@ The installer will quit and all changes will be lost. Подтвердите пароль - - + + Please enter the same passphrase in both boxes. Пожалуйста, введите один и тот же пароль в оба поля. @@ -1465,7 +1503,7 @@ The installer will quit and all changes will be lost. Details: - + Детали: @@ -1544,32 +1582,32 @@ The installer will quit and all changes will be lost. П&ерезагрузить - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Готово.</h1><br/>Система %1 установлена на ваш компьютер.<br/>Можете перезагрузить компьютер и начать использовать вашу новую систему. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Если этот флажок установлен, ваша система будет перезагружена сразу после нажатия кнопки <span style="font-style:italic;">Готово</span> или закрытия программы установки.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Готово.</h1><br/>Система %1 установлена на Ваш компьютер.<br/>Вы можете перезагрузить компьютер и использовать Вашу новую систему или продолжить работу в Live окружении %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Если этот флажок установлен, ваша система будет перезагружена сразу после нажатия кнопки <span style=" font-style:italic;">Готово</span> или закрытия программы установки.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Сбой установки</h1><br/>Система %1 не была установлена на ваш компьютер.<br/>Сообщение об ошибке: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Сбой установки</h1><br/>Не удалось установить %1 на ваш компьютер.<br/>Сообщение об ошибке: %2. @@ -1603,12 +1641,18 @@ The installer will quit and all changes will be lost. Форматировать раздел <strong>%1</strong> размером <strong>%3MB</strong> с файловой системой <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Форматируется раздел %1 под файловую систему %2. - + The installer failed to format partition %1 on disk '%2'. Программе установки не удалось отформатировать раздел %1 на диске '%2'. @@ -1616,12 +1660,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space доступно как минимум %1 ГБ свободного дискового пространства - + There is not enough drive space. At least %1 GiB is required. Недостаточно места на дисках. Необходимо как минимум %1 ГБ. @@ -1661,27 +1705,27 @@ The installer will quit and all changes will be lost. запуск установщика с правами администратора (root) - + The setup program is not running with administrator rights. Программа установки запущена без прав администратора. - + The installer is not running with administrator rights. Программа установки не запущена с привилегиями администратора. - + has a screen large enough to show the whole installer экран достаточно большой, чтобы показать установщик полностью - + The screen is too small to display the setup program. Экран слишком маленький, чтобы отобразить программу установки. - + The screen is too small to display the installer. Экран слишком маленький, чтобы отобразить окно установщика. @@ -1816,12 +1860,12 @@ The installer will quit and all changes will be lost. No rootMountPoint is set. - + Не задано rootMountPoint. No configFilePath is set. - + Не задано configFilePath. @@ -1967,7 +2011,7 @@ The installer will quit and all changes will be lost. Quit - + Выход @@ -1981,35 +2025,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. Конфигурация файла ключа LUKS. - - + + No partitions are defined. Разделы не были заданы. - - - + + + Encrypted rootfs setup error Ошибка шифрования корневой файловой системы - + Root partition %1 is LUKS but no passphrase has been set. Корневой раздел %1 это LUKS, но ключ шифрования не был задан. - + Could not create LUKS key file for root partition %1. Не удалось создать файл ключа LUKS для корневого раздела %1. - + Could not configure LUKS key file on partition %1. Не удалось настроить файл ключа LUKS на разделе %1. @@ -2035,12 +2079,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 Часовой пояс: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2050,100 +2094,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection Выбор пакетов - + Office software Офисное программное обеспечение - + Office package Офисный пакет - + Browser software Браузерное программное обеспечение - + Browser package Браузерный пакет - + Web browser Веб-браузер - + Kernel + label for netinstall module, Linux kernel Ядро - + Services + label for netinstall module, system services Сервисы - + Login + label for netinstall module, choose login manager Вход - + Desktop + label for netinstall module, choose desktop environment Рабочий стол - - Applications - Приложения - - - + Communication + label for netinstall module Общение - + Development + label for netinstall module Разработка - + Office + label for netinstall module Офис - + Multimedia + label for netinstall module Мультимедиа - + Internet + label for netinstall module Интернет - + Theming + label for netinstall module Темы - + Gaming + label for netinstall module Игры - + Utilities + label for netinstall module Утилиты + + + Applications + Приложения + NotesQmlViewStep @@ -2192,24 +2248,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 Часовой пояс: %1 - + Select your preferred Zone within your Region. Выберите ваш предпочитаемый пояс в регионе - + Zones Пояса - + You can fine-tune Language and Locale settings below. @@ -2502,7 +2558,7 @@ The installer will quit and all changes will be lost. Неизвестная ошибка - + Password is empty Пустой пароль @@ -2540,22 +2596,6 @@ The installer will quit and all changes will be lost. Пожалуйста, выберите продукт из списка. Выбранный продукт будет установлен. - - PackageChooserQmlViewStep - - - Packages - Пакеты - - - - PackageChooserViewStep - - - Packages - Пакеты - - PackageModel @@ -3084,7 +3124,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3408,12 +3448,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: Для наилучших результатов, убедитесь, что этот компьютер: - + System requirements Системные требования @@ -3679,7 +3719,7 @@ Output: Configure <pre>sudo</pre> users. - + Настройка пользователей <pre>sudo</pre>. @@ -3833,7 +3873,7 @@ Output: <html><head/><body><p>Click here to send <span style=" font-weight:600;">no information at all</span> about your installation.</p></body></html> - + <html><head/><body><p>Нажмите сюда, чтобы не отправлять <span style=" font-weight:600;">информацию за всю </span>установку.</p></body></html> @@ -3841,22 +3881,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Щелкните здесь чтобы узнать больше об отзывах пользователей</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -3884,7 +3924,7 @@ Output: No rootMountPoint is set. - + Не задано rootMountPoint. @@ -4044,44 +4084,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Добро пожаловать в программу установки Calamares для %1 .</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Добро пожаловать в программу установки %1 .</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Добро пожаловать в установщик Calamares для %1 .</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Добро пожаловать в программу установки %1 .</h1> - - - %1 support %1 поддержка - + About %1 setup О установке %1 - + About %1 installer О программе установки %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> Благодарим<a href="https://calamares.io/team/">команду Calamares </a> и <a href="https://www.transifex.com/calamares/calamares/">команду10команду переводчиков Calamares</a>.<br/><br/>Разработка <a href="https://calamares.io/">Calamares</a> спонсирована <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4140,29 +4155,13 @@ Output: The output was: - + Вывод: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back Назад @@ -4221,7 +4220,7 @@ Output: Close - + Закрыть @@ -4262,17 +4261,17 @@ Output: Тип клавиатуры: - + Layouts Раскладки - + Type here to test your keyboard Эта область - для тестирования клавиатуры - + Variants Варианты @@ -4400,102 +4399,102 @@ Output: Если этот компьютер используется несколькими людьми, Вы сможете создать соответствующие учетные записи сразу после установки. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Допускаются только строчные буквы, числа, символы подчёркивания и дефисы. - + root is not allowed as username. root не допускается в качестве имени пользователя. - + What is the name of this computer? Какое имя у компьютера? - + Computer Name Имя компьютера - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. localhost не допускается в качестве имени пользователя. - + Choose a password to keep your account safe. Выберите пароль для защиты вашей учетной записи. - + Password Пароль - + Repeat Password Повторите пароль - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Когда этот флажок установлен, выполняется проверка надежности пароля, и вы не сможете использовать слабый пароль. - + Log in automatically without asking for the password Входить автоматически, не спрашивая пароль - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password Использовать пароль пользователя как пароль суперпользователя - + Use the same password for the administrator account. Использовать тот же пароль для аккаунта администратора. - + Choose a root password to keep your account safe. - + Root Password Пароль суперпользователя - + Repeat Root Password Повторите пароль от root - + Enter the same password twice, so that it can be checked for typing errors. Введите пароль повторно, чтобы не допустить ошибок при вводе diff --git a/lang/calamares_si.ts b/lang/calamares_si.ts index 6290abe1a..7f1505f70 100644 --- a/lang/calamares_si.ts +++ b/lang/calamares_si.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ විජට් ගස - + Debug information දෝශ නිරාකරණ තොරතුරු @@ -171,7 +190,7 @@ Calamares::JobThread - + Done අවසන් @@ -261,7 +280,7 @@ <strong>%1</strong> මොඩියුලය සඳහා අවශ්‍යතා පරීක්ෂා කිරීම සම්පූර්ණයි. - + Waiting for %n module(s). %n මොඩියුල(ය) සඳහා රැඳී සිටිමි @@ -269,7 +288,7 @@ - + (%n second(s)) (තත්පර %n) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. පද්ධති අවශ්‍යතා පරීක්ෂා කිරීම සම්පූර්ණයි. @@ -488,12 +507,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 සැකසුම් වැඩසටහන - + %1 Installer %1 ස්ථාපකය @@ -532,149 +551,149 @@ The installer will quit and all changes will be lost. පෝරමය - + Select storage de&vice: ගබඩා උපාංගය තෝරන්න: - - - - + + + + Current: වත්මන්: - + After: පසු: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>අතින් කොටස් කිරීම</strong> <br/>ඔබට අවශ්‍ය අකාරයට කොටස් සෑදීමට හෝ ප්‍රමාණය වෙනස් කිරීමට හැකිය. - + Reuse %1 as home partition for %2. %2 සඳහා නිවෙස් කොටස ලෙස %1 නැවත භාවිත කරන්න. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>ප්‍රමාණය අඩුකිරීමට කොටසක් තෝරන්න, පසුව ප්‍රමාණය වෙනස් කිරීමට පහළ තීරුව අදින්න</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 %2MiB දක්වා ප්‍රමාණය අඩුකරනු ඇති අතර %4 සඳහා නව %3MiB කොටසක් සාදනු ඇත. - + Boot loader location: ඇරඹුම් කාරක ස්ථානය: - + <strong>Select a partition to install on</strong> <strong>ස්ථාපනය කිරීමට කොටසක් තෝරන්න</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. EFI පද්ධති කොටසක් මෙම පද්ධතියේ කොතැනකවත් සොයාගත නොහැක. කරුණාකර ආපසු ගොස් %1 පිහිටුවීමට අතින් කොටස් කිරීම භාවිතා කරන්න. - + The EFI system partition at %1 will be used for starting %2. %2 ආරම්භ කිරීම සඳහා %1 හි EFI පද්ධති කොටස භාවිතා කරනු ඇත. - + EFI system partition: EFI පද්ධති කොටස: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. මෙම ගබඩා උපාංගයේ මෙහෙයුම් පද්ධතියක් ඇති බවක් නොපෙනේ. ඔබ කුමක් කිරීමට කැමතිද? <br/>ගබඩා උපාංගයට කිසියම් වෙනසක් සිදු කිරීමට පෙර ඔබට ඔබේ තේරීම් සමාලෝචනය කර තහවුරු කිරීමට හැකි වනු ඇත. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>තැටිය මැකීම</strong><br/>මෙම තෝරාගත් ගබඩා උපාංගයේ දැනට පවතින සියලුම දත්ත <strong>මැකීයනු</strong> ඇත. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>පසෙකින් ස්ථාපනය කිරීම</strong><br/>ස්ථාපකය %1 සඳහා ඉඩ ලබා දීම සඳහා කොටසක් හැකිලෙනු ඇත. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>කොටසක් ප්‍රතිස්ථාපනය කිරීම</strong><br/> %1 සමඟ කොටසක් ප්‍රතිස්ථාපනය කරන්න. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. මෙම ගබඩා උපාංගයේ %1 ඇත. ඔබ කුමක් කිරීමට කැමතිද?<br/>ගබඩා උපාංගයට කිසියම් වෙනසක් සිදු කිරීමට පෙර ඔබට ඔබේ තේරීම් සමාලෝචනය කර තහවුරු කිරීමට හැකි වනු ඇත. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. මෙම ගබඩා උපාංගයේ දැනටමත් මෙහෙයුම් පද්ධතියක් ඇත. ඔබ කුමක් කිරීමට කැමතිද?<br/>ගබඩා උපාංගයට කිසියම් වෙනසක් සිදු කිරීමට පෙර ඔබට ඔබේ තේරීම් සමාලෝචනය කර තහවුරු කිරීමට හැකි වනු ඇත. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. මෙම ගබඩා උපාංගයේ බහු මෙහෙයුම් පද්ධති ඇත. ඔබ කුමක් කිරීමට කැමතිද?<br/>ගබඩා උපාංගයට කිසියම් වෙනසක් සිදු කිරීමට පෙර ඔබට ඔබේ තේරීම් සමාලෝචනය කර තහවුරු කිරීමට හැකි වනු ඇත. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> මෙම ගබඩා උපාංගයේ දැනටමත් මෙහෙයුම් පද්ධතියක් ඇත, නමුත් %1 කොටස් වගුව අවශ්‍ය %2 ට වඩා වෙනස් වේ. - + This storage device has one of its partitions <strong>mounted</strong>. මෙම ගබඩා උපාංගය, එහි එක් කොටසක් <strong>සවි කර ඇත</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. මෙම ගබඩා උපාංගය <strong>අක්‍රිය RAID</strong> උපාංගයක කොටසකි. - + No Swap Swap නොමැතිව - + Reuse Swap Swap නැවත භාවිතා කරන්න - + Swap (no Hibernate) Swap (හයිබර්නේට් නොමැතිව) - + Swap (with Hibernate) Swap (හයිබර්නේට් සහිතව) - + Swap to file Swap ගොනුව @@ -762,27 +781,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> යතුරුපුවරු ආකෘතිය %1 ලෙස සකසන්න. - + Set keyboard layout to %1/%2. යතුරුපුවරු පිරිසැලසුම %1/%2 ලෙස සකසන්න. - + Set timezone to %1/%2. වේලා කලාපය %1/%2 ලෙස සකසන්න. - + The system language will be set to %1. පද්ධති භාෂාව %1 ලෙස සැකසෙනු ඇත. - + The numbers and dates locale will be set to %1. අංක සහ දින පෙදෙසිය %1 ලෙස සකසනු ඇත. @@ -817,97 +836,97 @@ The installer will quit and all changes will be lost. ජාල ස්ථාපනය. (අක්‍රියයි: පැකේජ ලැයිස්තු ලබා ගැනීමට නොහැක, ඔබගේ ජාල සම්බන්ධතාවය පරීක්ෂා කරන්න) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> මෙම පරිගණකය %1 පිහිටුවීම සඳහා අවම අවශ්‍යතා සපුරාලන්නේ නැත. <br/>පිහිටුවීම දිගටම කරගෙන යා නොහැක. <strong>විස්තර...</strong> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> මෙම පරිගණකය %1 ස්ථාපනය සඳහා අවම අවශ්‍යතා සපුරාලන්නේ නැත. <br/>ස්ථාපනය දිගටම කරගෙන යා නොහැක. <strong>විස්තර...</strong> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. මෙම පරිගණකය %1 පිහිටුවීම සඳහා නිර්දේශිත සමහර අවශ්‍යතා සපුරාලන්නේ නැත. <br/>පිහිටුවීම දිගටම කරගෙන යා හැක, නමුත් සමහර විශේෂාංග ක්‍රියා විරහිත විය හැක. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. මෙම පරිගණකය %1 ස්ථාපනය කිරීම සඳහා නිර්දේශිත සමහර අවශ්‍යතා සපුරාලන්නේ නැත. <br/>ස්ථාපනය දිගටම කරගෙන යා හැක, නමුත් සමහර විශේෂාංග ක්‍රියා විරහිත විය හැක. - + This program will ask you some questions and set up %2 on your computer. මෙම වැඩසටහන ඔබෙන් ප්‍රශ්න කිහිපයක් අසන අතර ඔබේ පරිගණකයේ %2 සකසනු ඇත. - + <h1>Welcome to the Calamares setup program for %1</h1> <strong>%1 සඳහා Calamares සැකසුම් වැඩසටහන වෙත සාදරයෙන් පිළිගනිමු</strong> - + <h1>Welcome to %1 setup</h1> <strong>%1 පිහිටුවීමට සාදරයෙන් පිළිගනිමු</strong> - + <h1>Welcome to the Calamares installer for %1</h1> <strong>%1 සඳහා Calamares ස්ථාපකය වෙත සාදරයෙන් පිළිගනිමු</strong> - + <h1>Welcome to the %1 installer</h1> <strong>%1 ස්ථාපකය වෙත සාදරයෙන් පිළිගනිමු</strong> - + Your username is too long. පරිශීලක නාමය දිග වැඩිය. - + '%1' is not allowed as username. '%1' පරිශීලක නාමයක් ලෙස ඉඩ නොදේ. - + Your username must start with a lowercase letter or underscore. ඔබගේ පරිශීලක නාමය කුඩා අකුරකින් හෝ යටි ඉරකින් ආරම්භ විය යුතුය. - + Only lowercase letters, numbers, underscore and hyphen are allowed. කුඩා අකුරු, ඉලක්කම්, යටි ඉරි සහ තනි ඉර පමණක් ඉඩ දෙනු ලැබේ. - + Your hostname is too short. ඔබගේ සත්කාරක නාමය කෙටි වැඩිය. - + Your hostname is too long. ඔබේ සත්කාරක නාමය දිග වැඩියි. - + '%1' is not allowed as hostname. '%1' ධාරක නාමය ලෙස ඉඩ නොදේ. - + Only letters, numbers, underscore and hyphen are allowed. අකුරු, ඉලක්කම්, යටි ඉරි සහ තනි ඉර පමණක් ඉඩ දෙනු ලැබේ. - + Your passwords do not match! ඔබගේ මුරපද නොගැලපේ! - + OK! හරි! @@ -963,11 +982,16 @@ The installer will quit and all changes will be lost. + Packages + පැකේජ + + + Install option: <strong>%1</strong> ස්ථාපන විකල්පය: <strong>%1</strong> - + None කිසිවක් නැත @@ -1426,6 +1450,16 @@ The installer will quit and all changes will be lost. FS Label: FS ලේබලය: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1455,8 +1489,8 @@ The installer will quit and all changes will be lost. මුරපදය තහවුරු කරන්න - - + + Please enter the same passphrase in both boxes. කරුණාකර කොටු දෙකෙහිම එකම මුර-වැකිකඩ ඇතුලත් කරන්න. @@ -1545,32 +1579,32 @@ The installer will quit and all changes will be lost. නැවත ආරම්භ කරන්න (&R) - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <strong>සියල්ල සාර්ථකව අවසන් විය</strong>.<br>%1 ඔබගේ පරිගණකයේ පිහිටුවා ඇත.<br>ඔබට දැන් ඔබගේ නව පද්ධතිය භාවිතා කිරීමට පටන් ගත හැක. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>මෙම කොටුව සලකුණු කළ විට, ඔබ <strong>Done</strong> මත ක්ලික් කළ විට හෝ සැකසුම් වැඩසටහන වසා දැමූ විට ඔබේ පද්ධතිය වහාම නැවත ආරම්භ වනු ඇත.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <strong>සියල්ල සාර්ථකව අවසන් විය</strong>.<br>%1 ඔබගේ පරිගණකයේ ස්ථාපනය කර ඇත.<br>ඔබට දැන් ඔබගේ නව පද්ධතියට නැවත ආරම්භ කළ හැක, නැතහොත් %2 සජීවී පරිසරය භාවිතා කිරීම දිගටම කරගෙනයා හැක. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>මෙම කොටුව සලකුණු කළ විට, ඔබ <strong>Done</strong> මත ක්ලික් කළ විට හෝ ස්ථාපක වැඩසටහන වසා දැමූ විට ඔබේ පද්ධතිය වහාම නැවත ආරම්භ වනු ඇත.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <strong>පිහිටුවීම අසාර්ථක විය</strong><br>% 1 ඔබේ පරිගණකයේ පිහිටුවා නැත. <br>දෝෂ පණිවිඩය වූයේ: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <strong>ස්ථාපනය අසාර්ථක විය</strong><br>%1 ඔබේ පරිගණකයේ ස්ථාපනය කර නැත. <br>දෝෂ පණිවිඩය වූයේ: %2. @@ -1604,12 +1638,18 @@ The installer will quit and all changes will be lost. <strong>%3MiB</strong> කොටස <strong>%1</strong> ගොනු පද්ධතිය <strong>%2</strong> සමඟ ආකෘති කරන්න. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. %2 ගොනු පද්ධතිය සමඟ %1 කොටස හැඩතල ගැන්වීම. - + The installer failed to format partition %1 on disk '%2'. ස්ථාපකය '%2' තැටියේ %1 කොටස හැඩතල ගැන්වීමට අසමත් විය. @@ -1617,12 +1657,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space අවම වශයෙන් %1 GiB ලබා ගත හැකි ධාවකයේ ඉඩක් ඇත - + There is not enough drive space. At least %1 GiB is required. ප්‍රමාණවත් ධාවන ඉඩක් නොමැත. අවම වශයෙන් %1 GiB අවශ්‍ය වේ. @@ -1662,27 +1702,27 @@ The installer will quit and all changes will be lost. ස්ථාපකය පරිපාලකයෙකු ලෙස ධාවනය කරයි (root) - + The setup program is not running with administrator rights. සැකසුම් වැඩසටහන පරිපාලක අයිතිවාසිකම් සමඟ ක්‍රියාත්මක නොවේ. - + The installer is not running with administrator rights. ස්ථාපකය පරිපාලක අයිතිවාසිකම් සමඟ ක්‍රියාත්මක නොවේ. - + has a screen large enough to show the whole installer සම්පූර්ණ ස්ථාපකය පෙන්වීමට තරම් විශාල තිරයක් ඇත - + The screen is too small to display the setup program. සැකසුම් වැඩසටහන ප්‍රදර්ශනය කිරීමට තිරය කුඩා වැඩිය. - + The screen is too small to display the installer. ස්ථාපකය වෙත පෙන්වීමට තිරය කුඩා වැඩිය. @@ -1982,35 +2022,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. LUKS යතුරු ගොනුව වින්‍යාස කරමින්. - - + + No partitions are defined. කොටස් නිර්වචනය කර නොමැත. - - - + + + Encrypted rootfs setup error සංකේතනය කරන ලද rootfs පිහිටුවීමේ දෝෂයකි - + Root partition %1 is LUKS but no passphrase has been set. මූල කොටස %1 LUKS වන නමුත් මුර-වැකිකඩක් සකසා නොමැත. - + Could not create LUKS key file for root partition %1. මූල කොටස %1 සඳහා LUKS යතුරු ගොනුව සෑදිය නොහැක. - + Could not configure LUKS key file on partition %1. %1 කොටසේ LUKS යතුරු ගොනුව වින්‍යාස කිරීමට නොහැකි විය. @@ -2036,12 +2076,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 වේලා කලාපය:% 1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2053,100 +2093,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection පැකේජ තේරීම - + Office software කාර්යාලීය මෘදුකාංගය - + Office package කාර්යාලීය ඇසුරුම - + Browser software අතිරික්සු මෘදුකාංගය - + Browser package අතිරික්සු ඇසුරුම - + Web browser වියමන අතිරික්සුව - + Kernel + label for netinstall module, Linux kernel කර්නලය - + Services + label for netinstall module, system services සේවා - + Login + label for netinstall module, choose login manager පිවිසෙන්න - + Desktop + label for netinstall module, choose desktop environment ඩෙස්ක්ටොප් - - Applications - යෙදුම් - - - + Communication + label for netinstall module සන්නිවේදනය - + Development + label for netinstall module සංවර්ධනය - + Office + label for netinstall module කාර්යාලීය - + Multimedia + label for netinstall module බහුමාධ්‍ය - + Internet + label for netinstall module අන්තර්ජාලය - + Theming + label for netinstall module තේමා කිරීම - + Gaming + label for netinstall module පරිගණක ක්රීඩා - + Utilities + label for netinstall module උපයෝගිතා + + + Applications + යෙදුම් + NotesQmlViewStep @@ -2195,24 +2247,24 @@ The installer will quit and all changes will be lost. ඔබ කැමති කලාපය තෝරන්න, නැතහොත් පෙරනිමි සැකසුම් භාවිතා කරන්න. - - - + + + Timezone: %1 වේලා කලාපය:% 1 - + Select your preferred Zone within your Region. ඔබ කැමති කලාපය තෝරන්න. - + Zones කලාපය: - + You can fine-tune Language and Locale settings below. ඔබට පහත භාෂාව සහ ස්ථාන සැකසීම් මනාව සකස් කළ හැක. @@ -2487,7 +2539,7 @@ The installer will quit and all changes will be lost. නොදන්නා දෝෂයකි - + Password is empty මුරපදය හිස් ය @@ -2525,22 +2577,6 @@ The installer will quit and all changes will be lost. කරුණාකර ලැයිස්තුවෙන් නිෂ්පාදනයක් තෝරන්න. තෝරාගත් නිෂ්පාදනය ස්ථාපනය කෙරේ. - - PackageChooserQmlViewStep - - - Packages - පැකේජ - - - - PackageChooserViewStep - - - Packages - පැකේජ - - PackageModel @@ -3069,7 +3105,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3395,12 +3431,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: හොඳම ප්‍රතිඵල සඳහා, කරුණාකර මෙම පරිගණකය සහතික කර ගන්න: - + System requirements පද්ධති අවශ්යතා @@ -3828,22 +3864,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">පරිශීලක ප්‍රතිපෝෂණ පිළිබඳ වැඩි විස්තර සඳහා මෙතැන ක්ලික් කරන්න</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. ලුහුබැඳීම %1 හට එය කොපමණ වාරයක් ස්ථාපනය කර ඇත්ද, කුමන දෘඩාංග මත ස්ථාපනය කර ඇත්ද සහ කුමන යෙදුම් භාවිතා කරන්නේද යන්න බැලීමට උපකාරී වේ. යවන්නේ කුමක් දැයි බැලීමට, එක් එක් ප්‍රදේශයට යාබදව ඇති උදවු නිරූපකය ක්ලික් කරන්න. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. මෙය තේරීමෙන් ඔබ ඔබේ ස්ථාපනය සහ දෘඪාංග පිළිබඳ තොරතුරු එවනු ඇත. ස්ථාපනය අවසන් වූ පසු මෙම තොරතුරු <b>එක් වරක්</b> පමණක් යවනු ලැබේ. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. මෙය තේරීමෙන් ඔබ විසින් ඔබේ <b>යන්ත්‍ර</b> ස්ථාපනය, දෘඪාංග සහ යෙදුම් පිළිබඳ තොරතුරු වරින් වර %1 වෙත යවනු ලැබේ. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. මෙය තේරීමෙන් ඔබ ඔබේ <b>පරිශීලක</b> ස්ථාපනය, දෘඪාංග, යෙදුම්, සහ යෙදුම් භාවිත රටා, %1 වෙත නිතිපතා යවනු ලැබේ. @@ -4031,44 +4067,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>%1 සඳහා Calamares සැකසුම් වැඩසටහන වෙත සාදරයෙන් පිළිගනිමු.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>%1 පිහිටුවීමට සාදරයෙන් පිළිගනිමු.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>%1 සඳහා Calamares ස්ථාපකය වෙත සාදරයෙන් පිළිගනිමු.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>%1 ස්ථාපකය වෙත සාදරයෙන් පිළිගනිමු.</h1> - - - %1 support %1 සහාය - + About %1 setup %1 පිහිටුවීම ගැන - + About %1 installer %1 ස්ථාපකය ගැන - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/> සඳහා %3</strong><br/><br/>ප්‍රකාශන හිමිකම 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>ප්‍රකාශන හිමිකම 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/><a href="https://calamares.io/team/">Calamares කණ්ඩායමට</a> සහ <a href="https://www.transifex.com/calamares/calamares/">Calamares පරිවර්තකයන් සංවර්ධන කණ්ඩායමට</a> ස්තුතියි. <a href="https://calamares.io/">Calamares</a> සංවර්ධනය සඳහා අනුග්‍රහය දක්වන්නේ <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software විසිනි. - WelcomeQmlViewStep @@ -4133,34 +4144,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - <a href='https://calamares.io/team/'>Calamares කණ්ඩායමට</a> ස්තුතියි - සහ <a href='https://www.transifex.com/calamares/calamares/'>Calamares - පරිවර්තක කණ්ඩායම</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - සංවර්ධනය අනුග්‍රහය දක්වනුයේ<br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back ආපසු @@ -4265,17 +4249,17 @@ Output: යතුරුපුවරු ආකෘතිය: - + Layouts පිරිසැලසුම් - + Type here to test your keyboard ඔබේ යතුරු පුවරුව පරීක්ෂා කිරීමට මෙහි ටයිප් කරන්න - + Variants ප්‍රභේද @@ -4424,102 +4408,102 @@ Output: මෙම පරිගණකය එක් අයෙකුට වඩා භාවිතා කරන්නේ නම්, ස්ථාපනය කිරීමෙන් පසු ඔබට ගිණුම් කිහිපයක් සෑදිය හැක. - + Only lowercase letters, numbers, underscore and hyphen are allowed. කුඩා අකුරු, ඉලක්කම්, යටි ඉරි සහ තනි ඉර පමණක් ඉඩ දෙනු ලැබේ. - + root is not allowed as username. root පරිශීලක නාමයක් ලෙස අවසර නැත. - + What is the name of this computer? මෙම පරිගණකයේ නම කුමක්ද? - + Computer Name පරිගණක නම - + This name will be used if you make the computer visible to others on a network. ඔබ පරිගණකය ජාලයක අන් අයට පෙනෙන ලෙස සලස්වන්නේ නම් මෙම නම භාවිතා වේ. - + localhost is not allowed as hostname. localhost සත්කාරක නාමය ලෙස භාවිතයට අවසර නැත. - + Choose a password to keep your account safe. ඔබගේ ගිණුම ආරක්ෂිතව තබා ගැනීමට මුරපදයක් තෝරන්න. - + Password රහස් පදය - + Repeat Password මුරපදය නැවත ඇතුල් කරන්න - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. එකම මුරපදය දෙවරක් ඇතුල් කරන්න, එවිට එය ටයිප් කිරීමේ දෝෂ සඳහා පරීක්ෂා කළ හැක. හොඳ මුරපදයක අකුරු, ඉලක්කම් සහ විරාම ලකුණු මිශ්‍රණයක් අඩංගු වන අතර, අවම වශයෙන් අක්ෂර අටක්වත් දිග විය යුතු අතර නියමිත කාල පරාසයන්හිදී වෙනස් කළ යුතුය. - + Validate passwords quality මුරපදවල ගුණාත්මකභාවය තහවුරු කරන්න - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. මෙම කොටුව සලකුණු කළ විට, මුරපදය-ශක්තිය පරීක්ෂා කිරීම සිදු කරනු ලබන අතර ඔබට දුර්වල මුරපදයක් භාවිතා කිරීමට නොහැකි වනු ඇත. - + Log in automatically without asking for the password මුරපදය ඉල්ලන්නේ නැතිව ස්වයංක්‍රීයව ලොග් වන්න - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. අකුරු, ඉලක්කම්, යටි ඉරි සහ යටි ඉරි පමණක් ඉඩ දෙනු ලැබේ, අවම වශයෙන් අක්ෂර දෙකක්. - + Reuse user password as root password පරිශීලක මුරපදය root මුරපදය ලෙස නැවත භාවිතා කරන්න - + Use the same password for the administrator account. පරිපාලක ගිණුම සඳහා එකම මුරපදය භාවිතා කරන්න. - + Choose a root password to keep your account safe. ඔබගේ ගිණුම ආරක්ෂිතව තබා ගැනීමට root මුරපදයක් තෝරන්න. - + Root Password Root මුරපදය - + Repeat Root Password Root මුරපදය නැවත ඇතුල් කරන්න - + Enter the same password twice, so that it can be checked for typing errors. එකම මුරපදය දෙවරක් ඇතුල් කරන්න, එවිට එය ටයිප් කිරීමේ දෝෂ සඳහා පරීක්ෂා කළ හැක. diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts index 4a9c0dcbb..50ff9d432 100644 --- a/lang/calamares_sk.ts +++ b/lang/calamares_sk.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Strom miniaplikácií - + Debug information Ladiace informácie @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Hotovo @@ -261,7 +280,7 @@ Kontrola požiadaviek modulu <i>%1</i> je dokončená. - + Waiting for %n module(s). Čaká sa na %n modul. @@ -271,7 +290,7 @@ - + (%n second(s)) (%n sekunda) @@ -281,7 +300,7 @@ - + System-requirements checking is complete. Kontrola systémových požiadaviek je dokončená. @@ -488,12 +507,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. CalamaresWindow - + %1 Setup Program Inštalačný program distribúcie %1 - + %1 Installer Inštalátor distribúcie %1 @@ -532,150 +551,150 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Forma - + Select storage de&vice: Vyberte úložné &zariadenie: - - - - + + + + Current: Teraz: - + After: Potom: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Ručné rozdelenie oddielov</strong><br/>Môžete vytvoriť alebo zmeniť veľkosť oddielov podľa seba. - + Reuse %1 as home partition for %2. Opakované použitie oddielu %1 ako domovského pre distribúciu %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Vyberte oddiel na zmenšenie a potom potiahnutím spodného pruhu zmeňte veľkosť</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. Oddiel %1 bude zmenšený na %2MiB a nový %3MiB oddiel bude vytvorený pre distribúciu %4. - + Boot loader location: Umiestnenie zavádzača: - + <strong>Select a partition to install on</strong> <strong>Vyberte oddiel, na ktorý sa má inštalovať</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. 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. - + The EFI system partition at %1 will be used for starting %2. Oddie lsystému EFI na %1 bude použitý na spustenie distribúcie %2. - + EFI system partition: Oddiel systému EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Zdá sa, že toto úložné zariadenie neobsahuje operačný systém. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Vymazanie disku</strong><br/>Týmto sa <font color="red">odstránia</font> všetky údaje momentálne sa nachádzajúce na vybranom úložnom zariadení. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Inštalácia popri súčasnom systéme</strong><br/>Inštalátor zmenší oddiel a uvoľní miesto pre distribúciu %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Nahradenie oddielu</strong><br/>Nahradí oddiel distribúciou %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Toto úložné zariadenie obsahuje operačný systém %1. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Toto úložné zariadenie už obsahuje operačný systém. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Toto úložné zariadenie obsahuje viacero operačných systémov. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Toto úložné zariadenie už obsahuje operačný systém, ale tabuľka oddielov <strong>%1</strong> sa líši od požadovanej <strong>%2</strong>. <br/> - + This storage device has one of its partitions <strong>mounted</strong>. Toto úložné zariadenie má jeden zo svojich oddielov <strong>pripojený</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Toto úložné zariadenie je súčasťou zariadenia s <strong>neaktívnym RAIDom</strong>. - + No Swap Bez odkladacieho priestoru - + Reuse Swap Znovu použiť odkladací priestor - + Swap (no Hibernate) Odkladací priestor (bez hibernácie) - + Swap (with Hibernate) Odkladací priestor (s hibernáciou) - + Swap to file Odkladací priestor v súbore @@ -763,27 +782,27 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Config - + Set keyboard model to %1.<br/> Nastavenie modelu klávesnice na %1.<br/> - + Set keyboard layout to %1/%2. Nastavenie rozloženia klávesnice na %1/%2. - + Set timezone to %1/%2. Nastavenie časovej zóny na %1/%2. - + The system language will be set to %1. Jazyk systému bude nastavený na %1. - + The numbers and dates locale will be set to %1. Miestne nastavenie čísel a dátumov bude nastavené na %1. @@ -818,97 +837,97 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Sieťová inštalácia. (Zakázaná: Nie je možné získať zoznamy balíkov. Skontrolujte vaše sieťové pripojenie.) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Tento počítač nespĺňa minimálne požiadavky pre inštaláciu distribúcie %1.<br/>Inštalácia nemôže pokračovať. <a href="#details">Podrobnosti...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Tento počítač nespĺňa minimálne požiadavky pre inštaláciu distribúcie %1.<br/>Inštalácia nemôže pokračovať. <a href="#details">Podrobnosti...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Tento počítač nespĺňa niektoré z odporúčaných požiadaviek pre inštaláciu distribúcie %1.<br/>Inštalácia môže pokračovať, ale niektoré funkcie môžu byť zakázané. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Tento počítač nespĺňa niektoré z odporúčaných požiadaviek pre inštaláciu distribúcie %1.<br/>Inštalácia môže pokračovať, ale niektoré funkcie môžu byť zakázané. - + This program will ask you some questions and set up %2 on your computer. Tento program vám položí niekoľko otázok a nainštaluje distribúciu %2 do vášho počítača. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Vitajte v inštalačnom programe Calamares pre distribúciu %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Vitajte pri inštalácii distribúcie %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Vitajte v aplikácii Calamares, inštalátore distribúcie %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Vitajte v inštalátore distribúcie %1</h1> - + Your username is too long. Vaše používateľské meno je príliš dlhé. - + '%1' is not allowed as username. „%1“ nie je možné použiť ako používateľské meno. - + Your username must start with a lowercase letter or underscore. Vaše používateľské meno musí začínať malým písmenom alebo podčiarkovníkom. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Sú povolené iba malé písmená, číslice, podtržníky a pomlčky. - + Your hostname is too short. Váš názov hostiteľa je príliš krátky. - + Your hostname is too long. Váš názov hostiteľa je príliš dlhý. - + '%1' is not allowed as hostname. „%1“ nie je možné použiť ako názov hostiteľa. - + Only letters, numbers, underscore and hyphen are allowed. Sú povolené iba písmená, číslice, podtržníky a pomlčky. - + Your passwords do not match! Vaše heslá sa nezhodujú! - + OK! OK! @@ -964,11 +983,16 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. + Packages + Balíky + + + Install option: <strong>%1</strong> Voľba inštalácie: <strong>%1</strong> - + None @@ -1427,6 +1451,16 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. FS Label: Menovka SS: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1456,8 +1490,8 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Potvrdenie hesla - - + + Please enter the same passphrase in both boxes. Prosím, zadajte rovnaké heslo do oboch polí. @@ -1546,32 +1580,32 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. &Reštartovať teraz - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Všetko je dokončené.</h1><br/>Distribúcia %1 bola nainštalovaná do vášho počítača.<br/>Teraz môžete začať používať váš nový systém. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Keď je zaškrtnuté toto políčko, váš systém sa okamžite reštartuje po stlačení tlačidla <span style="font-style:italic;">Dokončiť</span> alebo zatvorení inštalačného programu.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Všetko je dokončené.</h1><br/>Distribúcia %1 bola nainštalovaná do vášho počítača.<br/>Teraz môžete reštartovať počítač a spustiť váš nový systém, alebo pokračovať v používaní živého prostredia distribúcie %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Keď je zaškrtnuté toto políčko, váš systém sa okamžite reštartuje po stlačení tlačidla <span style="font-style:italic;">Dokončiť</span> alebo zatvorení inštalátora.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Inštalácia zlyhala</h1><br/>Distribúcia %1 nebola nainštalovaná do vášho počítača.<br/>Chybová hláška: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Inštalácia zlyhala</h1><br/>Distribúcia %1 nebola nainštalovaná do vášho počítača.<br/>Chybová hláška: %2. @@ -1605,12 +1639,18 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Naformátovanie <strong>%3MiB</strong> oddielu <strong>%1</strong> so systémom súborov <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formátuje sa oddiel %1 so systémom súborov %2. - + The installer failed to format partition %1 on disk '%2'. Inštalátor zlyhal pri formátovaní oddielu %1 na disku „%2“. @@ -1618,12 +1658,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. GeneralRequirements - + has at least %1 GiB available drive space obsahuje aspoň %1 GiB voľného miesta na disku - + There is not enough drive space. At least %1 GiB is required. Nie je dostatok miesta na disku. Vyžaduje sa aspoň %1 GiB. @@ -1663,27 +1703,27 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. má spustený inštalátor s právami správcu (root) - + The setup program is not running with administrator rights. Inštalačný program nie je spustený s právami správcu. - + The installer is not running with administrator rights. Inštalátor nie je spustený s právami správcu. - + has a screen large enough to show the whole installer má obrazovku dostatočne veľkú na zobrazenie celého inštalátora - + The screen is too small to display the setup program. Obrazovka je príliš malá na to, aby bolo možné zobraziť inštalačný program. - + The screen is too small to display the installer. Obrazovka je príliš malá na to, aby bolo možné zobraziť inštalátor. @@ -1983,35 +2023,35 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. LuksBootKeyFileJob - + Configuring LUKS key file. Nastavuje sa kľúčový súbor LUKS. - - + + No partitions are defined. Nie sú určené žiadne oddiely. - - - + + + Encrypted rootfs setup error Chyba pri inštalácii zašifrovaného koreňového súborového systému - + Root partition %1 is LUKS but no passphrase has been set. Koreňový oddiel %1 je typu LUKS, ale nebolo nastavené žiadne heslo. - + Could not create LUKS key file for root partition %1. Nepodarilo sa vytvoriť kľúčový súbor LUKS pre koreňový oddiel %1. - + Could not configure LUKS key file on partition %1. Nepodarilo sa nastaviť kľúčový súbor LUKS na oddieli %1. @@ -2037,12 +2077,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Map - + Timezone: %1 Časová zóna: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2053,100 +2093,112 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. NetInstallViewStep - + Package selection Výber balíkov - + Office software Kancelársky softvér - + Office package Kancelársky balík - + Browser software Prehliadač - + Browser package Balík prehliadača - + Web browser Webový prehliadač - + Kernel + label for netinstall module, Linux kernel Jadro - + Services + label for netinstall module, system services Služby - + Login + label for netinstall module, choose login manager Prihlásenie - + Desktop + label for netinstall module, choose desktop environment Pracovné prostredie - - Applications - Aplikácie - - - + Communication + label for netinstall module Komunikácia - + Development + label for netinstall module Vývoj - + Office + label for netinstall module Kancelária - + Multimedia + label for netinstall module Multimédiá - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Motívy - + Gaming + label for netinstall module Hry - + Utilities + label for netinstall module Nástroje + + + Applications + Aplikácie + NotesQmlViewStep @@ -2195,24 +2247,24 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Vyberte vami uprednostňovanú oblasť, alebo použite predvolené nastavenia. - - - + + + Timezone: %1 Časová zóna: %1 - + Select your preferred Zone within your Region. Vyberte uprednostňovanú zónu vo vašej oblasti. - + Zones Zóny - + You can fine-tune Language and Locale settings below. Nižšie môžete doladiť nastavenia jazyka a miestne nastavenia. @@ -2505,7 +2557,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Neznáma chyba - + Password is empty Heslo je prázdne @@ -2543,22 +2595,6 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Prosím, vyberte produkt zo zoznamu. Vybraný produkt bude nainštalovaný. - - PackageChooserQmlViewStep - - - Packages - Balíky - - - - PackageChooserViewStep - - - Packages - Balíky - - PackageModel @@ -3087,7 +3123,7 @@ Výstup: QObject - + %1 (%2) %1 (%2) @@ -3413,12 +3449,12 @@ Výstup: ResultsListDialog - + For best results, please ensure that this computer: Pre čo najlepší výsledok, sa prosím, uistite, že tento počítač: - + System requirements Systémové požiadavky @@ -3846,22 +3882,22 @@ Výstup: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Kliknutím sem získate viac informácií o spätnej väzbe od používateľa</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Vybraním tejto voľby odošlete informácie o vašej inštalácii a hardvéri. Tieto informácie budú odoslané <b>iba raz</b> po dokončení inštalácie. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Vybraním tejto voľby budete pravidelne odosielať informácie o vašom <b>počítači</b>, inštalácii, hardvéri a aplikáciách distribúcii %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Vybraním tejto voľby budete neustále odosielať informácie o vašej <b>používateľskej</b> inštalácii, hardvéri, aplikáciách a charakteristike používania distribúcii %1. @@ -4049,44 +4085,19 @@ Výstup: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Vitajte v inštalačnom programe Calamares pre distribúciu %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Vitajte pri inštalácii distribúcie %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Vitajte v aplikácii Calamares, inštalátore distribúcie %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Vitajte v inštalátore distribúcie %1.</h1> - - - %1 support Podpora distribúcie %1 - + About %1 setup O inštalátore %1 - + About %1 installer O inštalátore %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>pre %3</strong><br/><br/>Autorské práva 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Autorské práva 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Poďakovanie patrí <a href="https://calamares.io/team/">tímu inštalátora Calamares</a> a <a href="https://www.transifex.com/calamares/calamares/">prekladateľskému tímu inštalátora Calamares</a>.<br/><br/>Vývoj inštalátora <a href="https://calamares.io/">Calamares</a> je sponzorovaný spoločnosťou <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - oslobodzujúci softvér. - WelcomeQmlViewStep @@ -4151,33 +4162,7 @@ Výstup: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - pre distribúciu %3</strong><br/><br/> - Autorské práva 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Autorské práva 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Poďakovanie patrí <a href='https://calamares.io/team/'>tímu inštalátora Calamares</a> - a <a href='https://www.transifex.com/calamares/calamares/'>prekladateľskému tímu inštalátora Calamares</a>.<br/><br/> - Vývoj inštalátora <a href='https://calamares.io/'>Calamares</a> - je podporovaný spoločnosťou <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - oslobodzujúci softvér. - - - + Back Späť @@ -4281,17 +4266,17 @@ Výstup: Model klávesnice: - + Layouts Rozloženia - + Type here to test your keyboard Tu môžete písať na odskúšanie vašej klávesnice - + Variants Varianty @@ -4420,102 +4405,102 @@ Výstup: Ak bude tento počítač používať viac ako jedna osoba, môžete po inštalácii vytvoriť viacero účtov. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Sú povolené iba malé písmená, číslice, podtržníky a pomlčky. - + root is not allowed as username. root nie je možné použiť ako meno používateľa - + What is the name of this computer? Aký je názov tohto počítača? - + Computer Name Názov počítača - + This name will be used if you make the computer visible to others on a network. Tento názov bude použitý, keď zviditeľníte počítač ostatným v sieti. - + localhost is not allowed as hostname. localhost nie možné použiť ako názov hostiteľa - + Choose a password to keep your account safe. Zvoľte heslo pre zachovanie vášho účtu v bezpečí. - + Password Heslo - + Repeat Password Zopakovanie hesla - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Zadajte rovnaké heslo dvakrát, aby sa predišlo preklepom. Dobré heslo by malo obsahovať mix písmen, čísel a diakritiky, malo by mať dĺžku aspoň osem znakov a malo by byť pravidelne menené. - + Validate passwords quality Overiť kvalitu hesiel - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Keď je zaškrtnuté toto políčko, kontrola kvality hesla bude ukončená a nebudete môcť použiť slabé heslo. - + Log in automatically without asking for the password Prihlásiť automaticky bez pýtania hesla - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password Znovu použiť používateľské heslo ako heslo správcu - + Use the same password for the administrator account. Použiť rovnaké heslo pre účet správcu. - + Choose a root password to keep your account safe. Zvoľte heslo správcu pre zachovanie vášho účtu v bezpečí. - + Root Password Heslo správcu - + Repeat Root Password Zopakovanie hesla správcu - + Enter the same password twice, so that it can be checked for typing errors. Zadajte rovnaké heslo dvakrát, aby sa predišlo preklepom. diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts index b44c7a079..ddc82adc1 100644 --- a/lang/calamares_sl.ts +++ b/lang/calamares_sl.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Končano @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -271,7 +290,7 @@ - + (%n second(s)) @@ -281,7 +300,7 @@ - + System-requirements checking is complete. @@ -487,12 +506,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Namestilnik @@ -531,149 +550,149 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. Oblika - + Select storage de&vice: - - - - + + + + Current: - + After: Potem: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -761,27 +780,27 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. Config - + Set keyboard model to %1.<br/> Nastavi model tipkovnice na %1.<br/> - + Set keyboard layout to %1/%2. Nastavi razporeditev tipkovnice na %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -816,97 +835,97 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -962,11 +981,16 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1425,6 +1449,16 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1454,8 +1488,8 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - - + + Please enter the same passphrase in both boxes. @@ -1544,32 +1578,32 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1603,12 +1637,18 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + + %1 (%2) + partition label %1 (device path %2) + + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. Namestilniku ni uspelo formatirati razdelka %1 na disku '%2'. @@ -1616,12 +1656,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1661,27 +1701,27 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1981,35 +2021,35 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2035,12 +2075,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2050,98 +2090,110 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2192,24 +2244,24 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2502,7 +2554,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Password is empty @@ -2540,22 +2592,6 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3081,7 +3117,7 @@ Output: QObject - + %1 (%2) @@ -3404,12 +3440,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: Za najboljše rezultate se prepričajte, da vaš računalnik izpolnjuje naslednje zahteve: - + System requirements @@ -3837,22 +3873,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4040,44 +4076,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4142,23 +4153,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4258,17 +4253,17 @@ Output: Model tipkovnice: - + Layouts - + Type here to test your keyboard Tipkajte tukaj za testiranje tipkovnice - + Variants @@ -4395,102 +4390,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? Ime računalnika? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Izberite geslo za zaščito vašega računa. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts index 8f7ca060f..25d9c8f52 100644 --- a/lang/calamares_sq.ts +++ b/lang/calamares_sq.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Pemë Widget-esh - + Debug information Të dhëna diagnostikimi @@ -171,7 +190,7 @@ Calamares::JobThread - + Done U bë @@ -261,7 +280,7 @@ Kontrolli i domosdoshmërive për modulin <i>%1</i> u plotësua. - + Waiting for %n module(s). Po pritet për %n modul(e). @@ -269,7 +288,7 @@ - + (%n second(s)) (%n sekondë(a)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. Kontrolli i domosdoshmërive të sistemit u plotësua. @@ -488,12 +507,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. CalamaresWindow - + %1 Setup Program Programi i Rregullimit të %1 - + %1 Installer Instalues %1 @@ -532,149 +551,149 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Formular - + Select storage de&vice: Përzgjidhni &pajisje depozitimi: - - - - + + + + Current: E tanishmja: - + After: Më Pas: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Pjesëzim dorazi</strong><br/>Pjesët mund t’i krijoni dhe ripërmasoni ju vetë. - + Reuse %1 as home partition for %2. Ripërdore %1 si pjesën shtëpi për %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Përzgjidhni një pjesë që të zvogëlohet, mandej tërhiqni shtyllën e poshtme që ta ripërmasoni</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 do të zvogëlohet në %2MiB dhe për %4 do të krijohet një pjesë e re %3MiB. - + Boot loader location: Vendndodhje ngarkuesi nisjesh: - + <strong>Select a partition to install on</strong> <strong>Përzgjidhni një pjesë ku të instalohet</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Në këtë sistem s’gjendet gjëkundi një pjesë EFI sistemi. Ju lutemi, kthehuni mbrapsht dhe përdorni pjesëtimin dorazi që të rregulloni %1. - + The EFI system partition at %1 will be used for starting %2. Për nisjen e %2 do të përdoret pjesa EFI e sistemit te %1. - + EFI system partition: Pjesë EFI sistemi: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Kjo pajisje depozitimi përmban %1 në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Fshije diskun</strong><br/>Kështu do të <font color=\"red\">fshihen</font> krejt të dhënat të pranishme tani në pajisjen e përzgjedhur. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instaloje në krah të tij</strong><br/>Instaluesi do të zvogëlojë një pjesë për të bërë vend për %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Zëvendëso një pjesë</strong><br/>Zëvendëson një pjesë me %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Kjo pajisje depozitimi përmban %1 në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Kjo pajisje depozitimi ka tashmë një sistem operativ në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Kjo pajisje depozitimi ka disa sisteme operativë në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Kjo pajisje depozitimi ka tashmë një sistem operativ në të, por tabela e saj e pjesëve <strong>%1</strong> është e ndryshme nga ajo e duhura <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Kjo pajisje depozitimi ka një nga pjesët e saj <strong>të montuar</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Kjo pajisje depozitimi është pjesë e një pajisje <strong>RAID jo aktive</strong> device. - + No Swap Pa Swap - + Reuse Swap Ripërdor Swap-in - + Swap (no Hibernate) Swap (pa Hibernate) - + Swap (with Hibernate) Swap (me Hibernate) - + Swap to file Swap në kartelë @@ -762,27 +781,27 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Config - + Set keyboard model to %1.<br/> Si model tastiere do të caktohet %1.<br/> - + Set keyboard layout to %1/%2. Si model tastiere do të caktohet %1%2. - + Set timezone to %1/%2. Si zonë kohore cakto %1/%2 - + The system language will be set to %1. Si gjuhë sistemi do të caktohet %1. - + The numbers and dates locale will be set to %1. Si vendore për numra dhe data do të vihet %1. @@ -817,97 +836,97 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Instalim Nga Rrjeti. (U çaktivizua: S’arrihet të sillen lista paketash, kontrolloni lidhjen tuaj në rrjet) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Ky kompjuter s’i plotëson kërkesat minimum për rregullimin e %1.<br/>Rregullimi s’mund të vazhdojë. <a href=\"#details\">Hollësi…</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Ky kompjuter s’i plotëson kërkesat minimum për instalimin e %1.<br/>Instalimi s’mund të vazhdojë. <a href=\"#details\">Hollësi…</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Ky kompjuter s’i plotëson disa nga domosdoshmëritë e rekomanduara për rregullimin e %1.<br/>Rregullimi mund të vazhdojë, por disa veçori mund të përfundojnë të çaktivizuara. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Ky kompjuter s’i plotëson disa nga domosdoshmëritë e rekomanduara për instalimin e %1.<br/>Instalimi mund të vazhdojë, por disa veçori mund të përfundojnë të çaktivizuara. - + This program will ask you some questions and set up %2 on your computer. Ky program do t’ju bëjë disa pyetje dhe do të rregullojë %2 në kompjuterin tuaj. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Mirë se vini te programi i ujdisjes së Calamares për</h1> - + <h1>Welcome to %1 setup</h1> <h1>Mirë se vini te udjisja e %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Mirë se vini te instaluesi Calamares për %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Mirë se vini te instaluesi i %1</h1> - + Your username is too long. Emri juaj i përdoruesit është shumë i gjatë. - + '%1' is not allowed as username. '%1' s’lejohet si emër përdoruesi. - + Your username must start with a lowercase letter or underscore. Emri juaj i përdoruesit duhet të fillojë me një shkronjë të vogël ose nënvijë. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Lejohen vetëm shkronja të vogla, numra, nënvijë dhe vijë ndarëse. - + Your hostname is too short. Strehëemri juaj është shumë i shkurtër. - + Your hostname is too long. Strehëemri juaj është shumë i gjatë. - + '%1' is not allowed as hostname. '%1' s’lejohet si strehëemër. - + Only letters, numbers, underscore and hyphen are allowed. Lejohen vetëm shkronja, numra, nënvijë dhe vijë ndarëse. - + Your passwords do not match! Fjalëkalimet tuaj s’përputhen! - + OK! OK! @@ -963,11 +982,16 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. + Packages + Paketa + + + Install option: <strong>%1</strong> Mundësi instalimi: <strong>%1</strong> - + None Asnjë @@ -1426,6 +1450,16 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. FS Label: Etiketë FS-je: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1455,8 +1489,8 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Ripohoni frazëkalimin - - + + Please enter the same passphrase in both boxes. Ju lutemi, jepni të njëjtin frazëkalim në të dy kutizat. @@ -1545,32 +1579,32 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. &Rinise tani - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Kaq qe.</h1><br/>%1 u rregullua në kompjuterin tuaj.<br/>Tani mundeni të filloni të përdorni sistemin tuaj të ri. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Kur i vihet shenjë kësaj kutie, sistemi juaj do të riniset menjëherë, kur klikoni mbi <span style=" font-style:italic;">U bë</span> ose mbyllni programin e rregullimit.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Kaq qe.</h1><br/>%1 është instaluar në kompjuterin tuaj.<br/>Tani mundeni ta rinisni me sistemin tuaj të ri, ose të vazhdoni përdorimin e mjedisit %2 Live. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Kur i vihet shenjë kësaj kutie, sistemi juaj do të riniset menjëherë, kur klikoni mbi <span style=" font-style:italic;">U bë</span> ose mbyllni instaluesin.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Rregullimi Dështoi</h1><br/>%1 s’u rregullua në kompjuterin tuaj.<br/>Mesazhi i gabimit qe: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Instalimi Dështoi</h1><br/>%1 s’u instalua në kompjuterin tuaj.<br/>Mesazhi i gabimit qe: %2. @@ -1604,12 +1638,18 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Formato pjesën <strong>%3MiB</strong> <strong>%1</strong> me sistem kartelash <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Po formatohet pjesa %1 me sistem kartelash %2. - + The installer failed to format partition %1 on disk '%2'. Instaluesi s’arriti të formatojë pjesën %1 në diskun '%2'. @@ -1617,12 +1657,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. GeneralRequirements - + has at least %1 GiB available drive space ka të paktën %1 GiB hapësirë të përdorshme - + There is not enough drive space. At least %1 GiB is required. S’ka hapësirë të mjaftueshme. Lypset të paktën %1 GiB. @@ -1662,27 +1702,27 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. po e xhiron instaluesin si një përgjegjës (rrënjë) - + The setup program is not running with administrator rights. Programi i rregullimit nuk po xhirohen me të drejta përgjegjësi. - + The installer is not running with administrator rights. Instaluesi s’po xhirohet me të drejta përgjegjësi. - + has a screen large enough to show the whole installer ka një ekran të mjaftueshëm për të shfaqur krejt instaluesin - + The screen is too small to display the setup program. Ekrani është shumë i vogël për të shfaqur programin e rregullimit. - + The screen is too small to display the installer. Ekrani është shumë i vogël për shfaqjen e instaluesit. @@ -1982,35 +2022,35 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. LuksBootKeyFileJob - + Configuring LUKS key file. Po formësohet kartelë kyçesh LUKS. - - + + No partitions are defined. S’ka pjesë të përkufizuara. - - - + + + Encrypted rootfs setup error Gabim ujdisjeje rootfs të fshehtëzuar - + Root partition %1 is LUKS but no passphrase has been set. Pjesa rrënjë %1 është LUKS, por s’është caktuar frazëkalim. - + Could not create LUKS key file for root partition %1. S’u krijua dot kartelë kyçi LUKS për ndarjen rrënjë %1. - + Could not configure LUKS key file on partition %1. S’u formësua dot kartelë kyçesh LUKS te pjesën %1. @@ -2036,12 +2076,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Map - + Timezone: %1 Zonë kohore: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2051,100 +2091,112 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. NetInstallViewStep - + Package selection Përzgjedhje paketash - + Office software Software zyrash - + Office package Paketë zyrash - + Browser software Software shfletuesi - + Browser package Paketë shfletuesi - + Web browser Shfletues - + Kernel + label for netinstall module, Linux kernel Kernel - + Services + label for netinstall module, system services Shërbime - + Login + label for netinstall module, choose login manager Hyrje - + Desktop + label for netinstall module, choose desktop environment Desktop - - Applications - Aplikacione - - - + Communication + label for netinstall module Komunikim - + Development + label for netinstall module Zhvillim - + Office + label for netinstall module Zyrë - + Multimedia + label for netinstall module Multimedia - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Tema - + Gaming + label for netinstall module Lojëra - + Utilities + label for netinstall module Të dobishme + + + Applications + Aplikacione + NotesQmlViewStep @@ -2193,24 +2245,24 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Përzgjidhni Rajonin tuaj të parapëlqyer, ose përdorni rregullimet parazgjedhje. - - - + + + Timezone: %1 Zonë kohore: %1 - + Select your preferred Zone within your Region. Përzgjidhni brenda Rajonit tuaj Zonën tuaj të parapëlqyer. - + Zones Zona - + You can fine-tune Language and Locale settings below. Më poshtë mund të përimtoni rregullimet për Gjuhën dhe Vendoren. @@ -2485,7 +2537,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Gabim i panjohur - + Password is empty Fjalëkalimi është i zbrazët @@ -2523,22 +2575,6 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Ju lutemi, zgjidhni prej listës një produkt. Produkti i përzgjedhur do të instalohet. - - PackageChooserQmlViewStep - - - Packages - Paketa - - - - PackageChooserViewStep - - - Packages - Paketa - - PackageModel @@ -3067,7 +3103,7 @@ Përfundim: QObject - + %1 (%2) %1 (%2) @@ -3393,12 +3429,12 @@ Përfundim: ResultsListDialog - + For best results, please ensure that this computer: Për përfundime më të mira, ju lutemi, garantoni që ky kompjuter: - + System requirements Sistem i domosdoshëm @@ -3826,22 +3862,22 @@ Përfundim: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Për më tepër të dhëna rreth përshtypjeve të përdoruesit, klikoni këtu</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Gjurmimi e ndihmon %1 të shoë se sa shpesh është instaluar, në çfarë hardware-i është instaluar dhe cilët aplikacione janë përdorur. Që të shihni se ç’do të dërgohet, ju lutemi, klikoni mbi ikonën e nidhmës në krah të secilës fushë. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Duke përzgjedhur këtë, do të dërgoni informacion rreth instalimit dhe hardware-it tuaj. Ky informacion do të dërgohet vetëm <b>një herë</b>, pasi të përfundojë instalimi. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Duke përzgjedhur këtë, do të dërgoni periodikisht te %1 informacion rreth instalimit, hardware-it dhe aplikacioneve të <b>makinës</b> tuaj. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Duke përzgjedhur këtë, do të dërgoni rregullisht te %1 informacion rreth instalimit tuaj si <b>përdorues</b>, hardware-it, aplikacioneve dhe rregullsive në përdorimin e aplikacioneve. @@ -4029,44 +4065,19 @@ Përfundim: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Mirë se vini te programi i rregullimit Calamares për %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Mirë se vini te rregullimi i %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Mirë se vini te instaluesi Calamares për %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Mirë se vini te instaluesi i %1.</h1> - - - %1 support Asistencë %1 - + About %1 setup Mbi rregullimin e %1 - + About %1 installer Rreth instaluesit %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>për %3</strong><br/><br/>Të drejta kopjimi 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Të drejta kopjimi 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Falënderime për <a href="https://calamares.io/team/">ekipin e Calamares</a> dhe <a href="https://www.transifex.com/calamares/calamares/">ekipin e përkthyesve të Calamares</a>.<br/><br/>Zhvillimi i <a href="https://calamares.io/">Calamares</a> sponsorizohet nga <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4131,34 +4142,7 @@ Përfundim: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - për %3</strong><br/><br/> - Të drejta kopjimi 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Të drejta kopjimi 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Falënderime <a href='https://calamares.io/team/'>ekipit Calamares</a> - dhe <a href='https://www.transifex.com/calamares/calamares/'>ekipit - të përkthyesve të Calamares</a>.<br/><br/> - Zhvillimi i <a href='https://calamares.io/'>Calamares</a> - sponsorizohet nga <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back Mbrapsht @@ -4263,17 +4247,17 @@ Përfundim: Model Tastiere: - + Layouts Skema - + Type here to test your keyboard Që të provoni tastierën tuaj, shtypni këtu - + Variants Variante @@ -4422,102 +4406,102 @@ Përfundim: Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni llogari të shumta pas instalimit. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Lejohen vetëm shkronja të vogla, numra, nënvijë dhe vijë ndarëse. - + root is not allowed as username. “root” nuk lejohet si emër përdoruesi. - + What is the name of this computer? Cili është emri i këtij kompjuteri? - + Computer Name Emër Kompjuteri - + This name will be used if you make the computer visible to others on a network. Ky emër do të përdoret nëse e bëni kompjuterin të dukshëm për të tjerët në një rrjet. - + localhost is not allowed as hostname. “localhost” s’lejohet si strehëemër. - + Choose a password to keep your account safe. Zgjidhni një fjalëkalim për ta mbajtur llogarinë tuaj të parrezikuar. - + Password Fjalëkalim - + Repeat Password Ripërsëritni Fjalëkalimin - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Jepeni të njëjtin fjalëkalim dy herë, që të kontrollohet për gabime shkrimi. Një fjalëkalim i mirë do të përmbante një përzierje shkronjash, numrash dhe shenjash pikësimi, do të duhej të ishte të paktën tetë shenja i gjatë, dhe do të duhej të ndryshohej periodikisht. - + Validate passwords quality Vlerëso cilësi fjalëkalimi - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Kur i vihet shenjë kësaj kutize, bëhet kontroll fortësie fjalëkalimi dhe s’do të jeni në gjendje të përdorni një fjalëkalim të dobët. - + Log in automatically without asking for the password Kryej hyrje vetvetiu, pa kërkuar fjalëkalimin. - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Lejohen vetëm shkronja, numra, nënvijë dhe vijë ndarëse. minimumi dy shenja. - + Reuse user password as root password Ripërdor fjalëkalim përdoruesi si fjalëkalim përdoruesi rrënjë - + Use the same password for the administrator account. Përdor të njëjtin fjalëkalim për llogarinë e përgjegjësit. - + Choose a root password to keep your account safe. Që ta mbani llogarinë tuaj të parrezik, zgjidhni një fjalëkalim rrënje - + Root Password Fjalëkalim Rrënje - + Repeat Root Password Përsëritni Fjalëkalim Rrënje - + Enter the same password twice, so that it can be checked for typing errors. Jepeni të njëjtin fjalëkalim dy herë, që të mund të kontrollohet për gabime shkrimi. diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts index 552052dcc..dcbfdbba8 100644 --- a/lang/calamares_sr.ts +++ b/lang/calamares_sr.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Завршено @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -270,7 +289,7 @@ - + (%n second(s)) @@ -279,7 +298,7 @@ - + System-requirements checking is complete. @@ -485,12 +504,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 инсталер @@ -529,149 +548,149 @@ The installer will quit and all changes will be lost. Форма - + Select storage de&vice: Изаберите у&ређај за смештање: - - - - + + + + Current: Тренутно: - + After: После: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Ручно партиционисање</strong><br/>Сами можете креирати или мењати партције. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Подизни учитавач на: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -759,27 +778,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. Системски језик биће постављен на %1 - + The numbers and dates locale will be set to %1. @@ -814,97 +833,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. Ваше корисничко име је предугачко. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. Име вашег "домаћина" - hostname је прекратко. - + Your hostname is too long. Ваше име домаћина је предуго - hostname - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Лозинке се не поклапају! - + OK! @@ -960,11 +979,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1423,6 +1447,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1452,8 +1486,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1542,32 +1576,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1601,12 +1635,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1614,12 +1654,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1659,27 +1699,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1979,35 +2019,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2033,12 +2073,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2048,98 +2088,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection Избор пакета - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2190,24 +2242,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2491,7 +2543,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2529,22 +2581,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3070,7 +3106,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3393,12 +3429,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: За најбоље резултате обезбедите да овај рачунар: - + System requirements Системски захтеви @@ -3826,22 +3862,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4029,44 +4065,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support %1 подршка - + About %1 setup - + About %1 installer О %1 инсталатеру - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4131,23 +4142,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4247,17 +4242,17 @@ Output: - + Layouts - + Type here to test your keyboard куцајте овде да тестирате тастатуру - + Variants @@ -4384,102 +4379,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? Како ћете звати ваш рачунар? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Изаберите лозинку да обезбедите свој налог. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts index 1a6847300..6c28b5c7f 100644 --- a/lang/calamares_sr@latin.ts +++ b/lang/calamares_sr@latin.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Gotovo @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -270,7 +289,7 @@ - + (%n second(s)) @@ -279,7 +298,7 @@ - + System-requirements checking is complete. @@ -485,12 +504,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instaler @@ -529,149 +548,149 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Select storage de&vice: - - - - + + + + Current: - + After: Poslije: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -759,27 +778,27 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -814,97 +833,97 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Vaše lozinke se ne poklapaju - + OK! @@ -960,11 +979,16 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1423,6 +1447,16 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1452,8 +1486,8 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - - + + Please enter the same passphrase in both boxes. @@ -1542,32 +1576,32 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1601,12 +1635,18 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + + %1 (%2) + partition label %1 (device path %2) + + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. Instaler nije uspeo formatirati particiju %1 na disku '%2'. @@ -1614,12 +1654,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1659,27 +1699,27 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1979,35 +2019,35 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2033,12 +2073,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2048,98 +2088,110 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2190,24 +2242,24 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2491,7 +2543,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Password is empty @@ -2529,22 +2581,6 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3070,7 +3106,7 @@ Output: QObject - + %1 (%2) @@ -3393,12 +3429,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: Za najbolje rezultate, uvjetite se da li ovaj računar: - + System requirements @@ -3826,22 +3862,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4029,44 +4065,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4131,23 +4142,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4247,17 +4242,17 @@ Output: Model tastature: - + Layouts - + Type here to test your keyboard Test tastature - + Variants @@ -4384,102 +4379,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? Kako želite nazvati ovaj računar? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Odaberite lozinku da biste zaštitili Vaš korisnički nalog. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index d57227429..4ae4fdaac 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + <h1>%1</h1> <br/> <strong>%2<br/> för %3</strong> <br/><br/> + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + Tack till <a href="https://calamares.io/team/">Calamares-teamet</a> och <a href="https://www.transifex.com/calamares/calamares/">Calamares översättar-team</a>. <br/><br/><a href="https://calamares.io/">Calamares</a>utveckling är sponsrad av <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + Copyright %1-%2 %3 &lt;%4&gt;<br/> + + AutoMountManagementJob @@ -137,7 +156,7 @@ Widgetträd - + Debug information Avlusningsinformation @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Klar @@ -261,7 +280,7 @@ Kontroll av krav för modul <i>%1</i> är färdig. - + Waiting for %n module(s). Väntar på %n modul(er). @@ -269,7 +288,7 @@ - + (%n second(s)) (%n sekund(er)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. Kontroll av systemkrav är färdig @@ -487,12 +506,12 @@ Alla ändringar kommer att gå förlorade. CalamaresWindow - + %1 Setup Program %1 Installationsprogram - + %1 Installer %1-installationsprogram @@ -531,149 +550,149 @@ Alla ändringar kommer att gå förlorade. Formulär - + Select storage de&vice: Välj lagringsenhet: - - - - + + + + Current: Nuvarande: - + After: Efter: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Manuell partitionering</strong><br/>Du kan själv skapa och ändra storlek på partitionerna. - + Reuse %1 as home partition for %2. Återanvänd %1 som hempartition för %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Välj en partition att minska, sen dra i nedre fältet för att ändra storlek</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 kommer att förminskas till %2MiB och en ny %3MiB partition kommer att skapas för %4. - + Boot loader location: Sökväg till starthanterare: - + <strong>Select a partition to install on</strong> <strong>Välj en partition att installera på</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Ingen EFI-partition kunde inte hittas på systemet. Gå tillbaka och partitionera din lagringsenhet manuellt för att ställa in %1. - + The EFI system partition at %1 will be used for starting %2. EFI-partitionen %1 kommer att användas för att starta %2. - + EFI system partition: EFI-partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Denna lagringsenhet ser inte ut att ha ett operativsystem installerat. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring görs på lagringseneheten. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Rensa lagringsenhet</strong><br/>Detta kommer <font color="red">radera</font> all existerande data på den valda lagringsenheten. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Installera på sidan om</strong><br/>Installationshanteraren kommer krympa en partition för att göra utrymme för %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Ersätt en partition</strong><br/>Ersätter en partition med %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Denna lagringsenhet har %1 på sig. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring görs på lagringsenheten. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Denna lagringsenhet har redan ett operativsystem på sig. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring sker på lagringsenheten. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Denna lagringsenhet har flera operativsystem på sig. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring sker på lagringsenheten. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Denna lagringsenhet har redan ett operativsystem installerat på sig, men partitionstabellen <strong>%1</strong> skiljer sig från den som behövs <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Denna lagringsenhet har en av dess partitioner <strong>monterad</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Denna lagringsenhet är en del av en <strong>inaktiv RAID</strong>enhet. - + No Swap Ingen Swap - + Reuse Swap Återanvänd Swap - + Swap (no Hibernate) Swap (utan viloläge) - + Swap (with Hibernate) Swap (med viloläge) - + Swap to file Använd en fil som växlingsenhet @@ -761,27 +780,27 @@ Alla ändringar kommer att gå förlorade. Config - + Set keyboard model to %1.<br/> Sätt tangenbordsmodell till %1.<br/> - + Set keyboard layout to %1/%2. Sätt tangentbordslayout till %1/%2. - + Set timezone to %1/%2. Sätt tidszon till %1/%2. - + The system language will be set to %1. Systemspråket kommer ändras till %1. - + The numbers and dates locale will be set to %1. Systemspråket för siffror och datum kommer sättas till %1. @@ -816,97 +835,97 @@ Alla ändringar kommer att gå förlorade. Nätverksinstallation. (Inaktiverad: Kan inte hämta paketlistor, kontrollera nätverksanslutningen) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Datorn uppfyller inte minimikraven för inställning av %1.<br/>Inga inställningar kan inte göras. <a href="#details">Detaljer...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Denna dator uppfyller inte minimikraven för att installera %1.<br/>Installationen kan inte fortsätta. <a href="#details">Detaljer...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Några av kraven för inställning av %1 uppfylls inte av datorn.<br/>Inställningarna kan ändå göras men vissa funktioner kommer kanske inte att kunna användas. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Denna dator uppfyller inte alla rekommenderade krav för att installera %1.<br/>Installationen kan fortsätta, men alla alternativ och funktioner kanske inte kan användas. - + This program will ask you some questions and set up %2 on your computer. Detta program kommer att ställa dig några frågor och installera %2 på din dator. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Välkommen till Calamares installationsprogram för %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Välkommen till %1 installation</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Välkommen till Calamares installationsprogram för %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Välkommen till %1-installeraren</h1> - + Your username is too long. Ditt användarnamn är för långt. - + '%1' is not allowed as username. '%1' är inte tillåtet som användarnamn. - + Your username must start with a lowercase letter or underscore. Ditt användarnamn måste börja med en liten bokstav eller ett understreck. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Endast små bokstäver, nummer, understreck och bindestreck är tillåtet. - + Your hostname is too short. Ditt värdnamn är för kort. - + Your hostname is too long. Ditt värdnamn är för långt. - + '%1' is not allowed as hostname. '%1' är inte tillåtet som värdnamn. - + Only letters, numbers, underscore and hyphen are allowed. Endast bokstäver, nummer, understreck och bindestreck är tillåtet. - + Your passwords do not match! Lösenorden överensstämmer inte! - + OK! OK! @@ -962,11 +981,16 @@ Alla ändringar kommer att gå förlorade. + Packages + Paket + + + Install option: <strong>%1</strong> Installations alternativ: <strong>%1</strong> - + None Ingen @@ -1425,6 +1449,16 @@ Alla ändringar kommer att gå förlorade. FS Label: FS Etikett: + + + Passphrase for existing partition + Lösenfras för existerande partition + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 kunde inte dekrypteras med den angivna lösenfrasen. <br/><br/>Redigera partitionen igen och ange den korrekta lösenfrasen eller ta bort och skapa en ny krypterad partition + EncryptWidget @@ -1454,8 +1488,8 @@ Alla ändringar kommer att gå förlorade. Bekräfta lösenord - - + + Please enter the same passphrase in both boxes. Vänligen skriv samma lösenord i båda fälten. @@ -1544,32 +1578,32 @@ Alla ändringar kommer att gå förlorade. Sta&rta om nu - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Allt klart.</h1><br/>%1 har installerats på din dator.<br/>Du kan nu börja använda ditt nya system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>När denna ruta är ikryssad kommer systemet starta om omedelbart när du klickar på <span style="font-style:italic;">Klar</span> eller stänger installationsprogrammet.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Klappat och klart.</h1><br/>%1 har installerats på din dator.<br/>Du kan nu starta om till ditt nya system, eller fortsätta att använda %2 i liveläge. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>När denna ruta är ikryssad kommer systemet starta om omedelbart när du klickar på <span style="font-style:italic;">Klar</span> eller stänger installationsprogrammet.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Installationen misslyckades</h1> <br/>%1 har inte blivit installerad på din dator. <br/>Felmeddelandet var: %2 - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Installationen misslyckades</h1> <br/>%1 har inte blivit installerad på din dator. <br/>Felmeddelandet var: %2 @@ -1603,12 +1637,18 @@ Alla ändringar kommer att gå förlorade. Formatera <strong>%3MiB</strong> partition <strong>%1</strong> med filsystem <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Formatera partition %1 med filsystem %2. - + The installer failed to format partition %1 on disk '%2'. Installationsprogrammet misslyckades att formatera partition %1 på disk '%2'. @@ -1616,12 +1656,12 @@ Alla ändringar kommer att gå förlorade. GeneralRequirements - + has at least %1 GiB available drive space har minst %1 GiB tillgängligt på hårddisken - + There is not enough drive space. At least %1 GiB is required. Det finns inte tillräckligt med hårddiskutrymme. Minst %1 GiB krävs. @@ -1661,27 +1701,27 @@ Alla ändringar kommer att gå förlorade. körs installationsprogammet med administratörsrättigheter (root) - + The setup program is not running with administrator rights. Installationsprogammet körs inte med administratörsrättigheter. - + The installer is not running with administrator rights. Installationsprogammet körs inte med administratörsrättigheter. - + has a screen large enough to show the whole installer har en tillräckligt stor skärm för att visa hela installationsprogrammet - + The screen is too small to display the setup program. Skärmen är för liten för att visa installationsprogrammet. - + The screen is too small to display the installer. Skärmen är för liten för att visa installationshanteraren. @@ -1981,35 +2021,35 @@ Alla ändringar kommer att gå förlorade. LuksBootKeyFileJob - + Configuring LUKS key file. Konfigurerar LUKS nyckel fil. - - + + No partitions are defined. Inga partitioner är definerade. - - - + + + Encrypted rootfs setup error Fel vid inställning av krypterat rootfs - + Root partition %1 is LUKS but no passphrase has been set. Root partition %1 är LUKS men ingen lösenfras har ställts in. - + Could not create LUKS key file for root partition %1. Kunde inte skapa LUKS nyckelfil för root partition %1. - + Could not configure LUKS key file on partition %1. Kunde inte konfigurera LUKS nyckelfil på partition %1. @@ -2035,12 +2075,12 @@ Alla ändringar kommer att gå förlorade. Map - + Timezone: %1 Tidszon: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2053,100 +2093,112 @@ Sök på kartan genom att dra NetInstallViewStep - + Package selection Paketval - + Office software Kontors programvara - + Office package Kontors paket - + Browser software Webbläsare - + Browser package Webbläsare - + Web browser Webbläsare - + Kernel + label for netinstall module, Linux kernel Kärna - + Services + label for netinstall module, system services Tjänster - + Login + label for netinstall module, choose login manager Inloggning - + Desktop + label for netinstall module, choose desktop environment Skrivbord - - Applications - Program - - - + Communication + label for netinstall module Kommunikation - + Development + label for netinstall module Utveckling - + Office + label for netinstall module Kontorsprogram - + Multimedia + label for netinstall module Multimedia - + Internet + label for netinstall module Internet - + Theming + label for netinstall module Teman - + Gaming + label for netinstall module Gaming - + Utilities + label for netinstall module Verktyg + + + Applications + Program + NotesQmlViewStep @@ -2195,24 +2247,24 @@ Sök på kartan genom att dra Välj din föredragna Region, eller använd standardinställningarna. - - - + + + Timezone: %1 Tidszon: %1 - + Select your preferred Zone within your Region. Välj din föredragna Zon inom din region. - + Zones Zoner - + You can fine-tune Language and Locale settings below. Du kan finjustera språk och Nationella inställningar nedan. @@ -2487,7 +2539,7 @@ Sök på kartan genom att dra Okänt fel - + Password is empty Lösenordet är blankt @@ -2525,22 +2577,6 @@ Sök på kartan genom att dra Välj en produkt från listan. Den valda produkten kommer att installeras. - - PackageChooserQmlViewStep - - - Packages - Paket - - - - PackageChooserViewStep - - - Packages - Paket - - PackageModel @@ -3069,7 +3105,7 @@ Utdata: QObject - + %1 (%2) %1 (%2) @@ -3395,12 +3431,12 @@ Installationen kan inte fortsätta.</p> ResultsListDialog - + For best results, please ensure that this computer: För bästa resultat, vänligen se till att datorn: - + System requirements Systemkrav @@ -3828,22 +3864,22 @@ Installationen kan inte fortsätta.</p> <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;"> Klicka här för information om användarfeedback </span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Spårning hjälper %1 att se hur ofta den är installerad, vilken hårdvara den är installerad på och vilka program som används. För att se vad som skickas, Klicka på hjälp ikonen vad sidan av varje område för att se vad som skickas. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Genom att välja detta, kommer du skicka information om din installation och hårdvara. Denna information kommer <b>enbart skickas en gång</b> efter att installationen slutförts. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Genom att välja detta, kommer du periodiskt skicka information om din <b>maskin</b>installation, hårdvara och program, till %1 - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Genom att välja detta, kommer du regelbundet skicka information om din <b>användar</b>installation, hårdvara, program och dina program användningsmönster till %1. @@ -4031,44 +4067,19 @@ Installationen kan inte fortsätta.</p> - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Välkommen till Calamares installationsprogrammet för %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Välkommen till %1 installation.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Välkommen till installationsprogrammet Calamares för %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Välkommen till %1-installeraren.</h1> - - - %1 support %1-support - + About %1 setup Om inställningarna för %1 - + About %1 installer Om %1-installationsprogrammet - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Tack till <a href="https://calamares.io/team/">Calamares-teamet</a> och <a href="https://www.transifex.com/calamares/calamares/">Calamares översättar-team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> utveckling sponsras av <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4133,34 +4144,7 @@ Installationen kan inte fortsätta.</p> about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - för %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Tack till <a href='https://calamares.io/team/'>Calamares-teamet</a> - och <a href='https://www.transifex.com/calamares/calamares/'>Calamares - översättar-team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - utveckling sponsras av <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a>- - Liberating Software. - - - + Back Bakåt @@ -4265,17 +4249,17 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand Tangentbordsmodell: - + Layouts Layouter - + Type here to test your keyboard Skriv här för att testa ditt tangentbord - + Variants Varianter @@ -4424,102 +4408,102 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand Om mer än en person skall använda datorn så kan du skapa flera användarkonton efter installationen. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Endast små bokstäver, nummer, understreck och bindestreck är tillåtet. - + root is not allowed as username. root är inte tillåtet som användarnamn. - + What is the name of this computer? Vad är namnet på datorn? - + Computer Name Datornamn - + This name will be used if you make the computer visible to others on a network. Detta namn kommer användas om du gör datorn synlig för andra i ett nätverk. - + localhost is not allowed as hostname. localhost är inte tillåtet som värdnamn. - + Choose a password to keep your account safe. Välj ett lösenord för att hålla ditt konto säkert. - + Password Lösenord - + Repeat Password Repetera Lösenord - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Ange samma lösenord två gånger, så att det kan kontrolleras för stavfel. Ett bra lösenord innehåller en blandning av bokstäver, nummer och interpunktion, bör vara minst åtta tecken långt, och bör ändras regelbundet. - + Validate passwords quality Validera lösenords kvalite - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. När den här rutan är förkryssad kommer kontroll av lösenordsstyrka att genomföras, och du kommer inte kunna använda ett svagt lösenord. - + Log in automatically without asking for the password Logga in automatiskt utan att fråga efter ett lösenord. - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Endast bokstäver, nummer, understreck och bindestreck är tillåtet, minst två tecken. - + Reuse user password as root password Återanvänd användarlösenord som root lösenord - + Use the same password for the administrator account. Använd samma lösenord för administratörskontot. - + Choose a root password to keep your account safe. Välj ett root lösenord för att hålla ditt konto säkert. - + Root Password Root Lösenord - + Repeat Root Password Repetera Root Lösenord - + Enter the same password twice, so that it can be checked for typing errors. Ange samma lösenord två gånger, så att det kan kontrolleras för stavfel. diff --git a/lang/calamares_ta_IN.ts b/lang/calamares_ta_IN.ts index a0a84ebfb..dbed543b6 100644 --- a/lang/calamares_ta_IN.ts +++ b/lang/calamares_ta_IN.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -482,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -526,149 +545,149 @@ The installer will quit and all changes will be lost. - + Select storage de&vice: - - - - + + + + Current: - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -756,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -811,97 +830,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -957,11 +976,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1420,6 +1444,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1449,8 +1483,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1539,32 +1573,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1598,12 +1632,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1611,12 +1651,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1656,27 +1696,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1976,35 +2016,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2030,12 +2070,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2045,98 +2085,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2187,24 +2239,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2479,7 +2531,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2517,22 +2569,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3058,7 +3094,7 @@ Output: QObject - + %1 (%2) @@ -3381,12 +3417,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3814,22 +3850,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4017,44 +4053,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4119,23 +4130,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4235,17 +4230,17 @@ Output: - + Layouts - + Type here to test your keyboard - + Variants @@ -4372,102 +4367,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_te.ts b/lang/calamares_te.ts index f50d09bbc..e7ef871de 100644 --- a/lang/calamares_te.ts +++ b/lang/calamares_te.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -139,7 +158,7 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి విడ్జెట్ ట్రీ - + Debug information డీబగ్ సమాచారం @@ -173,7 +192,7 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి Calamares::JobThread - + Done ముగించు @@ -263,7 +282,7 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి - + Waiting for %n module(s). @@ -271,7 +290,7 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి - + (%n second(s)) @@ -279,7 +298,7 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి - + System-requirements checking is complete. @@ -484,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -528,149 +547,149 @@ The installer will quit and all changes will be lost. - + Select storage de&vice: - - - - + + + + Current: - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -758,27 +777,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -813,97 +832,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -959,11 +978,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1422,6 +1446,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1451,8 +1485,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1541,32 +1575,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1600,12 +1634,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1613,12 +1653,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1658,27 +1698,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1978,35 +2018,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2032,12 +2072,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2047,98 +2087,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2189,24 +2241,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2481,7 +2533,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2519,22 +2571,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3060,7 +3096,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3383,12 +3419,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3816,22 +3852,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4019,44 +4055,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4121,23 +4132,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4237,17 +4232,17 @@ Output: - + Layouts - + Type here to test your keyboard - + Variants @@ -4374,102 +4369,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. మీ ఖాతా ను భద్రపరుచుకోవడానికి ఒక మంత్రమును ఎంచుకోండి - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_tg.ts b/lang/calamares_tg.ts index 6f3a223e8..39ba94067 100644 --- a/lang/calamares_tg.ts +++ b/lang/calamares_tg.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Дарахти виҷетҳо - + Debug information Иттилооти ислоҳи нуқсонҳо @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Анҷоми кор @@ -261,7 +280,7 @@ Санҷиши талабот барои модули <i>%1</i> ба анҷом расид. - + Waiting for %n module(s). Дар ҳоли интизори %n модул. @@ -269,7 +288,7 @@ - + (%n second(s)) (%n сония) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. Санҷиши талаботи низомӣ ба анҷом расид. @@ -484,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Барномаи танзимкунии %1 - + %1 Installer Насбкунандаи %1 @@ -528,149 +547,149 @@ The installer will quit and all changes will be lost. Шакл - + Select storage de&vice: Интихоби дастгоҳи &захирагоҳ: - - - - + + + + Current: Танзимоти ҷорӣ: - + After: Баъд аз тағйир: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Қисмбандии диск ба таври дастӣ</strong><br/>Шумо худатон метавонед қисмҳои дискро эҷод кунед ё андозаи онҳоро иваз намоед. - + Reuse %1 as home partition for %2. Дубора истифода бурдани %1 ҳамчун диски асосӣ барои %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Қисми дискеро, ки мехоҳед хурдтар кунед, интихоб намоед, пас лавҳаи поёнро барои ивази андоза кашед</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 то андозаи %2MiB хурдтар мешавад ва қисми диски нав бо андозаи %3MiB барои %4 эҷод карда мешавад. - + Boot loader location: Ҷойгиршавии боркунандаи роҳандозӣ: - + <strong>Select a partition to install on</strong> <strong>Қисми дискеро барои насб интихоб намоед</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Қисми диски низомии EFI дар дохили низоми ҷорӣ ёфт нашуд. Лутфан, ба қафо гузаред ва барои танзим кардани %1 аз имкони қисмбандии диск ба таври дастӣ истифода баред. - + The EFI system partition at %1 will be used for starting %2. Қисми диски низомии EFI дар %1 барои оғоз кардани %2 истифода бурда мешавад. - + EFI system partition: Қисми диски низомии: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Чунин менамояд, ки ин захирагоҳ низоми амалкунандаро дар бар намегирад. Шумо чӣ кор кардан мехоҳед?<br/>Шумо метавонед пеш аз татбиқ кардани тағйирот ба дастгоҳи захирагоҳ интихоби худро аз назар гузаронед ва тасдиқ кунед. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Пок кардани диск</strong><br/>Ин амал ҳамаи иттилооти ҷориро дар дастгоҳи захирагоҳи интихобшуда <font color="red">нест мекунад</font>. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Насбкунии паҳлуӣ</strong><br/>Насбкунанда барои %1 фазоро омода карда, қисми дискеро хурдтар мекунад. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Ивазкунии қисми диск</strong><br/>Қисми дисекро бо %1 иваз мекунад. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Ин захирагоҳ %1-ро дар бар мегирад. Шумо чӣ кор кардан мехоҳед?<br/>Шумо метавонед пеш аз татбиқ кардани тағйирот ба дастгоҳи захирагоҳ интихоби худро аз назар гузаронед ва тасдиқ кунед. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Ин захирагоҳ аллакай низоми амалкунандаро дар бар мегирад. Шумо чӣ кор кардан мехоҳед?<br/>Шумо метавонед пеш аз татбиқ кардани тағйирот ба дастгоҳи захирагоҳ интихоби худро аз назар гузаронед ва тасдиқ кунед. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Ин захирагоҳ якчанд низоми амалкунандаро дар бар мегирад. Шумо чӣ кор кардан мехоҳед?<br/>Шумо метавонед пеш аз татбиқ кардани тағйирот ба дастгоҳи захирагоҳ интихоби худро аз назар гузаронед ва тасдиқ кунед. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Ин дастгоҳи захирагоҳ аллакай дорои низоми амалкунанда мебошад, аммо ҷадвали қисми диски <strong>%1</strong> аз диски лозимии <strong>%2</strong> фарқ мекунад.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. Яке аз қисмҳои диски ин дастгоҳи захирагоҳ <strong>васлшуда</strong> мебошад. - + This storage device is a part of an <strong>inactive RAID</strong> device. Ин дастгоҳи захирагоҳ қисми дасгоҳи <strong>RAID-и ғайрифаъол</strong> мебошад. - + No Swap Бе мубодила - + Reuse Swap Истифодаи муҷаддади мубодила - + Swap (no Hibernate) Мубодила (бе реҷаи Нигаҳдорӣ) - + Swap (with Hibernate) Мубодила (бо реҷаи Нигаҳдорӣ) - + Swap to file Мубодила ба файл @@ -758,27 +777,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Намунаи клавиатура ба %1 танзим карда мешавад.<br/> - + Set keyboard layout to %1/%2. Тарҳбандии клавиатура ба %1 %1/%2 танзим карда мешавад. - + Set timezone to %1/%2. Минтақаи вақт ба %1/%2 танзим карда мешавад. - + The system language will be set to %1. Забони низом ба %1 танзим карда мешавад. - + The numbers and dates locale will be set to %1. Низоми рақамҳо ва санаҳо ба %1 танзим карда мешавад. @@ -813,97 +832,97 @@ The installer will quit and all changes will be lost. Насбкунии шабака. (Ғайрифаъол: Рӯйхати қуттиҳо гирифта намешавад. Пайвасти шабакаро тафтиш кунед) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Ин компютер ба талаботи камтарин барои танзимкунии %1 ҷавобгӯ намебошад.<br/>Танзимот идома дода намешавад. <a href="#details">Тафсилот...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Ин компютер ба талаботи камтарин барои насбкунии %1 ҷавобгӯ намебошад.<br/>Насбкунӣ идома дода намешавад. <a href="#details">Тафсилот...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Ин компютер ба баъзеи талаботи тавсияшуда барои танзимкунии %1 ҷавобгӯ намебошад.<br/>Танзимот идома дода мешавад, аммо баъзеи хусусиятҳо ғайрифаъол карда мешаванд. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Ин компютер ба баъзеи талаботи тавсияшуда барои насбкунии %1 ҷавобгӯ намебошад.<br/>Насбкунӣ идома дода мешавад, аммо баъзеи хусусиятҳо ғайрифаъол карда мешаванд. - + This program will ask you some questions and set up %2 on your computer. Ин барнома аз Шумо якчанд савол мепурсад ва %2-ро дар компютери шумо танзим мекунад. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Хуш омадед ба барномаи танзимкунии Calamares барои %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Хуш омадед ба танзимкунии %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Хуш омадед ба насбкунандаи Calamares барои %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Хуш омадед ба насбкунандаи %1</h1> - + Your username is too long. Номи корбари шумо хеле дароз аст. - + '%1' is not allowed as username. '%1' ҳамчун номи корбар истифода намешавад. - + Your username must start with a lowercase letter or underscore. Номи корбари шумо бояд бо ҳарфи хурд ё зерхат сар шавад. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Шумо метавонед танҳо ҳарфҳои хурд, рақамҳо, зерхат ва нимтиреро истифода баред. - + Your hostname is too short. Номи мизбони шумо хеле кӯтоҳ аст. - + Your hostname is too long. Номи мизбони шумо хеле дароз аст. - + '%1' is not allowed as hostname. '%1' ҳамчун номи мизбон истифода намешавад. - + Only letters, numbers, underscore and hyphen are allowed. Шумо метавонед танҳо ҳарфҳо, рақамҳо, зерхат ва нимтиреро истифода баред. - + Your passwords do not match! Ниҳонвожаҳои шумо мувофиқат намекунанд! - + OK! @@ -959,11 +978,16 @@ The installer will quit and all changes will be lost. + Packages + Бастаҳо + + + Install option: <strong>%1</strong> - + None @@ -1422,6 +1446,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1451,8 +1485,8 @@ The installer will quit and all changes will be lost. Гузарвожаро тасдиқ намоед - - + + Please enter the same passphrase in both boxes. Лутфан, гузарвожаи ягонаро дар ҳар дуи сатр ворид намоед. @@ -1541,32 +1575,32 @@ The installer will quit and all changes will be lost. &Ҳозир аз нав оғоз карда шавад - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Ҳамааш тайёр.</h1><br/>%1 дар компютери шумо танзим карда шуд.<br/>Акнун шумо метавонед истифодаи низоми навро оғоз намоед. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Агар ин имконро интихоб кунед, низоми шумо пас аз зер кардани тугмаи <span style="font-style:italic;">Анҷоми кор</span> ё пӯшидани барномаи танзимкунӣ дарҳол аз нав оғоз карда мешавад.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Ҳамааш тайёр.</h1><br/>%1 дар компютери шумо насб карда шуд.<br/>Акнун шумо метавонед компютерро аз нав оғоз карда, ба низоми нав ворид шавед ё истифодаи муҳити зиндаи %2-ро идома диҳед. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Агар ин имконро интихоб кунед, низоми шумо пас аз зер кардани тугмаи <span style="font-style:italic;">Анҷоми кор</span> ё пӯшидани насбкунанда дарҳол аз нав оғоз карда мешавад.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Танзимкунӣ қатъ шуд</h1><br/>%1 дар компютери шумо танзим карда нашуд.<br/>Паёми хато: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Насбкунӣ қатъ шуд</h1><br/>%1 дар компютери шумо насб карда нашуд.<br/>Паёми хато: %2. @@ -1600,12 +1634,18 @@ The installer will quit and all changes will be lost. Шаклбандии қисми диск бо ҳаҷми <strong>%3MiB</strong> - <strong>%1</strong> бо низоми файлии <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Шаклбандии қисми диски %1 бо низоми файлии %2. - + The installer failed to format partition %1 on disk '%2'. Насбкунанда қисми диски %1-ро дар диски '%2' шаклбандӣ карда натавонист. @@ -1613,12 +1653,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space ақаллан %1 ГБ фазои диск дастрас аст - + There is not enough drive space. At least %1 GiB is required. Дар диск фазои кофӣ нест. Ақаллан %1 ГБ лозим аст. @@ -1658,27 +1698,27 @@ The installer will quit and all changes will be lost. насбкунанда бо ҳуқуқҳои маъмурӣ (root) иҷро шуда истодааст. - + The setup program is not running with administrator rights. Барномаи насбкунӣ бе ҳуқуқҳои маъмурӣ иҷро шуда истодааст. - + The installer is not running with administrator rights. Насбкунанда бе ҳуқуқҳои маъмурӣ иҷро шуда истодааст. - + has a screen large enough to show the whole installer экран равзанаи насбкунандаро ба таври пурра нишон медиҳад - + The screen is too small to display the setup program. Экран барои нишон додани барномаи насбкунӣ хеле хурд аст. - + The screen is too small to display the installer. Экран барои нишон додани насбкунанда хеле хурд аст. @@ -1978,35 +2018,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. Танзимкунии файли калиди LUKS. - - + + No partitions are defined. Ягон қисми диск муайян карда нашуд. - - - + + + Encrypted rootfs setup error Хатои танзими рамзгузории "rootfs" - + Root partition %1 is LUKS but no passphrase has been set. Қисми диски реша (root)-и %1 дар LUKS асос меёбад, вале гузарвожа танзим нашудааст. - + Could not create LUKS key file for root partition %1. Файли калидии LUKS барои қисми диски реша (root)-и %1 эҷод карда нашуд. - + Could not configure LUKS key file on partition %1. Файли калидии LUKS дар қисми диски %1 танзим карда нашуд. @@ -2032,12 +2072,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 Минтақаи вақт: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2049,100 +2089,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection Интихоби бастаҳо - + Office software Нармафзори идорӣ - + Office package Бастаҳои идорӣ - + Browser software Нармафзори браузерӣ - + Browser package Бастаҳои браузерӣ - + Web browser Браузери сомона - + Kernel + label for netinstall module, Linux kernel Ҳаста - + Services + label for netinstall module, system services Хидматҳо - + Login + label for netinstall module, choose login manager Воридшавӣ - + Desktop + label for netinstall module, choose desktop environment Мизи корӣ - - Applications - Барномаҳо - - - + Communication + label for netinstall module Воситаҳои алоқа - + Development + label for netinstall module Барномарезӣ - + Office + label for netinstall module Идора - + Multimedia + label for netinstall module Мултимедиа - + Internet + label for netinstall module Интернет - + Theming + label for netinstall module Мавзӯъҳо - + Gaming + label for netinstall module Бозиҳо - + Utilities + label for netinstall module Барномаҳои муфид + + + Applications + Барномаҳо + NotesQmlViewStep @@ -2191,24 +2243,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 Минтақаи вақт: %1 - + Select your preferred Zone within your Region. Шаҳри пазируфтаи худро дар ҳудуди минтақаи худ интихоб намоед. - + Zones Шаҳрҳо - + You can fine-tune Language and Locale settings below. Шумо метавонед танзимоти забон ва маҳаллисозиро дар зер дуруст кунед. @@ -2483,7 +2535,7 @@ The installer will quit and all changes will be lost. Хатои номаълум - + Password is empty Ниҳонвожаро ворид накардед @@ -2521,22 +2573,6 @@ The installer will quit and all changes will be lost. Лутфан, маҳсулеро аз рӯйхат интихоб намоед. Маҳсули интихобшуда насб карда мешавад. - - PackageChooserQmlViewStep - - - Packages - Бастаҳо - - - - PackageChooserViewStep - - - Packages - Бастаҳо - - PackageModel @@ -3065,7 +3101,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3391,12 +3427,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: Барои натиҷаҳои беҳтарин, мутмаин шавед, ки дар ин компютер: - + System requirements Талаботи низом @@ -3824,22 +3860,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Барои гирифтани маълумоти муфассал оид ба изҳори назари корбар, дар ин ҷо зер кунед</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Пайгирӣ ба %1 барои дидани шумораи насбҳо, намудҳои сахтафзорҳо ва маҷмӯаи барномаҳои истифодашуда кумак мерасонад. Барои дидани маълумоте, ки фиристода мешавад нишонаи кумакро дар назди ҳар як мавод зер кунед. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Агар ин имконро интихоб кунед, шумо маълумотро дар бораи насбкунӣ ва сахтафзори худ мефиристонед. Ин маълумот <b>танҳо як маротиба</b> баъд аз анҷоми насбкунӣ фиристода мешавад. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Агар ин имконро интихоб кунед, шумо маълумотро ба таври мунтазам дар бораи насбкунӣ, сахтафзор ва барномаҳои <b>компютери</b> худ ба %1 мефиристонед. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Агар ин имконро интихоб кунед, шумо маълумотро ба таври мунтазам дар бораи насбкунӣ, сахтафзор ва барномаҳои <b>корбари</b> худ ба %1 мефиристонед. @@ -4027,44 +4063,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Хуш омадед ба барномаи танзимкунии Calamares барои %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Хуш омадед ба танзимкунии %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Хуш омадед ба насбкунандаи Calamares барои %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Хуш омадед ба насбкунандаи %1.</h1> - - - %1 support Дастгирии %1 - + About %1 setup Дар бораи танзими %1 - + About %1 installer Дар бораи насбкунандаи %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>барои %3</strong><br/><br/>Ҳуқуқи муаллиф 2014-2017 Тео Марҷавак &lt;teo@kde.org&gt;<br/>Ҳуқуқи муаллиф 2017-2020 Адриан де Грут &lt;groot@kde.org&gt;<br/>Ташаккури зиёд ба <a href="https://calamares.io/team/">дастаи Calamares</a> ва <a href="https://www.transifex.com/calamares/calamares/">гурӯҳи тарҷумонони Calamares</a> (тарҷумаи тоҷикӣ аз ҷониби Виктор Ибрагимов &lt;victor.ibragimov@gmail.com&gt;).<br/><br/>Барномарезии насбкунандаи <a href="https://calamares.io/">Calamares</a> аз тарафи <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software дастгирӣ карда мешавад. - WelcomeQmlViewStep @@ -4129,33 +4140,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - барои %3</strong><br/><br/> - Ҳуқуқи муаллиф 2014-2017 Тео Марҷавак &lt;teo@kde.org&gt;<br/> - Ҳуқуқи муаллиф 2017-2020 Адриан де Грут &lt;groot@kde.org&gt;<br/> - Ташаккури зиёд ба <a href='https://calamares.io/team/'>дастаи Calamares</a> - ва <a href='https://www.transifex.com/calamares/calamares/'>гурӯҳи тарҷумонони Calamares</a> (тарҷумаи тоҷикӣ аз ҷониби Виктор Ибрагимов &lt;victor.ibragimov@gmail.com&gt;).<br/><br/> - Барномарезии насбкунандаи <a href='https://calamares.io/'>Calamares</a> - аз тарафи <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software дастгирӣ карда мешавад. - - - + Back Ба қафо @@ -4258,17 +4243,17 @@ Output: Намунаи клавиатура: - + Layouts Тарҳбандиҳо - + Type here to test your keyboard Барои санҷидани клавиатура ҳарфҳоро дар ин сатр ворид намоед - + Variants Имконот @@ -4416,102 +4401,102 @@ Output: Агар зиёда аз як корбар ин компютерро истифода барад, шумо метавонед баъд аз насбкунӣ якчанд ҳисобро эҷод намоед. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Шумо метавонед танҳо ҳарфҳои хурд, рақамҳо, зерхат ва нимтиреро истифода баред. - + root is not allowed as username. - + What is the name of this computer? Номи ин компютер чист? - + Computer Name Номи компютери шумо - + This name will be used if you make the computer visible to others on a network. Ин ном истифода мешавад, агар шумо компютери худро барои дигарон дар шабака намоён кунед. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Барои эмин нигоҳ доштани ҳисоби худ ниҳонвожаеро интихоб намоед. - + Password Ниҳонвожаро ворид намоед - + Repeat Password Ниҳонвожаро тасдиқ намоед - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Ниҳонвожаи ягонаро ду маротиба ворид намоед, то ки он барои хатоҳои имлоӣ тафтиш карда шавад. Ниҳонвожаи хуб бояд дар омезиш калимаҳо, рақамҳо ва аломатҳои китобатиро дар бар гирад, ақаллан аз ҳашт аломат иборат шавад ва мунтазам иваз карда шавад. - + Validate passwords quality Санҷиши сифати ниҳонвожаҳо - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Агар шумо ин имконро интихоб кунед, қувваи ниҳонвожа тафтиш карда мешавад ва шумо ниҳонвожаи заифро истифода карда наметавонед. - + Log in automatically without asking for the password Ба таври худкор бе дархости ниҳонвожа ворид карда шавад - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password Ниҳонвожаи корбар ҳам барои ниҳонвожаи root истифода карда шавад - + Use the same password for the administrator account. Ниҳонвожаи ягона барои ҳисоби маъмурӣ истифода бурда шавад. - + Choose a root password to keep your account safe. Барои эмин нигоҳ доштани ҳисоби худ ниҳонвожаи root-ро интихоб намоед. - + Root Password Ниҳонвожаи root - + Repeat Root Password Ниҳонвожаи root-ро тасдиқ намоед - + Enter the same password twice, so that it can be checked for typing errors. Ниҳонвожаи ягонаро ду маротиба ворид намоед, то ки он барои хатоҳои имлоӣ тафтиш карда шавад. diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts index 51433aaeb..9cd94ae73 100644 --- a/lang/calamares_th.ts +++ b/lang/calamares_th.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information ข้อมูลดีบั๊ก @@ -171,7 +190,7 @@ Calamares::JobThread - + Done เสร็จสิ้น @@ -261,21 +280,21 @@ - + Waiting for %n module(s). กำลังรอ %n โมดูล - + (%n second(s)) (%n วินาที) - + System-requirements checking is complete. @@ -481,12 +500,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer ตัวติดตั้ง %1 @@ -525,149 +544,149 @@ The installer will quit and all changes will be lost. ฟอร์ม - + Select storage de&vice: เลือกอุปก&รณ์จัดเก็บ: - - - - + + + + Current: ปัจจุบัน: - + After: หลัง: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>กำหนดพาร์ทิชันด้วยตนเอง</strong><br/>คุณสามารถสร้างหรือเปลี่ยนขนาดของพาร์ทิชันได้ด้วยตนเอง - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>เลือกพาร์ทิชันที่จะลดขนาด แล้วลากแถบด้านล่างเพื่อปรับขนาด</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: ที่อยู่บูตโหลดเดอร์: - + <strong>Select a partition to install on</strong> <strong>เลือกพาร์ทิชันที่จะติดตั้ง</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. ไม่พบพาร์ทิชันสำหรับระบบ EFI อยู่ที่ไหนเลยในระบบนี้ กรุณากลับไปเลือกใช้การแบ่งพาร์ทิชันด้วยตนเอง เพื่อติดตั้ง %1 - + The EFI system partition at %1 will be used for starting %2. พาร์ทิชันสำหรับระบบ EFI ที่ %1 จะถูกใช้เพื่อเริ่มต้น %2 - + EFI system partition: พาร์ทิชันสำหรับระบบ EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. ดูเหมือนว่าอุปกรณ์จัดเก็บข้อมูลนี้ไม่มีระบบปฏิบัติการ คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บข้อมูลของคุณ - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>ล้างดิสก์</strong><br/>การกระทำนี้จะ<font color="red">ลบ</font>ข้อมูลทั้งหมดที่อยู่บนอุปกรณ์จัดเก็บข้อมูลที่เลือก - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>ติดตั้งควบคู่กับระบบปฏิบัติการเดิม</strong><br/>ตัวติดตั้งจะลดเนื้อที่พาร์ทิชันเพื่อให้มีเนื้อที่สำหรับ %1 - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>แทนที่พาร์ทิชัน</strong><br/>แทนที่พาร์ทิชันด้วย %1 - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. อุปกรณ์จัดเก็บข้อมูลนี้มีระบบปฏิบัติการ %1 อยู่ คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บข้อมูลของคุณ - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. อุปกรณ์จัดเก็บข้อมูลนี้มีระบบปฏิบัติการอยู่แล้ว คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บข้อมูลของคุณ - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. อุปกรณ์จัดเก็บข้อมูลนี้มีหลายระบบปฏิบัติการ คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บข้อมูลของคุณ - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -755,27 +774,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> ตั้งค่าโมเดลแป้นพิมพ์เป็น %1<br/> - + Set keyboard layout to %1/%2. ตั้งค่าแบบแป้นพิมพ์เป็น %1/%2 - + Set timezone to %1/%2. ตั้งค่าโซนเวลาเป็น %1/%2 - + The system language will be set to %1. ภาษาของระบบจะถูกตั้งค่าเป็น %1 - + The numbers and dates locale will be set to %1. ตำแหน่งที่ตั้งสำหรับหมายเลขและวันที่จะถูกตั้งค่าเป็น %1 @@ -810,97 +829,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> คอมพิวเตอร์เครื่องนี้มีความต้องการไม่เพียงพอที่จะตั้งค่า %1<br/>ไม่สามารถทำการตั้งค่าต่อไปได้ <a href="#details">รายละเอียด...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> คอมพิวเตอร์เครื่องนี้มีความต้องการไม่เพียงพอที่จะติดตั้ง %1<br/>ไม่สามารถทำการติดตั้งต่อไปได้ <a href="#details">รายละเอียด...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. คอมพิวเตอร์มีความต้องการไม่เพียงพอที่จะติดตั้ง %1<br/>สามารถทำการติดตั้งต่อไปได้ แต่ฟีเจอร์บางอย่างจะถูกปิดไว้ - + This program will ask you some questions and set up %2 on your computer. โปรแกรมนี้จะถามคำถามต่าง ๆ เพื่อติดตั้ง %2 ลงในคอมพิวเตอร์ของคุณ - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>ยินดีต้อนรับสู่ตัวตั้งค่า %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>ยินดีต้อนรับสู่ตัวติดตั้ง Calamares สำหรับ %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>ยินดีต้อนรับสู่ตัวติดตั้ง %1</h1> - + Your username is too long. ชื่อผู้ใช้ของคุณยาวเกินไป - + '%1' is not allowed as username. ไม่อนุญาตให้ใช้ '%1' เป็นชื่อผู้ใช้ - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. ชื่อโฮสต์ของคุณสั้นเกินไป - + Your hostname is too long. ชื่อโฮสต์ของคุณยาวเกินไป - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! รหัสผ่านของคุณไม่ตรงกัน! - + OK! ตกลง! @@ -956,11 +975,16 @@ The installer will quit and all changes will be lost. + Packages + แพ็กเกจ + + + Install option: <strong>%1</strong> - + None @@ -1419,6 +1443,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1448,8 +1482,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1538,32 +1572,32 @@ The installer will quit and all changes will be lost. &R เริ่มต้นใหม่ทันที - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>เสร็จสิ้น</h1><br/>%1 ติดตั้งบนคอมพิวเตอร์ของคุณเรียบร้อย<br/>คุณสามารถเริ่มต้นใหม่เพื่อเข้าสู่ระบบใหม่ของคุณ หรือดำเนินการใช้ %2 ในแบบไม่ต้องติดตั้ง (Live) ต่อไป - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>การติดตั้งไม่สำเร็จ</h1><br/>%1 ไม่ได้ถูกติดตั้งลงบนคอมพิวเตอร์ของคุณ<br/>ข้อความข้อผิดพลาดคือ: %2 @@ -1597,12 +1631,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. ตัวติดตั้งไม่สามารถฟอร์แมทพาร์ทิชัน %1 บนดิสก์ '%2' @@ -1610,12 +1650,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1655,27 +1695,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer มีหน้าจอใหญ่พอที่จะแสดงผลตัวติดตั้งได้ทั้งหมด - + The screen is too small to display the setup program. - + The screen is too small to display the installer. หน้าจอเล็กเกินกว่าที่จะแสดงผลตัวติดตั้ง @@ -1975,35 +2015,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2029,12 +2069,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 เขตเวลา: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2044,100 +2084,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection เลือกแพ็กเกจ - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel + label for netinstall module, Linux kernel เคอร์เนล - + Services + label for netinstall module, system services บริการ - + Login + label for netinstall module, choose login manager เข้าสู่ระบบ - + Desktop + label for netinstall module, choose desktop environment เดสก์ท็อป - - Applications - แอปพลิเคชัน - - - + Communication + label for netinstall module การสื่อสาร - + Development + label for netinstall module การพัฒนา - + Office + label for netinstall module ออฟฟิศ - + Multimedia + label for netinstall module สื่อ - + Internet + label for netinstall module อินเทอร์เน็ต - + Theming + label for netinstall module การปรับแต่ง - + Gaming + label for netinstall module เกม - + Utilities + label for netinstall module + + + Applications + แอปพลิเคชัน + NotesQmlViewStep @@ -2186,24 +2238,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 เขตเวลา: %1 - + Select your preferred Zone within your Region. - + Zones เขต - + You can fine-tune Language and Locale settings below. @@ -2469,7 +2521,7 @@ The installer will quit and all changes will be lost. ข้อผิดพลาดที่ไม่รู้จัก - + Password is empty รหัสผ่านว่าง @@ -2507,22 +2559,6 @@ The installer will quit and all changes will be lost. เลือกผลิตภัณฑ์จากรายการ ผลิตภัณฑ์ที่เลือกไว้จะถูกติดตั้ง - - PackageChooserQmlViewStep - - - Packages - แพ็กเกจ - - - - PackageChooserViewStep - - - Packages - แพ็กเกจ - - PackageModel @@ -3048,7 +3084,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3371,12 +3407,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: สำหรับผลลัพธ์ที่ดีขึ้น โปรดตรวจสอบให้แน่ใจว่าคอมพิวเตอร์เครื่องนี้: - + System requirements ความต้องการของระบบ @@ -3804,22 +3840,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4007,44 +4043,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>ยินดีต้อนรับสู่โปรแกรมตั้งค่า Calamares สำหรับ %1</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>ยินดีต้อนรับสู่ตัวตั้งค่า %1</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>ยินดีต้อนรับสู่ตัวติดตั้ง Calamares สำหรับ %1</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>ยินดีต้อนรับสู่ตัวติดตั้ง %1</h1> - - - %1 support - + About %1 setup เกี่ยวกับตัวตั้งค่า %1 - + About %1 installer เกี่ยวกับตัวติดตั้ง %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4109,23 +4120,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back ย้อนกลับ @@ -4225,17 +4220,17 @@ Output: โมเดลแป้นพิมพ์: - + Layouts - + Type here to test your keyboard พิมพ์ที่นี่เพื่อทดสอบแป้นพิมพ์ของคุณ - + Variants @@ -4362,102 +4357,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? คอมพิวเตอร์เครื่องนี้ชื่ออะไร? - + Computer Name ชื่อคอมพิวเตอร์ - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. เลือกรหัสผ่านเพื่อรักษาบัญชีผู้ใช้ของคุณให้ปลอดภัย - + Password รหัสผ่าน - + Repeat Password กรอกรหัสผ่านซ้ำ - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts index d730f4867..c0acf127b 100644 --- a/lang/calamares_tr_TR.ts +++ b/lang/calamares_tr_TR.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Gereç Ağacı - + Debug information Hata ayıklama bilgisi @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Sistem kurulumu tamamlandı, kurulum aracından çıkabilirsiniz. @@ -261,7 +280,7 @@ <i>%1</i> modülü için gerekenler tamamlandı. - + Waiting for %n module(s). %n modülü bekleniyor. @@ -269,7 +288,7 @@ - + (%n second(s)) (%n saniye(ler)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. Sistem gereksinimleri kontrolü tamamlandı. @@ -488,12 +507,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. CalamaresWindow - + %1 Setup Program %1 Kurulum Uygulaması - + %1 Installer %1 Yükleniyor @@ -532,150 +551,150 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Biçim - + Select storage de&vice: Depolama ay&gıtı seç: - - - - + + + + Current: Geçerli: - + After: Sonra: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Elle bölümleme</strong><br/>Bölümler oluşturabilir ve boyutlandırabilirsiniz. - + Reuse %1 as home partition for %2. %2 ev bölümü olarak %1 yeniden kullanılsın. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Küçültmek için bir bölüm seçip alttaki çubuğu sürükleyerek boyutlandır</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1, %2MB'a küçülecek ve %4 için yeni bir %3MB disk bölümü oluşturulacak. - + Boot loader location: Önyükleyici konumu: - + <strong>Select a partition to install on</strong> <strong>Yükleyeceğin disk bölümünü seç</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Bu sistemde EFI disk bölümü bulunamadı. Lütfen geri dönün ve %1 kurmak için gelişmiş kurulum seçeneğini kullanın. - + The EFI system partition at %1 will be used for starting %2. %1 EFI sistem bölümü %2 başlatmak için kullanılacaktır. - + EFI system partition: EFI sistem bölümü: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Bu depolama aygıtı üzerinde yüklü herhangi bir işletim sistemi tespit etmedik. Ne yapmak istersiniz?<br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Diski sil</strong><br/>Seçili depolama bölümündeki mevcut veriler şu anda <font color="red">silinecektir.</font> - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Yanına yükleyin</strong><br/>Sistem yükleyici disk bölümünü küçülterek %1 için yer açacak. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Varolan bir disk bölümüne kur</strong><br/>Varolan bir disk bölümü üzerine %1 kur. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Bu depolama aygıtı üzerinde %1 vardır. Ne yapmak istersiniz?<br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Bu depolama aygıtı üzerinde bir işletim sistemi yüklü. Ne yapmak istersiniz? <br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Bu depolama aygıtı üzerinde birden fazla işletim sistemi var. Ne yapmak istersiniz? <br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Bu depolama aygıtının üzerinde zaten bir işletim sistemi var, ancak <strong>%1</strong> bölüm tablosu, gerekli <strong>%2</strong>'den farklı. <br/> - + This storage device has one of its partitions <strong>mounted</strong>. Bu depolama aygıtının disk bölümlerinden biri <strong>bağlı</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Bu depolama aygıtı, <strong>etkin olmayan bir RAID</strong> cihazının parçasıdır. - + No Swap Takas alanı yok - + Reuse Swap Yeniden takas alanı - + Swap (no Hibernate) Takas Alanı (uyku modu yok) - + Swap (with Hibernate) Takas Alanı (uyku moduyla) - + Swap to file Takas alanı dosyası @@ -763,27 +782,27 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Config - + Set keyboard model to %1.<br/> %1 Klavye düzeni olarak seçildi.<br/> - + Set keyboard layout to %1/%2. Alt klavye türevi olarak %1/%2 seçildi. - + Set timezone to %1/%2. %1/%2 Zaman dilimi ayarla. - + The system language will be set to %1. Sistem dili %1 olarak ayarlanacak. - + The numbers and dates locale will be set to %1. Sayılar ve günler için sistem yereli %1 olarak ayarlanacak. @@ -818,99 +837,99 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Ağ Üzerinden Kurulum. (Devre Dışı: Paket listeleri alınamıyor, ağ bağlantısını kontrol ediniz) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Bu bilgisayar %1 kurulumu için minimum gereksinimleri karşılamıyor.<br/>Kurulum devam etmeyecek. <a href="#details">Detaylar...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Bu bilgisayara %1 yüklemek için asgari gereksinimler karşılanamadı. Kurulum devam edemiyor. <a href="#detaylar">Detaylar...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Bu bilgisayar %1 kurulumu için önerilen gereksinimlerin bazılarına uymuyor. Kurulum devam edebilirsiniz ancak bazı özellikler devre dışı bırakılabilir. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Bu bilgisayara %1 yüklemek için önerilen gereksinimlerin bazıları karşılanamadı.<br/> Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. - + This program will ask you some questions and set up %2 on your computer. Bu program size bazı sorular soracak ve bilgisayarınıza %2 kuracak. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>%1 için Calamares kurulum programına hoş geldiniz</h1> - + <h1>Welcome to %1 setup</h1> <h1>%1 kurulumuna hoş geldiniz</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>%1 Calamares Sistem Yükleyiciye Hoş Geldiniz</h1> - + <h1>Welcome to the %1 installer</h1> <h1>%1 Sistem Yükleyiciye Hoş Geldiniz</h1> - + Your username is too long. Kullanıcı adınız çok uzun. - + '%1' is not allowed as username. '%1' kullanıcı adı olarak izin verilmiyor. - + Your username must start with a lowercase letter or underscore. Kullanıcı adınız küçük harf veya alt çizgi ile başlamalıdır. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Sadece küçük harflere, sayılara, alt çizgi ve kısa çizgilere izin verilir. - + Your hostname is too short. Makine adınız çok kısa. - + Your hostname is too long. Makine adınız çok uzun. - + '%1' is not allowed as hostname. '%1' ana bilgisayar adı olarak kullanılamaz. - + Only letters, numbers, underscore and hyphen are allowed. Sadece harfler, rakamlar, alt çizgi ve kısa çizgi izin verilir. - + Your passwords do not match! Parolanız eşleşmiyor! - + OK! TAMAM! @@ -966,11 +985,16 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. + Packages + Paketler + + + Install option: <strong>%1</strong> Kurulum seçeneği: <strong>%1</strong> - + None Hiçbiri @@ -1429,6 +1453,16 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.FS Label: DS Etiketi: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1458,8 +1492,8 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.Parolayı doğrula - - + + Please enter the same passphrase in both boxes. Her iki kutuya da aynı parolayı giriniz. @@ -1548,32 +1582,32 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.&Şimdi yeniden başlat - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Kurulum Tamamlandı.</h1><br/>%1 bilgisayarınıza kuruldu.<br/>Şimdi yeni kurduğunuz işletim sistemini kullanabilirsiniz. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Bu kutucuk işaretlenerek <span style="font-style:italic;">Tamam</span> butonu tıklandığında ya da kurulum uygulaması kapatıldığında bilgisayarınız yeniden başlatılacaktır.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Kurulum işlemleri tamamlandı.</h1><br/>%1 bilgisayarınıza yüklendi<br/>Yeni kurduğunuz sistemi kullanmak için yeniden başlatabilir veya %2 Çalışan sistem ile devam edebilirsiniz. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Bu kutucuk işaretlenerek <span style="font-style:italic;">Tamam</span> butonu tıklandığında ya da sistem yükleyici kapatıldığında bilgisayarınız yeniden başlatılacaktır.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Kurulum Başarısız</h1><br/>%1 bilgisayarınıza kurulamadı.<br/>Hata mesajı: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Yükleme Başarısız</h1><br/>%1 bilgisayarınıza yüklenemedi.<br/>Hata mesajı çıktısı: %2. @@ -1607,12 +1641,18 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.<strong>%1</strong> diskine <strong>%2</strong> dosya sistemi ile <strong>%3MB</strong> disk bölümü oluştur. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. %1 disk bölümü %2 dosya sistemi ile biçimlendiriliyor. - + The installer failed to format partition %1 on disk '%2'. Yükleyici %1 bölümünü '%2' diski üzerinde biçimlendiremedi. @@ -1620,12 +1660,12 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. GeneralRequirements - + has at least %1 GiB available drive space En az %1 GB disk sürücü alanı var - + There is not enough drive space. At least %1 GiB is required. Yeterli disk sürücü alanı mevcut değil. En az %1 GB disk alanı gereklidir. @@ -1666,27 +1706,27 @@ Sistem güç kaynağına bağlı değil. yükleyiciyi yönetici (kök) olarak çalıştırıyor - + The setup program is not running with administrator rights. Kurulum uygulaması yönetici haklarıyla çalışmıyor. - + The installer is not running with administrator rights. Sistem yükleyici yönetici haklarına sahip olmadan çalışmıyor. - + has a screen large enough to show the whole installer yükleyicinin tamamını gösterecek kadar büyük bir ekrana sahip - + The screen is too small to display the setup program. Kurulum uygulamasını görüntülemek için ekran çok küçük. - + The screen is too small to display the installer. Ekran, sistem yükleyiciyi görüntülemek için çok küçük. @@ -1986,35 +2026,35 @@ Sistem güç kaynağına bağlı değil. LuksBootKeyFileJob - + Configuring LUKS key file. LUKS anahtar dosyası yapılandırılıyor. - - + + No partitions are defined. Hiçbir disk bölümü tanımlanmadı. - - - + + + Encrypted rootfs setup error Şifrelenmiş rootfs kurulum hatası - + Root partition %1 is LUKS but no passphrase has been set. %1 kök disk bölümü LUKS olacak fakat bunun için parola belirlenmedi. - + Could not create LUKS key file for root partition %1. %1 kök disk bölümü için LUKS anahtar dosyası oluşturulamadı. - + Could not configure LUKS key file on partition %1. %1 disk bölümü LUKS anahtar dosyası yapılandırılamadı. @@ -2040,12 +2080,12 @@ Sistem güç kaynağına bağlı değil. Map - + Timezone: %1 Zaman dilimi: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2057,100 +2097,112 @@ Sistem güç kaynağına bağlı değil. NetInstallViewStep - + Package selection Paket seçimi - + Office software Ofis yazılımı - + Office package Ofis paketi - + Browser software Tarayıcı yazılımı - + Browser package Tarayıcı paketi - + Web browser İnternet tarayıcısı - + Kernel + label for netinstall module, Linux kernel Çekirdek - + Services + label for netinstall module, system services Servisler - + Login + label for netinstall module, choose login manager Oturum aç - + Desktop + label for netinstall module, choose desktop environment Masaüstü - - Applications - Uygulamalar - - - + Communication + label for netinstall module İletişim - + Development + label for netinstall module Gelişim - + Office + label for netinstall module Ofis - + Multimedia + label for netinstall module Multimedya - + Internet + label for netinstall module İnternet - + Theming + label for netinstall module Temalar - + Gaming + label for netinstall module Oyunlar - + Utilities + label for netinstall module Bileşenler + + + Applications + Uygulamalar + NotesQmlViewStep @@ -2199,24 +2251,24 @@ Sistem güç kaynağına bağlı değil. Tercih ettiğiniz Bölgeyi seçin veya varsayılan ayarları kullanın. - - - + + + Timezone: %1 Zaman dilimi: %1 - + Select your preferred Zone within your Region. Konumunuzda tercih ettiğiniz Bölgeyi seçin. - + Zones Bölge - + You can fine-tune Language and Locale settings below. Aşağıda Dil ve Yerel Ayar ayarlarında ince ayar yapabilirsiniz. @@ -2491,7 +2543,7 @@ Sistem güç kaynağına bağlı değil. Bilinmeyen hata - + Password is empty Şifre boş @@ -2529,22 +2581,6 @@ Sistem güç kaynağına bağlı değil. Lütfen listeden bir ürün seçin. Seçilen ürün yüklenecek. - - PackageChooserQmlViewStep - - - Packages - Paketler - - - - PackageChooserViewStep - - - Packages - Paketler - - PackageModel @@ -3074,7 +3110,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3400,12 +3436,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: En iyi sonucu elde etmek için bilgisayarınızın aşağıdaki gereksinimleri karşıladığından emin olunuz: - + System requirements Sistem gereksinimleri @@ -3833,22 +3869,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Kullanıcı geri bildirimi hakkında daha fazla bilgi için burayı tıklayın</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. İzleme, %1 ne sıklıkla yüklendiğini, hangi donanıma kurulduğunu ve hangi uygulamaların kullanıldığını görmesine yardımcı olur. Nelerin gönderileceğini görmek için lütfen her bir alanın yanındaki yardım simgesini tıklayın. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Bunu seçerek kurulumunuz ve donanımınız hakkında bilgi göndereceksiniz. Bu bilgiler, kurulum bittikten sonra <b> yalnızca bir kez </b> gönderilecektir. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Bunu seçerek, periyodik olarak %1'e <b> makine </b> kurulum, donanım ve uygulamalarınız hakkında bilgi gönderirsiniz. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Bunu seçerek, <b> kullanıcı </b> kurulumunuz, donanımınız, uygulamalarınız ve uygulama kullanım alışkanlıklarınız hakkında düzenli olarak %1'e bilgi gönderirsiniz. @@ -4036,44 +4072,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>%1 için Calamares sistem kurulum uygulamasına hoş geldiniz.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>%1 Kurulumuna Hoş Geldiniz.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>%1 Calamares Sistem Yükleyici .</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>%1 Sistem Yükleyiciye Hoşgeldiniz.</h1> - - - %1 support %1 destek - + About %1 setup %1 kurulum hakkında - + About %1 installer %1 sistem yükleyici hakkında - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Telif Hakkı 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Telif Hakkı 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Teşekkürler <a href="https://calamares.io/team/">Calamares takımı</a> ve <a href="https://www.transifex.com/calamares/calamares/">Calamares çeviri ekibi</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> gelişim sponsoru <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Özgür Yazılım - WelcomeQmlViewStep @@ -4138,34 +4149,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%3<br/> - için %2</strong><br/><br/> - Telif Hakkı 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Telif Hakkı 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Teşekkürler <a href='https://calamares.io/team/'>Calamares takımı</a> - ve <a href='https://www.transifex.com/calamares/calamares/'>Calamares - çeviri takımı</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - gelişim sponsoru <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Özgür Yazılım. - - - + Back Geri @@ -4270,17 +4254,17 @@ Output: Klavye Modeli: - + Layouts Düzenler - + Type here to test your keyboard Klavye seçiminizi burada test edebilirsiniz - + Variants Türevler @@ -4429,102 +4413,102 @@ Output: Bu bilgisayarı birden fazla kişi kullanacaksa, kurulumdan sonra birden fazla hesap oluşturabilirsiniz. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Sadece küçük harflere, sayılara, alt çizgi ve kısa çizgilere izin verilir. - + root is not allowed as username. root kullanıcı adı olarak kulanılmasına izin verilmez. - + What is the name of this computer? Bu bilgisayarın adı nedir? - + Computer Name Bilgisayar Adı - + This name will be used if you make the computer visible to others on a network. Bilgisayarı ağ üzerinde herkese görünür yaparsanız bu ad kullanılacaktır. - + localhost is not allowed as hostname. localhost ana bilgisayar adı olarak kullanılmasına izin verilmez. - + Choose a password to keep your account safe. Hesabınızın güvenliğini sağlamak için bir parola belirleyiniz. - + Password Şifre - + Repeat Password Şifreyi Tekrarla - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Yazım hataları açısından kontrol edilebilmesi için aynı parolayı iki kez girin. İyi bir şifre, harflerin, sayıların ve noktalama işaretlerinin bir karışımını içerecektir, en az sekiz karakter uzunluğunda olmalı ve düzenli aralıklarla değiştirilmelidir. - + Validate passwords quality Parola kalitesini doğrulayın - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Bu kutu işaretlendiğinde parola gücü kontrolü yapılır ve zayıf bir parola kullanamazsınız. - + Log in automatically without asking for the password Parola sormadan otomatik olarak oturum açın - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. En az iki karakter olmak üzere yalnızca harflere, sayılara, alt çizgiye ve kısa çizgiye izin verilir. - + Reuse user password as root password Kullanıcı şifresini yetkili kök şifre olarak kullan - + Use the same password for the administrator account. Yönetici ile kullanıcı aynı şifreyi kullansın. - + Choose a root password to keep your account safe. Hesabınızı güvende tutmak için bir kök şifre seçin. - + Root Password Kök Şifre - + Repeat Root Password Kök Şifresini Tekrarla - + Enter the same password twice, so that it can be checked for typing errors. Yazım hataları açısından kontrol edilebilmesi için aynı parolayı iki kez girin. diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts index 1d1001140..cadd05d67 100644 --- a/lang/calamares_uk.ts +++ b/lang/calamares_uk.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + <h1>%1</h1><br/><strong>%2<br/> для %3</strong><br/><br/> + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + Дякуємо <a href="https://calamares.io/team/">команді Calamares</a> та <a href="https://www.transifex.com/calamares/calamares/">команді перекладачів Calamares</a>.<br/><br/>Фінансову підтримку розробки <a href="https://calamares.io/">Calamares</a> було забезпечено <br/><a href="http://www.blue-systems.com/">Blue Systems</a> — робимо програмне забезпечення вільним. + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + © %3 &lt;%4&gt;, %1–%2<br/> + + AutoMountManagementJob @@ -137,7 +156,7 @@ Дерево віджетів - + Debug information Діагностична інформація @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Готово @@ -261,7 +280,7 @@ Перевірку виконання вимог щодо модуля <i>%1</i> завершено. - + Waiting for %n module(s). Очікування %n модулю. @@ -271,7 +290,7 @@ - + (%n second(s)) (%n секунда) @@ -281,7 +300,7 @@ - + System-requirements checking is complete. Перевірка системних вимог завершена. @@ -492,12 +511,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Програма для налаштовування %1 - + %1 Installer Засіб встановлення %1 @@ -536,149 +555,149 @@ The installer will quit and all changes will be lost. Форма - + Select storage de&vice: Обрати &пристрій зберігання: - - - - + + + + Current: Зараз: - + After: Після: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Розподілення вручну</strong><br/>Ви можете створити або змінити розмір розділів власноруч. - + Reuse %1 as home partition for %2. Використати %1 як домашній розділ (home) для %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Оберіть розділ для зменшення, потім тягніть повзунок, щоб змінити розмір</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 буде стиснуто до %2 МіБ. Натомість буде створено розділ розміром %3 МіБ для %4. - + Boot loader location: Розташування завантажувача: - + <strong>Select a partition to install on</strong> <strong>Оберіть розділ, на який встановити</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. В цій системі не знайдено жодного системного розділу EFI. Щоб встановити %1, будь ласка, поверніться та оберіть розподілення вручну. - + The EFI system partition at %1 will be used for starting %2. Системний розділ EFI %1 буде використано для встановлення %2. - + EFI system partition: Системний розділ EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Цей пристрій зберігання, схоже, не має жодної операційної системи. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Очистити диск</strong><br/>Це <font color="red">знищить</font> всі данні, присутні на обраному пристрої зберігання. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Встановити поруч</strong><br/>Засіб встановлення зменшить розмір розділу, щоб вивільнити простір для %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Замінити розділ</strong><br/>Замінити розділу на %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. На цьому пристрої зберігання є %1. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. На цьому пристрої зберігання вже є операційна система. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. На цьому пристрої зберігання вже є декілька операційних систем. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> На пристрої для зберігання даних може бути інша операційна система, але його таблиця розділів <strong>%1</strong> не є потрібною — <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. На цьому пристрої для зберігання даних <strong>змонтовано</strong> один із його розділів. - + This storage device is a part of an <strong>inactive RAID</strong> device. Цей пристрій для зберігання даних є частиною пристрою <strong>неактивного RAID</strong>. - + No Swap Без резервної пам'яті - + Reuse Swap Повторно використати резервну пам'ять - + Swap (no Hibernate) Резервна пам'ять (без присипляння) - + Swap (with Hibernate) Резервна пам'ять (із присиплянням) - + Swap to file Резервна пам'ять у файлі @@ -766,27 +785,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Встановити модель клавіатури як %1.<br/> - + Set keyboard layout to %1/%2. Встановити розкладку клавіатури як %1/%2. - + Set timezone to %1/%2. Встановити часовий пояс %1/%2. - + The system language will be set to %1. Мову %1 буде встановлено як системну. - + The numbers and dates locale will be set to %1. %1 буде встановлено як локаль чисел та дат. @@ -821,97 +840,97 @@ The installer will quit and all changes will be lost. Встановлення через мережу. (Вимкнено: Неможливо отримати список пакетів, перевірте ваше підключення до мережі) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Цей комп'ютер не задовольняє мінімальні вимоги для налаштовування %1.<br/>Налаштовування неможливо продовжити. <a href="#details">Докладніше...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Цей комп'ютер не задовольняє мінімальні вимоги для встановлення %1.<br/>Встановлення неможливо продовжити. <a href="#details">Докладніше...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Цей комп'ютер не задовольняє рекомендовані вимоги щодо налаштовування %1. Встановлення можна продовжити, але деякі можливості можуть виявитися недоступними. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Цей комп'ютер не задовольняє рекомендовані вимоги для встановлення %1.<br/>Встановлення можна продовжити, але деякі можливості можуть виявитися недоступними. - + This program will ask you some questions and set up %2 on your computer. Ця програма поставить кілька питань та встановить %2 на ваш комп'ютер. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Вітаємо у програмі налаштовування Calamares для %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Вітаємо у програмі для налаштовування %1</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Ласкаво просимо до засобу встановлення Calamares для %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Ласкаво просимо до засобу встановлення %1</h1> - + Your username is too long. Ваше ім'я задовге. - + '%1' is not allowed as username. «%1» не можна використовувати як ім'я користувача. - + Your username must start with a lowercase letter or underscore. Ваше ім'я користувача має починатися із малої літери або символу підкреслювання. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Можна використовувати лише латинські літери нижнього регістру, цифри, символи підкреслювання та дефіси. - + Your hostname is too short. Назва вузла є надто короткою. - + Your hostname is too long. Назва вузла є надто довгою. - + '%1' is not allowed as hostname. «%1» не можна використовувати як назву вузла. - + Only letters, numbers, underscore and hyphen are allowed. Можна використовувати лише латинські літери, цифри, символи підкреслювання та дефіси. - + Your passwords do not match! Паролі не збігаються! - + OK! Гаразд! @@ -967,11 +986,16 @@ The installer will quit and all changes will be lost. + Packages + Пакунки + + + Install option: <strong>%1</strong> Варіант встановлення: <strong>%1</strong> - + None Немає @@ -1430,6 +1454,16 @@ The installer will quit and all changes will be lost. FS Label: Мітка ФС: + + + Passphrase for existing partition + Пароль до наявного розділу + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Розділ %1 не вдалося розшифрувати з використанням наданого пароля.<br/><br/>Виконайте редагування розділів ще раз і вкажіть правильний пароль або вилучіть розділ і створіть новий шифрований розділ. + EncryptWidget @@ -1459,8 +1493,8 @@ The installer will quit and all changes will be lost. Підтвердження ключової фрази - - + + Please enter the same passphrase in both boxes. Будь ласка, введіть однакову ключову фразу у обидва текстові вікна. @@ -1549,32 +1583,32 @@ The installer will quit and all changes will be lost. &Перезавантажити зараз - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Виконано.</h1><br/>На вашому комп'ютері було налаштовано %1.<br/>Можете починати користуватися вашою новою системою. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Якщо позначено цей пункт, вашу систему буде негайно перезапущено після натискання кнопки <span style="font-style:italic;">Закінчити</span> або закриття вікна програми для налаштовування.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Все зроблено.</h1><br/>%1 встановлено на ваш комп'ютер.<br/>Ви можете перезавантажитися до вашої нової системи або продовжити використання Live-середовища %2. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Якщо позначено цей пункт, вашу систему буде негайно перезапущено після натискання кнопки <span style="font-style:italic;">Закінчити</span> або закриття вікна засобу встановлення.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Не вдалося налаштувати</h1><br/>%1 не було налаштовано на вашому комп'ютері.<br/>Повідомлення про помилку: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Встановлення зазнало невдачі</h1><br/>%1 не було встановлено на Ваш комп'ютер.<br/>Повідомлення про помилку: %2. @@ -1608,12 +1642,18 @@ The installer will quit and all changes will be lost. Форматувати розділ у <strong>%3 МіБ</strong> <strong>%1</strong> з використанням файлової системи <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Форматування розділу %1 з файловою системою %2. - + The installer failed to format partition %1 on disk '%2'. Засобу встановлення не вдалося виконати форматування розділу %1 на диску «%2». @@ -1621,12 +1661,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space містить принаймні %1 ГіБ місця на диску - + There is not enough drive space. At least %1 GiB is required. На диску недостатньо місця. Потрібно принаймні %1 ГіБ. @@ -1666,27 +1706,27 @@ The installer will quit and all changes will be lost. виконує засіб встановлення від імені адміністратора (root) - + The setup program is not running with administrator rights. Програму для налаштовування запущено не від імені адміністратора. - + The installer is not running with administrator rights. Засіб встановлення запущено без прав адміністратора. - + has a screen large enough to show the whole installer має достатньо великий для усього вікна засобу встановлення екран - + The screen is too small to display the setup program. Екран є замалим для показу вікна засобу налаштовування. - + The screen is too small to display the installer. Екран замалий для показу вікна засобу встановлення. @@ -1986,35 +2026,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. Налаштовуємо файл ключа LUKS. - - + + No partitions are defined. Не визначено жодного розділу. - - - + + + Encrypted rootfs setup error Помилка налаштовування зашифрованих rootfs - + Root partition %1 is LUKS but no passphrase has been set. Кореневим розділом %1 є розділ LUKS, але пароль до нього не встановлено. - + Could not create LUKS key file for root partition %1. Не вдалося створити файл ключа LUKS для кореневого розділу %1. - + Could not configure LUKS key file on partition %1. Не вдалося налаштувати файл ключа LUKS на розділі %1. @@ -2040,12 +2080,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 Часовий пояс: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2057,100 +2097,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection Вибір пакетів - + Office software Офісні програми - + Office package Офісний пакунок - + Browser software Браузери - + Browser package Пакунок браузера - + Web browser Переглядач інтернету - + Kernel + label for netinstall module, Linux kernel Ядро - + Services + label for netinstall module, system services Служби - + Login + label for netinstall module, choose login manager Вхід до системи - + Desktop + label for netinstall module, choose desktop environment Стільниця - - Applications - Програми - - - + Communication + label for netinstall module Спілкування - + Development + label for netinstall module Розробка - + Office + label for netinstall module Офіс - + Multimedia + label for netinstall module Звук та відео - + Internet + label for netinstall module Інтернет - + Theming + label for netinstall module Теми - + Gaming + label for netinstall module Ігри - + Utilities + label for netinstall module Інструменти + + + Applications + Програми + NotesQmlViewStep @@ -2199,24 +2251,24 @@ The installer will quit and all changes will be lost. Виберіть ваш бажаний регіон або скористайтеся типовими параметрами. - - - + + + Timezone: %1 Часовий пояс: %1 - + Select your preferred Zone within your Region. Виберіть бажану для вас зону у межах вашого регіону. - + Zones Зони - + You can fine-tune Language and Locale settings below. Нижче ви можете скоригувати параметри мови і локалі. @@ -2510,7 +2562,7 @@ The installer will quit and all changes will be lost. Невідома помилка - + Password is empty Пароль є порожнім @@ -2548,22 +2600,6 @@ The installer will quit and all changes will be lost. Будь ласка, виберіть продукт зі списку. Буде встановлено вибраний продукт. - - PackageChooserQmlViewStep - - - Packages - Пакунки - - - - PackageChooserViewStep - - - Packages - Пакунки - - PackageModel @@ -3092,7 +3128,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3418,12 +3454,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: Щоб отримати найкращий результат, будь ласка, переконайтеся, що цей комп'ютер: - + System requirements Вимоги до системи @@ -3851,22 +3887,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Натисніть, щоб дізнатися більше про відгуки користувачів</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Стеження допоможе %1 визначити частоту встановлення, параметри обладнання для встановлення та перелік використовуваних програм. Щоб переглянути дані, які буде надіслано, будь ласка, натисніть піктограму довідки, яку розташовано поряд із кожним пунктом. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Якщо буде позначено цей пункт, програма надішле дані щодо встановленої системи та обладнання. Ці дані буде надіслано <b>лише один раз</b> після завершення встановлення. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Якщо позначити цей пункт, програма періодично надсилатиме дані щодо <b>встановленої вами системи загалом</b>, обладнання і програм до %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Якщо позначити цей пункт, програма регулярно надсилатиме дані щодо встановленої вами системи користувача, обладнання, програм та користування системою до %1. @@ -4054,44 +4090,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Вітаємо у програмі налаштовування Calamares для %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Вітаємо у програмі для налаштовування %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Ласкаво просимо до засобу встановлення Calamares для %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Ласкаво просимо до засобу встановлення %1.</h1> - - - %1 support Підтримка %1 - + About %1 setup Про засіб налаштовування %1 - + About %1 installer Про засіб встановлення %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>для %3</strong><br/><br/>© Teo Mrnjavac &lt;teo@kde.org&gt;, 2014–2017<br/>© Adriaan de Groot &lt;groot@kde.org&gt;, 2017–2020<br/>Дякуємо <a href="https://calamares.io/team/">команді розробників Calamares</a> та <a href="https://www.transifex.com/calamares/calamares/">команді перекладачів Calamares</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> розроблено за фінансової підтримки <br/><a href="http://www.blue-systems.com/">Blue Systems</a> — Liberating Software. - WelcomeQmlViewStep @@ -4156,33 +4167,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - для %3</strong><br/><br/> - © Teo Mrnjavac &lt;teo@kde.org&gt;, 2014-2017<br/> - © Adriaan de Groot &lt;groot@kde.org&gt;, 2017-2020<br/> - Дякуємо <a href='https://calamares.io/team/'>команді Calamares</a> - та <a href='https://www.transifex.com/calamares/calamares/'>команді перекладачів Calamares</a>.<br/><br/> - Розробку <a href='https://calamares.io/'>Calamares</a> - було фінансово підтримано <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back Назад @@ -4287,17 +4272,17 @@ Output: Модель клавіатури: - + Layouts Розкладки - + Type here to test your keyboard Напишіть тут, щоб перевірити клавіатуру - + Variants Варіанти @@ -4446,102 +4431,102 @@ Output: Якщо за цим комп'ютером працюватимуть декілька користувачів, ви можете створити декілька облікових записів після встановлення. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Можна використовувати лише латинські літери нижнього регістру, цифри, символи підкреслювання та дефіси. - + root is not allowed as username. Не можна використовувати ім'я користувача «root». - + What is the name of this computer? Назва цього комп'ютера? - + Computer Name Назва комп'ютера - + This name will be used if you make the computer visible to others on a network. Цю назву буде використано, якщо ви зробите комп'ютер видимим іншим у мережі. - + localhost is not allowed as hostname. «localhost» не можна використовувати як назву вузла. - + Choose a password to keep your account safe. Оберіть пароль, щоб тримати ваш обліковий рахунок у безпеці. - + Password Пароль - + Repeat Password Повторіть пароль - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Введіть один й той самий пароль двічі, для перевірки щодо помилок введення. Надійному паролю слід містити суміш літер, чисел та розділових знаків, бути довжиною хоча б вісім символів та регулярно змінюватись. - + Validate passwords quality Перевіряти якість паролів - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Якщо позначено цей пункт, буде виконано перевірку складності пароля. Ви не зможете скористатися надто простим паролем. - + Log in automatically without asking for the password Входити автоматично без пароля - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. Можна використовувати лише латинські літери, цифри, символи підкреслювання та дефіси; не менше двох символів. - + Reuse user password as root password Використати пароль користувача як пароль root - + Use the same password for the administrator account. Використовувати той самий пароль і для облікового рахунку адміністратора. - + Choose a root password to keep your account safe. Виберіть пароль root для захисту вашого облікового запису. - + Root Password Пароль root - + Repeat Root Password Повторіть пароль root - + Enter the same password twice, so that it can be checked for typing errors. Введіть один й той самий пароль двічі, щоб убезпечитися від помилок при введенні. diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts index c0ddba0e9..a93b89de5 100644 --- a/lang/calamares_ur.ts +++ b/lang/calamares_ur.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done @@ -261,7 +280,7 @@ - + Waiting for %n module(s). @@ -269,7 +288,7 @@ - + (%n second(s)) @@ -277,7 +296,7 @@ - + System-requirements checking is complete. @@ -482,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -526,149 +545,149 @@ The installer will quit and all changes will be lost. - + Select storage de&vice: - - - - + + + + Current: - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -756,27 +775,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -811,97 +830,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -957,11 +976,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1420,6 +1444,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1449,8 +1483,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1539,32 +1573,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1598,12 +1632,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1611,12 +1651,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1656,27 +1696,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1976,35 +2016,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2030,12 +2070,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2045,98 +2085,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2187,24 +2239,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2479,7 +2531,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2517,22 +2569,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3058,7 +3094,7 @@ Output: QObject - + %1 (%2) @@ -3381,12 +3417,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3814,22 +3850,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4017,44 +4053,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - ٪ 1 Calamares کے انسٹالر میں خوش آمدید - - - - <h1>Welcome to the %1 installer.</h1> - <h1>٪ 1 انسٹالر میں خوش آمدید۔</h1> - - - %1 support ٪ 1 سپورٹ - + About %1 setup تقریبا٪ 1 سیٹ اپ - + About %1 installer لگ بھگ٪ 1 انسٹال - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4119,23 +4130,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back واپس @@ -4235,17 +4230,17 @@ Output: - + Layouts لے آؤٹ - + Type here to test your keyboard - + Variants متغیرات @@ -4372,102 +4367,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts index a252bf7de..ec0ac362d 100644 --- a/lang/calamares_vi.ts +++ b/lang/calamares_vi.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ Cây công cụ - + Debug information Thông tin gỡ lỗi @@ -171,7 +190,7 @@ Calamares::JobThread - + Done Xong @@ -261,21 +280,21 @@ Kiểm tra các yêu cầu cho mô-đun <i> %1 </i> đã hoàn tất. - + Waiting for %n module(s). Đang đợi %n mô-đun. - + (%n second(s)) (%n giây) - + System-requirements checking is complete. Kiểm tra yêu cầu hệ thống đã hoàn tất. @@ -482,12 +501,12 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< CalamaresWindow - + %1 Setup Program %1 Thiết lập chương trình - + %1 Installer %1 cài đặt hệ điều hành @@ -526,149 +545,149 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Biểu mẫu - + Select storage de&vice: &Chọn thiết bị lưu trữ: - - - - + + + + Current: Hiện tại: - + After: Sau khi cài đặt: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong> Phân vùng thủ công </strong> <br/> Bạn có thể tự tạo hoặc thay đổi kích thước phân vùng. - + Reuse %1 as home partition for %2. Sử dụng lại %1 làm phân vùng chính cho %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong> Chọn một phân vùng để thu nhỏ, sau đó kéo thanh dưới cùng để thay đổi kích thước </strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 sẽ được thu nhỏ thành %2MiB và phân vùng %3MiB mới sẽ được tạo cho %4. - + Boot loader location: Vị trí bộ tải khởi động: - + <strong>Select a partition to install on</strong> <strong> Chọn phân vùng để cài đặt </strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Không thể tìm thấy phân vùng hệ thống EFI ở bất kỳ đâu trên hệ thống này. Vui lòng quay lại và sử dụng phân vùng thủ công để thiết lập %1. - + The EFI system partition at %1 will be used for starting %2. Phân vùng hệ thống EFI tại %1 sẽ được sử dụng để bắt đầu %2. - + EFI system partition: Phân vùng hệ thống EFI: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Thiết bị lưu trữ này dường như không có hệ điều hành trên đó. Bạn muốn làm gì? <br/> Bạn sẽ có thể xem xét và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong> Xóa đĩa </strong> <br/> Thao tác này sẽ <font color = "red"> xóa </font> tất cả dữ liệu hiện có trên thiết bị lưu trữ đã chọn. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong> Cài đặt cùng với </strong> <br/> Trình cài đặt sẽ thu nhỏ phân vùng để nhường chỗ cho %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong> Thay thế phân vùng </strong> <br/> Thay thế phân vùng bằng %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Thiết bị lưu trữ này có %1 trên đó. Bạn muốn làm gì? <br/> Bạn sẽ có thể xem lại và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Thiết bị lưu trữ này đã có hệ điều hành trên đó. Bạn muốn làm gì? <br/> Bạn sẽ có thể xem lại và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. Thiết bị lưu trữ này có nhiều hệ điều hành trên đó. Bạn muốn làm gì? <br/> Bạn sẽ có thể xem lại và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> Thiết bị lưu trữ này đã có sẵn hệ điều hành, nhưng bảng phân vùng <strong> %1 </strong> khác với bảng <strong> %2 </strong> cần thiết. <br/> - + This storage device has one of its partitions <strong>mounted</strong>. Thiết bị lưu trữ này có một trong các phân vùng được <strong> gắn kết </strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. Thiết bị lưu trữ này là một phần của thiết bị <strong> RAID không hoạt động </strong>. - + No Swap Không hoán đổi - + Reuse Swap Sử dụng lại Hoán đổi - + Swap (no Hibernate) Hoán đổi (không ngủ đông) - + Swap (with Hibernate) Hoán đổi (ngủ đông) - + Swap to file Hoán đổi sang tệp @@ -756,27 +775,27 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Config - + Set keyboard model to %1.<br/> Thiệt lập bàn phím kiểu %1.<br/> - + Set keyboard layout to %1/%2. Thiết lập bố cục bàn phím thành %1/%2. - + Set timezone to %1/%2. Thiết lập múi giờ sang %1/%2. - + The system language will be set to %1. Ngôn ngữ hệ thống sẽ được đặt thành %1. - + The numbers and dates locale will be set to %1. Định dạng ngôn ngữ của số và ngày tháng sẽ được chuyển thành %1. @@ -811,97 +830,97 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Cài đặt mạng. (Tắt: Không thể lấy được danh sách gói ứng dụng, kiểm tra kết nối mạng) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> Máy tính này không đạt đủ yêu cấu tối thiểu để thiết lập %1.<br/>Không thể tiếp tục thiết lập. <a href="#details">Chi tiết...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Máy tính này không đạt đủ yêu cấu tối thiểu để cài đặt %1.<br/>Không thể tiếp tục cài đặt. <a href="#details">Chi tiết...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. Máy tính này không đạt đủ yêu cấu khuyến nghị để thiết lập %1.<br/>Thiết lập có thể tiếp tục, nhưng một số tính năng có thể sẽ bị tắt. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. Máy tính này không đạt đủ yêu cấu khuyến nghị để cài đặt %1.<br/>Cài đặt có thể tiếp tục, nhưng một số tính năng có thể sẽ bị tắt. - + This program will ask you some questions and set up %2 on your computer. Chương trình này sẽ hỏi bạn vài câu hỏi và thiết lập %2 trên máy tính của bạn. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Chào mừng đến với chương trình Calamares để thiết lập %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Chào mừng đến với thiết lập %1 </h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Chào mừng đến với chương trình Calamares để cài đặt %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Chào mừng đến với bộ cài đặt %1 </h1> - + Your username is too long. Tên bạn hơi dài. - + '%1' is not allowed as username. '%1' không được phép dùng làm tên. - + Your username must start with a lowercase letter or underscore. Tên người dùng của bạn phải bắt đầu bằng chữ cái viết thường hoặc dấu gạch dưới. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Chỉ cho phép các chữ cái viết thường, số, gạch dưới và gạch nối. - + Your hostname is too short. Tên máy chủ quá ngắn. - + Your hostname is too long. Tên máy chủ quá dài. - + '%1' is not allowed as hostname. '%1' không được phép dùng làm tên máy chủ. - + Only letters, numbers, underscore and hyphen are allowed. Chỉ cho phép các chữ cái, số, gạch dưới và gạch nối. - + Your passwords do not match! Mật khẩu nhập lại không khớp! - + OK! @@ -957,11 +976,16 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< + Packages + Gói + + + Install option: <strong>%1</strong> - + None @@ -1420,6 +1444,16 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1449,8 +1483,8 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Xác nhận cụm mật khẩu - - + + Please enter the same passphrase in both boxes. Vui lòng nhập cùng một cụm mật khẩu vào cả hai hộp. @@ -1539,32 +1573,32 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< &Khởi động lại ngay - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>Hoàn thành.</h1><br/>%1 đã được cài đặt thành công.<br/>Hãy khởi động lại máy tính. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>Tích chọn để khởi động lại sau khi ấn <span style="font-style:italic;">Hoàn thành</span> hoặc đóng phần mềm thiết lập.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>Hoàn thành.</h1><br/>%1 đã được cài đặt trên máy.<br/>hãy khởi động lại, hoặc cũng có thể tiếp tục sử dụng %2 môi trường USB. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>Tích chọn để khởi động lại sau khi ấn <span style="font-style:italic;">Hoàn thành</span> hoặc đóng phần mềm cài đặt.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>Thiết lập lỗi</h1><br/>%1 đã không được thiết lập trên máy tính.<br/>tin báo lỗi: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>Cài đặt lỗi</h1><br/>%1 chưa được cài đặt trên máy tính<br/>Tin báo lỗi: %2. @@ -1598,12 +1632,18 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Định dạng <strong>%3MiB</strong> phân vùng <strong>%1</strong>với tập tin hệ thống <strong>%2</strong>. - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. Đang định dạng phân vùng %1 với tập tin hệ thống %2. - + The installer failed to format partition %1 on disk '%2'. Không thể định dạng %1 ở đĩa '%2'. @@ -1611,12 +1651,12 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< GeneralRequirements - + has at least %1 GiB available drive space có ít nhất %1 GiB dung lượng ổ đĩa khả dụng - + There is not enough drive space. At least %1 GiB is required. Không có đủ dung lượng ổ đĩa. Ít nhất %1 GiB là bắt buộc. @@ -1656,27 +1696,27 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< đang chạy trình cài đặt với tư cách quản trị viên (root) - + The setup program is not running with administrator rights. Chương trình thiết lập không chạy với quyền quản trị viên. - + The installer is not running with administrator rights. Trình cài đặt không chạy với quyền quản trị viên. - + has a screen large enough to show the whole installer có màn hình đủ lớn để hiển thị toàn bộ trình cài đặt - + The screen is too small to display the setup program. Màn hình quá nhỏ để hiển thị chương trình cài đặt. - + The screen is too small to display the installer. Màn hình quá nhỏ để hiển thị trình cài đặt. @@ -1976,35 +2016,35 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< LuksBootKeyFileJob - + Configuring LUKS key file. Định cấu hình tệp khóa LUKS. - - + + No partitions are defined. Không có phân vùng nào được xác định. - - - + + + Encrypted rootfs setup error Lỗi thiết lập rootfs mã hóa - + Root partition %1 is LUKS but no passphrase has been set. Phân vùng gốc %1 là LUKS nhưng không có cụm mật khẩu nào được đặt. - + Could not create LUKS key file for root partition %1. Không thể tạo tệp khóa LUKS cho phân vùng gốc %1. - + Could not configure LUKS key file on partition %1. Không thể định cấu hình tệp khóa LUKS trên phân vùng %1. @@ -2030,12 +2070,12 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Map - + Timezone: %1 Múi giờ: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2047,100 +2087,112 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< NetInstallViewStep - + Package selection Chọn phân vùng - + Office software Phần mềm văn phòng - + Office package Gói văn phòng - + Browser software Phần mềm trình duyệt - + Browser package Gói trình duyệt - + Web browser Trình duyệt web - + Kernel + label for netinstall module, Linux kernel Lõi - + Services + label for netinstall module, system services Dịch vụ - + Login + label for netinstall module, choose login manager Đăng nhập - + Desktop + label for netinstall module, choose desktop environment Màn hình chính - - Applications - Ứng dụng - - - + Communication + label for netinstall module Cộng đồng - + Development + label for netinstall module Phát triển - + Office + label for netinstall module Văn phòng - + Multimedia + label for netinstall module Đa phương tiện - + Internet + label for netinstall module Mạng Internet - + Theming + label for netinstall module Chủ đề - + Gaming + label for netinstall module Trò chơi - + Utilities + label for netinstall module Tiện ích + + + Applications + Ứng dụng + NotesQmlViewStep @@ -2189,24 +2241,24 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< - - - + + + Timezone: %1 Múi giờ: %1 - + Select your preferred Zone within your Region. Chọn vùng ưa thích của bạn trong khu vực của bạn. - + Zones Vùng - + You can fine-tune Language and Locale settings below. Bạn có thể tinh chỉnh cài đặt Ngôn ngữ và Bản địa bên dưới. @@ -2472,7 +2524,7 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Lỗi không xác định - + Password is empty Mật khẩu trống @@ -2510,22 +2562,6 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Vui lòng chọn một sản phẩm từ danh sách. Sản phẩm đã chọn sẽ được cài đặt. - - PackageChooserQmlViewStep - - - Packages - Gói - - - - PackageChooserViewStep - - - Packages - Gói - - PackageModel @@ -3054,7 +3090,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3380,12 +3416,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: Để có kết quả tốt nhất, hãy đảm bảo rằng máy tính này: - + System requirements Yêu cầu hệ thống @@ -3813,22 +3849,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Bấm vào đây để biết thêm thông tin về phản hồi của người dùng</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. Theo dõi giúp %1 biết tần suất cài đặt, phần cứng được cài đặt trên phần cứng nào và ứng dụng nào được sử dụng. Để xem những gì sẽ được gửi, vui lòng nhấp vào biểu tượng trợ giúp bên cạnh mỗi khu vực. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. Bằng cách chọn này, bạn sẽ gửi thông tin về cài đặt và phần cứng của mình. Thông tin này sẽ chỉ được gửi <b> một lần </b> sau khi quá trình cài đặt kết thúc. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. Bằng cách chọn này, bạn sẽ định kỳ gửi thông tin về cài đặt <b> máy </b>, phần cứng và ứng dụng của mình cho %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. Bằng cách chọn này, bạn sẽ thường xuyên gửi thông tin về cài đặt <b> người dùng </b>, phần cứng, ứng dụng và các kiểu sử dụng ứng dụng cho %1. @@ -4016,44 +4052,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>Chào mừng đến với chương trình Calamares để thiết lập cho %1.</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>Chào mừng đến với thiết lập %1.</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>Chào mừng đến với chương trình Calamares để cài đặt cho %1.</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>Chào mừng đến với bộ cài đặt %1.</h1> - - - %1 support Hỗ trợ %1 - + About %1 setup Về thiết lập %1 - + About %1 installer Về bộ cài đặt %1 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>cho %3</strong><br/><br/>Bản quyền 2014-2017 bởi Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Bản quyền 2017-2020 bởi Adriaan de Groot &lt;groot@kde.org&gt;<br/>Cám ơn <a href="https://calamares.io/team/">đội ngũ Calamares</a> và <a href="https://www.transifex.com/calamares/calamares/">các dịch giả của Calamares</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> được tài trợ bởi <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4118,33 +4129,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - cho %3</strong><br/><br/> - Bản quyền 2014-2017 bởi Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Bản quyền 2017-2020 bởi Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Cám ơn <a href='https://calamares.io/team/'>đội ngũ Calamares</a> - và <a href='https://www.transifex.com/calamares/calamares/'>các dịch giả Calamares</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - được tài trợ bởi <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back Quay lại @@ -4246,17 +4231,17 @@ Output: Mẫu bàn phím: - + Layouts Bố cục - + Type here to test your keyboard Gõ vào đây để thử bàn phím - + Variants Các biến thể @@ -4404,102 +4389,102 @@ Output: Tạo nhiều tài khoản sau khi cài đặt nếu có nhiều người dùng chung. - + Only lowercase letters, numbers, underscore and hyphen are allowed. Chỉ cho phép các chữ cái viết thường, số, gạch dưới và gạch nối. - + root is not allowed as username. - + What is the name of this computer? Tên của máy tính này là? - + Computer Name Tên máy tính - + This name will be used if you make the computer visible to others on a network. Tên này sẽ hiển thị khi bạn kết nối vào một mạng. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. Chọn mật khẩu để giữ máy tính an toàn. - + Password Mật khẩu - + Repeat Password Lặp lại mật khẩu - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Nhập lại mật khẩu hai lần để kiểm tra. Một mật khẩu tốt phải có ít nhất 8 ký tự và bao gồm chữ, số, ký hiệu đặc biệt. Nên được thay đổi thường xuyên. - + Validate passwords quality Xác thực chất lượng mật khẩu - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Khi tích chọn, bạn có thể chọn mật khẩu yếu. - + Log in automatically without asking for the password Tự động đăng nhập không hỏi mật khẩu - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password Dùng lại mật khẩu người dùng như mật khẩu quản trị - + Use the same password for the administrator account. Dùng cùng một mật khẩu cho tài khoản quản trị. - + Choose a root password to keep your account safe. Chọn mật khẩu quản trị để giữ máy tính an toàn. - + Root Password Mật khẩu quản trị - + Repeat Root Password Lặp lại mật khẩu quản trị - + Enter the same password twice, so that it can be checked for typing errors. Nhập lại mật khẩu hai lần để kiểm tra. diff --git a/lang/calamares_zh.ts b/lang/calamares_zh.ts index ebac02047..3f057c506 100644 --- a/lang/calamares_zh.ts +++ b/lang/calamares_zh.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done @@ -261,21 +280,21 @@ - + Waiting for %n module(s). - + (%n second(s)) - + System-requirements checking is complete. @@ -480,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -524,149 +543,149 @@ The installer will quit and all changes will be lost. - + Select storage de&vice: - - - - + + + + Current: - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -754,27 +773,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -809,97 +828,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -955,11 +974,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1418,6 +1442,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1447,8 +1481,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1537,32 +1571,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1596,12 +1630,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1609,12 +1649,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1654,27 +1694,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1974,35 +2014,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2028,12 +2068,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2043,98 +2083,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2185,24 +2237,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2468,7 +2520,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2506,22 +2558,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3047,7 +3083,7 @@ Output: QObject - + %1 (%2) @@ -3370,12 +3406,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3803,22 +3839,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4006,44 +4042,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4108,23 +4119,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4224,17 +4219,17 @@ Output: - + Layouts - + Type here to test your keyboard - + Variants @@ -4361,102 +4356,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts index b5b1e0ebb..cb88308c5 100644 --- a/lang/calamares_zh_CN.ts +++ b/lang/calamares_zh_CN.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -138,7 +157,7 @@ 树形控件 - + Debug information 调试信息 @@ -172,7 +191,7 @@ Calamares::JobThread - + Done 完成 @@ -262,21 +281,21 @@ 模块<i>%1</i>的需求检查已完成。 - + Waiting for %n module(s). 等待 %n 模块。 - + (%n second(s)) (%n 秒) - + System-requirements checking is complete. 已经完成系统需求检查。 @@ -487,12 +506,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 安装程序 - + %1 Installer %1 安装程序 @@ -531,149 +550,149 @@ The installer will quit and all changes will be lost. 表单 - + Select storage de&vice: 选择存储器(&V)： - - - - + + + + Current: 当前： - + After: 之后： - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>手动分区</strong><br/>您可以自行创建或重新调整分区大小。 - + Reuse %1 as home partition for %2. 重复使用 %1 作为 %2 的 home 分区。 - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>选择要缩小的分区，然后拖动底栏改变大小</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 将会缩减未 %2MiB，然后为 %4 创建一个 %3MiB 分区。 - + Boot loader location: 引导程序位置： - + <strong>Select a partition to install on</strong> <strong>选择要安装到的分区</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. 在此系统上找不到任何 EFI 系统分区。请后退到上一步并使用手动分区配置 %1。 - + The EFI system partition at %1 will be used for starting %2. %1 处的 EFI 系统分区将被用来启动 %2。 - + EFI system partition: EFI 系统分区： - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. 这个存储器上似乎还没有操作系统。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。 - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>抹除磁盘</strong><br/>这将会<font color="red">删除</font>目前选定的存储器上所有的数据。 - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>并存安装</strong><br/>安装程序将会缩小一个分区，为 %1 腾出空间。 - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>取代一个分区</strong><br/>以 %1 <strong>替代</strong>一个分区。 - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. 这个存储器上已经有 %1 了。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。 - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. 这个存储器上已经有一个操作系统了。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。 - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. 这个存储器上已经有多个操作系统了。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。 - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> 此存储设备已经有操作系统，但是分区表 <strong>%1</strong> 与所需的 <strong>%2</strong>.<br/>不同。 - + This storage device has one of its partitions <strong>mounted</strong>. 此存储设备 <strong>已挂载</strong>其中一个分区。 - + This storage device is a part of an <strong>inactive RAID</strong> device. 该存储设备是 <strong>非活动RAID</strong> 设备的一部分。 - + No Swap 无交换分区 - + Reuse Swap 重用交换分区 - + Swap (no Hibernate) 交换分区(无休眠) - + Swap (with Hibernate) 交换分区(带休眠) - + Swap to file 交换到文件 @@ -761,27 +780,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> 设置键盘型号为 %1。<br/> - + Set keyboard layout to %1/%2. 设置键盘布局为 %1/%2。 - + Set timezone to %1/%2. 将时区设置为 %1/%2 。 - + The system language will be set to %1. 系统语言将设置为 %1。 - + The numbers and dates locale will be set to %1. 数字和日期地域将设置为 %1。 @@ -816,99 +835,99 @@ The installer will quit and all changes will be lost. 网络安装。（已禁用：无法获取软件包列表，请检查网络连接） - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> 此计算机不满足安装 %1 的某些推荐配置。 安装可以继续，但是一些特性可能被禁用。 - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> 此电脑未满足安装 %1 的最低需求。<br/>安装无法继续。<a href="#details">详细信息...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. 此计算机不满足安装 %1 的某些推荐配置。 安装可以继续，但是一些特性可能被禁用。 - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. 此电脑未满足一些安装 %1 的推荐需求。<br/>可以继续安装，但一些功能可能会被停用。 - + This program will ask you some questions and set up %2 on your computer. 本程序将会问您一些问题并在您的电脑上安装及设置 %2 。 - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>欢迎使用 %1 的 Calamares 安装程序</h1> - + <h1>Welcome to %1 setup</h1> <h1>欢迎使用 %1 设置</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>欢迎使用 %1 的 Calamares 安装程序</h1> - + <h1>Welcome to the %1 installer</h1> <h1>欢迎使用 %1 安装程序</h1> - + Your username is too long. 用户名太长。 - + '%1' is not allowed as username. '%1' 不允许作为用户名。 - + Your username must start with a lowercase letter or underscore. 用户名必须以小写字母或下划线"_"开头 - + Only lowercase letters, numbers, underscore and hyphen are allowed. 只允许小写字母、数组、下划线"_" 和 连字符"-" - + Your hostname is too short. 主机名太短。 - + Your hostname is too long. 主机名太长。 - + '%1' is not allowed as hostname. '%1' 不允许作为主机名。 - + Only letters, numbers, underscore and hyphen are allowed. 只允许字母、数组、下划线"_" 和 连字符"-" - + Your passwords do not match! 密码不匹配！ - + OK! 确定 @@ -964,11 +983,16 @@ The installer will quit and all changes will be lost. + Packages + 软件包 + + + Install option: <strong>%1</strong> 安装选项：<strong>%1</strong> - + None 无 @@ -1428,6 +1452,16 @@ The installer will quit and all changes will be lost. FS Label: 文件系统卷标 + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1457,8 +1491,8 @@ The installer will quit and all changes will be lost. 确认密码 - - + + Please enter the same passphrase in both boxes. 请在两个输入框中输入同样的密码。 @@ -1547,32 +1581,32 @@ The installer will quit and all changes will be lost. 现在重启(&R) - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>安装成功！</h1><br/>%1 已安装在您的电脑上了。<br/>您现在可以重新启动到新系统。 - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>当选中此项时，系统会在您关闭安装器或点击 <span style=" font-style:italic;">完成</span> 按钮时立即重启</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>安装成功！</h1><br/>%1 已安装在您的电脑上了。<br/>您现在可以重新启动到新系统，或是继续使用 %2 Live 环境。 - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>当选中此项时，系统会在您关闭安装器或点击 <span style=" font-style:italic;">完成</span> 按钮时立即重启</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>安装失败</h1><br/>%1 未在你的电脑上安装。<br/>错误信息：%2。 - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>安装失败</h1><br/>%1 未在你的电脑上安装。<br/>错误信息：%2。 @@ -1606,12 +1640,18 @@ The installer will quit and all changes will be lost. 以文件系统 <strong>%2</strong> 格式化 <strong>%3MB</strong> 的分区 <strong>%1</strong>。 - + + %1 (%2) + partition label %1 (device path %2) + %1（%2） + + + Formatting partition %1 with file system %2. 正在使用 %2 文件系统格式化分区 %1。 - + The installer failed to format partition %1 on disk '%2'. 安装程序格式化磁盘“%2”上的分区 %1 失败。 @@ -1619,12 +1659,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space 有至少 %1 GB 可用磁盘空间 - + There is not enough drive space. At least %1 GiB is required. 没有足够的磁盘空间。至少需要 %1 GB。 @@ -1664,27 +1704,27 @@ The installer will quit and all changes will be lost. 正以管理员(root)权限运行安装器 - + The setup program is not running with administrator rights. 安装器未以管理员权限运行 - + The installer is not running with administrator rights. 安装器未以管理员权限运行 - + has a screen large enough to show the whole installer 有一个足够大的屏幕来显示整个安装器 - + The screen is too small to display the setup program. 屏幕太小无法显示安装程序。 - + The screen is too small to display the installer. 屏幕不能完整显示安装器。 @@ -1984,35 +2024,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. 配置 LUKS key 文件。 - - + + No partitions are defined. 未定义分区。 - - - + + + Encrypted rootfs setup error 加密根文件系时配置错误 - + Root partition %1 is LUKS but no passphrase has been set. 根分区%1为LUKS但没有设置密钥。 - + Could not create LUKS key file for root partition %1. 无法创建根分区%1的LUKS密钥文件。 - + Could not configure LUKS key file on partition %1. 无法配置根分区%1的LUKS密钥文件。 @@ -2038,12 +2078,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 时区: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2055,100 +2095,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection 软件包选择 - + Office software 办公软件 - + Office package 办公软件包 - + Browser software 浏览器软件 - + Browser package 浏览器安装包 - + Web browser 网页浏览器 - + Kernel + label for netinstall module, Linux kernel 内核 - + Services + label for netinstall module, system services 服务 - + Login + label for netinstall module, choose login manager 登录 - + Desktop + label for netinstall module, choose desktop environment 桌面 - - Applications - 应用程序 - - - + Communication + label for netinstall module 通讯 - + Development + label for netinstall module 开发 - + Office + label for netinstall module 办公 - + Multimedia + label for netinstall module 多媒体 - + Internet + label for netinstall module 互联网 - + Theming + label for netinstall module 主题化 - + Gaming + label for netinstall module 游戏 - + Utilities + label for netinstall module 实用工具 + + + Applications + 应用程序 + NotesQmlViewStep @@ -2197,24 +2249,24 @@ The installer will quit and all changes will be lost. 请选择你偏好打地区或者使用当期默认设置 - - - + + + Timezone: %1 时区: %1 - + Select your preferred Zone within your Region. 在您的区域中选择您的首选区域。 - + Zones 区域 - + You can fine-tune Language and Locale settings below. 您可以在下面微调“语言”和“区域设置”。 @@ -2480,7 +2532,7 @@ The installer will quit and all changes will be lost. 未知错误 - + Password is empty 密码是空 @@ -2518,22 +2570,6 @@ The installer will quit and all changes will be lost. 请在列表中选一个产品。被选中的产品将会被安装。 - - PackageChooserQmlViewStep - - - Packages - 软件包 - - - - PackageChooserViewStep - - - Packages - 软件包 - - PackageModel @@ -3062,7 +3098,7 @@ Output: QObject - + %1 (%2) %1（%2） @@ -3388,12 +3424,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: 为了更好的体验，请确保这台电脑: - + System requirements 系统需求 @@ -3821,22 +3857,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">点击此处以获取关于用户反馈的详细信息</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. 跟踪帮助 %1 以查看它的安装频率、安装硬件以及使用的应用程序。请点按每项旁的帮助图标以查看即将被发送的信息。 - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. 选中此项时，安装器将发送关于安装过程和硬件的信息。该信息仅会在安装结束后发送<b>一次</b> 。 - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. 通过选择此选项，您将定期将有关您 <b>计算机</b>的安装，硬件和应用程序的信息发送到 %1。 - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. 通过选择此选项，您将定期将有关<b>用户</b> 安装，硬件，应用程序和应用程序使用方式的信息发送到 %1。 @@ -4024,44 +4060,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>欢迎使用 %1 的 Calamares 安装程序。</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>欢迎使用 %1 安装程序。</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>欢迎使用 Calamares 安装程序 - %1。</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>欢迎使用 %1 安装程序。</h1> - - - %1 support %1 的支持信息 - + About %1 setup 关于 %1 安装程序 - + About %1 installer 关于 %1 安装程序 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>致谢 <a href="https://calamares.io/team/">Calamares开发团队和<a href="https://www.transifex.com/calamares/calamares/">Calamares 翻译团队</a>。<br/><br/><a href="https://calamares.io/">Calamares</a> 开发赞助来自 <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - WelcomeQmlViewStep @@ -4126,34 +4137,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - 致谢 <a href='https://calamares.io/team/'> Calamares 开发团队</a> - 和<a href='https://www.transifex.com/calamares/calamares/'>Calamares - 翻译团队</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - 开发赞助来自<br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - + Back 后退 @@ -4258,17 +4242,17 @@ Output: 键盘型号： - + Layouts 布局 - + Type here to test your keyboard 在此处数据以测试键盘 - + Variants 变体 @@ -4418,102 +4402,102 @@ Output: 如果有多人要使用此计算机，您可以在安装后创建多个账户。 - + Only lowercase letters, numbers, underscore and hyphen are allowed. 只允许小写字母、数组、下划线"_" 和 连字符"-" - + root is not allowed as username. 用户名不能为root - + What is the name of this computer? 计算机名称为？ - + Computer Name 计算机名称 - + This name will be used if you make the computer visible to others on a network. 将计算机设置为对其他网络上计算机可见时将使用此名称。 - + localhost is not allowed as hostname. localhost不能为用户名 - + Choose a password to keep your account safe. 选择一个密码来保证您的账户安全。 - + Password 密码 - + Repeat Password 重复密码 - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. 输入相同密码两次，以检查输入错误。好的密码包含字母，数字，标点的组合，应当至少为 8 个字符长，并且应按一定周期更换。 - + Validate passwords quality 验证密码质量 - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. 若选中此项，密码强度检测会开启，你将不被允许使用弱密码。 - + Log in automatically without asking for the password 不询问密码自动登录 - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. 只允许字母、数组、下划线"_" 和 连字符"-"，最少两个字符。 - + Reuse user password as root password 重用用户密码作为 root 密码 - + Use the same password for the administrator account. 为管理员帐号使用同样的密码。 - + Choose a root password to keep your account safe. 选择一个 root 密码来保证您的账户安全。 - + Root Password Root 密码 - + Repeat Root Password 重复 Root 密码 - + Enter the same password twice, so that it can be checked for typing errors. 输入相同密码两次，以检查输入错误。 diff --git a/lang/calamares_zh_HK.ts b/lang/calamares_zh_HK.ts index bd0e73672..61a23d3f7 100644 --- a/lang/calamares_zh_HK.ts +++ b/lang/calamares_zh_HK.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ - + Debug information @@ -171,7 +190,7 @@ Calamares::JobThread - + Done @@ -261,21 +280,21 @@ - + Waiting for %n module(s). - + (%n second(s)) - + System-requirements checking is complete. @@ -480,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -524,149 +543,149 @@ The installer will quit and all changes will be lost. - + Select storage de&vice: - - - - + + + + Current: - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap - + Reuse Swap - + Swap (no Hibernate) - + Swap (with Hibernate) - + Swap to file @@ -754,27 +773,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. - + Set timezone to %1/%2. - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -809,97 +828,97 @@ The installer will quit and all changes will be lost. - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> - + Your username is too long. - + '%1' is not allowed as username. - + Your username must start with a lowercase letter or underscore. - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + Your hostname is too short. - + Your hostname is too long. - + '%1' is not allowed as hostname. - + Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! - + OK! @@ -955,11 +974,16 @@ The installer will quit and all changes will be lost. + Packages + + + + Install option: <strong>%1</strong> - + None @@ -1418,6 +1442,16 @@ The installer will quit and all changes will be lost. FS Label: + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1447,8 +1481,8 @@ The installer will quit and all changes will be lost. - - + + Please enter the same passphrase in both boxes. @@ -1537,32 +1571,32 @@ The installer will quit and all changes will be lost. - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. @@ -1596,12 +1630,18 @@ The installer will quit and all changes will be lost. - + + %1 (%2) + partition label %1 (device path %2) + + + + Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. @@ -1609,12 +1649,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. @@ -1654,27 +1694,27 @@ The installer will quit and all changes will be lost. - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1974,35 +2014,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. - - + + No partitions are defined. - - - + + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - + Could not configure LUKS key file on partition %1. @@ -2028,12 +2068,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2043,98 +2083,110 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - - - Kernel - - - Services + Kernel + label for netinstall module, Linux kernel - Login + Services + label for netinstall module, system services - Desktop + Login + label for netinstall module, choose login manager - Applications - - - - - Communication + Desktop + label for netinstall module, choose desktop environment - Development + Communication + label for netinstall module - Office + Development + label for netinstall module - Multimedia + Office + label for netinstall module - Internet + Multimedia + label for netinstall module - Theming + Internet + label for netinstall module - Gaming + Theming + label for netinstall module + Gaming + label for netinstall module + + + + Utilities + label for netinstall module + + + + + Applications @@ -2185,24 +2237,24 @@ The installer will quit and all changes will be lost. - - - + + + Timezone: %1 - + Select your preferred Zone within your Region. - + Zones - + You can fine-tune Language and Locale settings below. @@ -2468,7 +2520,7 @@ The installer will quit and all changes will be lost. - + Password is empty @@ -2506,22 +2558,6 @@ The installer will quit and all changes will be lost. - - PackageChooserQmlViewStep - - - Packages - - - - - PackageChooserViewStep - - - Packages - - - PackageModel @@ -3047,7 +3083,7 @@ Output: QObject - + %1 (%2) @@ -3370,12 +3406,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: - + System requirements @@ -3803,22 +3839,22 @@ Output: - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. @@ -4006,44 +4042,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - - - - - <h1>Welcome to %1 setup.</h1> - - - - - <h1>Welcome to the Calamares installer for %1.</h1> - - - - - <h1>Welcome to the %1 installer.</h1> - - - - %1 support - + About %1 setup - + About %1 installer - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - - WelcomeQmlViewStep @@ -4108,23 +4119,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - - - - + Back @@ -4224,17 +4219,17 @@ Output: - + Layouts - + Type here to test your keyboard - + Variants @@ -4361,102 +4356,102 @@ Output: - + Only lowercase letters, numbers, underscore and hyphen are allowed. - + root is not allowed as username. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + localhost is not allowed as hostname. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts index de3e26cfc..2a55f95fd 100644 --- a/lang/calamares_zh_TW.ts +++ b/lang/calamares_zh_TW.ts @@ -1,6 +1,25 @@ + + AboutData + + + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> + + + + + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> + Copyright year-year Name <email-address> + + + AutoMountManagementJob @@ -137,7 +156,7 @@ 小工具樹 - + Debug information 除錯資訊 @@ -171,7 +190,7 @@ Calamares::JobThread - + Done 完成 @@ -261,21 +280,21 @@ 模組 <i>%1</i> 需求檢查完成。 - + Waiting for %n module(s). 正在等待 %n 個模組。 - + (%n second(s)) （%n 秒） - + System-requirements checking is complete. 系統需求檢查完成。 @@ -486,12 +505,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 設定程式 - + %1 Installer %1 安裝程式 @@ -530,149 +549,149 @@ The installer will quit and all changes will be lost. 表單 - + Select storage de&vice: 選取儲存裝置(&V)： - - - - + + + + Current: 目前： - + After: 之後： - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>手動分割</strong><br/>可以自行建立或重新調整分割區大小。 - + Reuse %1 as home partition for %2. 重新使用 %1 作為 %2 的家目錄分割區。 - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>選取要縮減的分割區，然後拖曳底部條狀物來調整大小</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 會縮減到 %2MiB，並且會為 %4 建立新的 %3MiB 分割區。 - + Boot loader location: 開機載入器位置： - + <strong>Select a partition to install on</strong> <strong>選取分割區以安裝在其上</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. 在這個系統找不到 EFI 系統分割區。請回到上一步並使用手動分割以設定 %1。 - + The EFI system partition at %1 will be used for starting %2. 在 %1 的 EFI 系統分割區將會在開始 %2 時使用。 - + EFI system partition: EFI 系統分割區： - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. 這個儲存裝置上似乎還沒有作業系統。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。 - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>抹除磁碟</strong><br/>這將會<font color="red">刪除</font>目前選取的儲存裝置所有的資料。 - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>並存安裝</strong><br/>安裝程式會縮小一個分割區，以讓出空間給 %1。 - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>取代一個分割區</strong><br/>用 %1 取代一個分割區。 - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. 這個儲存裝置上已經有 %1 了。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。 - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. 這個儲存裝置上已經有一個作業系統了。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。 - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. 這個儲存裝置上已經有多個作業系統了。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。 - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> 此儲存裝置上已有作業系統，但分割表 <strong>%1</strong> 與需要的 <strong>%2</strong> 不同。<br/> - + This storage device has one of its partitions <strong>mounted</strong>. 此裝置<strong>已掛載</strong>其中一個分割區。 - + This storage device is a part of an <strong>inactive RAID</strong> device. 此儲存裝置是<strong>非作用中 RAID</strong> 裝置的一部份。 - + No Swap 沒有 Swap - + Reuse Swap 重用 Swap - + Swap (no Hibernate) Swap（沒有冬眠） - + Swap (with Hibernate) Swap（有冬眠） - + Swap to file Swap 到檔案 @@ -760,27 +779,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> 設定鍵盤型號為 %1 。<br/> - + Set keyboard layout to %1/%2. 設定鍵盤佈局為 %1/%2 。 - + Set timezone to %1/%2. 設定時區為 %1/%2。 - + The system language will be set to %1. 系統語言會設定為%1。 - + The numbers and dates locale will be set to %1. 數字與日期語系會設定為%1。 @@ -815,97 +834,97 @@ The installer will quit and all changes will be lost. 網路安裝。（已停用：無法擷取軟體包清單，請檢查您的網路連線） - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> 此電腦未滿足安裝 %1 的最低配備。<br/>設定無法繼續。<a href="#details">詳細資訊...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> 此電腦未滿足安裝 %1 的最低配備。<br/>安裝無法繼續。<a href="#details">詳細資訊...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. 此電腦未滿足一些安裝 %1 的推薦需求。<br/>設定可以繼續，但部份功能可能會被停用。 - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. 此電腦未滿足一些安裝 %1 的推薦需求。<br/>安裝可以繼續，但部份功能可能會被停用。 - + This program will ask you some questions and set up %2 on your computer. 本程式會問您一些問題，然後在您的電腦安裝及設定 %2。 - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>歡迎使用 %1 的 Calamares 安裝程式</h1> - + <h1>Welcome to %1 setup</h1> <h1>歡迎使用 %1 安裝程式</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>歡迎使用 %1 的 Calamares 安裝程式</h1> - + <h1>Welcome to the %1 installer</h1> <h1>歡迎使用 %1 安裝程式</h1> - + Your username is too long. 您的使用者名稱太長了。 - + '%1' is not allowed as username. 「%1」無法作為使用者名稱。 - + Your username must start with a lowercase letter or underscore. 您的使用者名稱必須以小寫字母或底線開頭。 - + Only lowercase letters, numbers, underscore and hyphen are allowed. 僅允許小寫字母、數字、底線與連接號。 - + Your hostname is too short. 您的主機名稱太短了。 - + Your hostname is too long. 您的主機名稱太長了。 - + '%1' is not allowed as hostname. 「%1」無法作為主機名稱。 - + Only letters, numbers, underscore and hyphen are allowed. 僅允許字母、數字、底線與連接號。 - + Your passwords do not match! 密碼不符！ - + OK! 確定！ @@ -961,11 +980,16 @@ The installer will quit and all changes will be lost. + Packages + 軟體包 + + + Install option: <strong>%1</strong> 安裝選項：<strong>%1</strong> - + None 無 @@ -1424,6 +1448,16 @@ The installer will quit and all changes will be lost. FS Label: 檔案系統標籤： + + + Passphrase for existing partition + + + + + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + + EncryptWidget @@ -1453,8 +1487,8 @@ The installer will quit and all changes will be lost. 確認通關密語 - - + + Please enter the same passphrase in both boxes. 請在兩個框框中輸入相同的通關密語。 @@ -1543,32 +1577,32 @@ The installer will quit and all changes will be lost. 現在重新啟動 (&R) - + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. <h1>都完成了。</h1><br/>%1 已經在您的電腦上設定好了。<br/>您現在可能會想要開始使用您的新系統。 - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> <html><head/><body><p>當這個勾選框被選取時，您的系統將會在按下<span style="font-style:italic;">完成</span>或關閉設定程式時立刻重新啟動。</p></body></html> - + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. <h1>都完成了。</h1><br/>%1 已經安裝在您的電腦上了。<br/>您現在可能會想要重新啟動到您的新系統中，或是繼續使用 %2 Live 環境。 - + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> <html><head/><body><p>當這個勾選框被選取時，您的系統將會在按下<span style="font-style:italic;">完成</span>或關閉安裝程式時立刻重新啟動。</p></body></html> - + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. <h1>設定失敗</h1><br/>%1 並未在您的電腦設定好。<br/>錯誤訊息為：%2。 - + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. <h1>安裝失敗</h1><br/>%1 並未安裝到您的電腦上。<br/>錯誤訊息為：%2。 @@ -1602,12 +1636,18 @@ The installer will quit and all changes will be lost. 格式化 <strong>%3MiB</strong> 分割區 <strong>%1</strong>，使用檔案系統 <strong>%2</strong>。 - + + %1 (%2) + partition label %1 (device path %2) + %1 (%2) + + + Formatting partition %1 with file system %2. 正在以 %2 檔案系統格式化分割區 %1。 - + The installer failed to format partition %1 on disk '%2'. 安裝程式格式化在磁碟 '%2' 上的分割區 %1 失敗。 @@ -1615,12 +1655,12 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space 有至少 %1 GiB 的可用磁碟空間 - + There is not enough drive space. At least %1 GiB is required. 沒有足夠的磁碟空間。至少需要 %1 GiB。 @@ -1660,27 +1700,27 @@ The installer will quit and all changes will be lost. 以管理員 (root) 權限執行安裝程式 - + The setup program is not running with administrator rights. 設定程式並未以管理員權限執行。 - + The installer is not running with administrator rights. 安裝程式並未以管理員權限執行。 - + has a screen large enough to show the whole installer 螢幕夠大，可以顯示整個安裝程式 - + The screen is too small to display the setup program. 螢幕太小了，沒辦法顯示設定程式。 - + The screen is too small to display the installer. 螢幕太小了，沒辦法顯示安裝程式。 @@ -1980,35 +2020,35 @@ The installer will quit and all changes will be lost. LuksBootKeyFileJob - + Configuring LUKS key file. 正在設定 LUKS 金鑰檔案。 - - + + No partitions are defined. 沒有已定義的分割區。 - - - + + + Encrypted rootfs setup error 已加密的 rootfs 設定錯誤 - + Root partition %1 is LUKS but no passphrase has been set. 根分割區 %1 為 LUKS 但沒有設定密碼。 - + Could not create LUKS key file for root partition %1. 無法為根分割區 %1 建立 LUKS 金鑰檔。 - + Could not configure LUKS key file on partition %1. 無法於分割區 %1 設定 LUKS 金鑰檔。 @@ -2034,12 +2074,12 @@ The installer will quit and all changes will be lost. Map - + Timezone: %1 時區：%1 - + Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. @@ -2051,100 +2091,112 @@ The installer will quit and all changes will be lost. NetInstallViewStep - + Package selection 軟體包選擇 - + Office software 辦公軟體 - + Office package 辦公套件 - + Browser software 瀏覽器軟體 - + Browser package 瀏覽器套件 - + Web browser 網頁瀏覽器 - + Kernel + label for netinstall module, Linux kernel 內核 - + Services + label for netinstall module, system services 服務 - + Login + label for netinstall module, choose login manager 登入 - + Desktop + label for netinstall module, choose desktop environment 桌面 - - Applications - 應用程式 - - - + Communication + label for netinstall module 通訊 - + Development + label for netinstall module 開發 - + Office + label for netinstall module 辦公 - + Multimedia + label for netinstall module 多媒體 - + Internet + label for netinstall module 網際網路 - + Theming + label for netinstall module 主題 - + Gaming + label for netinstall module 遊戲 - + Utilities + label for netinstall module 實用工具 + + + Applications + 應用程式 + NotesQmlViewStep @@ -2193,24 +2245,24 @@ The installer will quit and all changes will be lost. 選取您偏好的區域，或是使用預設設定。 - - - + + + Timezone: %1 時區：%1 - + Select your preferred Zone within your Region. 在您的區域中選取您偏好的時區。 - + Zones 時區 - + You can fine-tune Language and Locale settings below. 您可以在下方微調語言與語系設定。 @@ -2476,7 +2528,7 @@ The installer will quit and all changes will be lost. 未知的錯誤 - + Password is empty 密碼為空 @@ -2514,22 +2566,6 @@ The installer will quit and all changes will be lost. 請從清單中挑選產品。將會安裝選定的產品。 - - PackageChooserQmlViewStep - - - Packages - 軟體包 - - - - PackageChooserViewStep - - - Packages - 軟體包 - - PackageModel @@ -3058,7 +3094,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3384,12 +3420,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: 為了得到最佳的結果，請確保此電腦： - + System requirements 系統需求 @@ -3817,22 +3853,22 @@ Output: <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">點選這裡來取得更多關於使用者回饋的資訊</span></a></p></body></html> - + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. 追蹤可以協助 %1 檢視其安裝頻率、安裝在什麼硬體上以及使用了哪些應用程式。要檢視會傳送哪些資訊，請點擊每個區域旁的說明按鈕。 - + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. 選取這個後，您將會傳送關於您的安裝與硬體的資訊。這個資訊將只會傳送</b>一次</b>，且在安裝完成後。 - + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. 選取這個後，您將會週期性地傳送關於您的<b>機器</b>安裝、硬體與應用程式的資訊給 %1。 - + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. 選取這個後，您將會經常傳送關於您的<b>使用者</b>安裝、硬體、應用程式與使用模式的資訊給 %1。 @@ -4020,44 +4056,19 @@ Output: - <h1>Welcome to the Calamares setup program for %1.</h1> - <h1>歡迎使用 %1 的 Calamares 安裝程式。</h1> - - - - <h1>Welcome to %1 setup.</h1> - <h1>歡迎使用 %1 安裝程式。</h1> - - - - <h1>Welcome to the Calamares installer for %1.</h1> - <h1>歡迎使用 %1 的 Calamares 安裝程式。</h1> - - - - <h1>Welcome to the %1 installer.</h1> - <h1>歡迎使用 %1 安裝程式。</h1> - - - %1 support %1 支援 - + About %1 setup 關於 %1 安裝程式 - + About %1 installer 關於 %1 安裝程式 - - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>為 %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>感謝 <a href="https://calamares.io/team/">Calamares 團隊</a>與 <a href="https://www.transifex.com/calamares/calamares/">Calamares 翻譯團隊</a>。<br/><br/><a href="https://calamares.io/">Calamares</a> 開發由 <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software 贊助。 - WelcomeQmlViewStep @@ -4122,34 +4133,7 @@ Output: about - - <h1>%1</h1><br/> - <strong>%2<br/> - for %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> - and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares - translators team</a>.<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - development is sponsored by <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software. - <h1>%1</h1><br/> - <strong>%2<br/> - 為 %3</strong><br/><br/> - Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> - Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> - 感謝 <a href='https://calamares.io/team/'>Calamares 團隊</a> - 與 <a href='https://www.transifex.com/calamares/calamares/'>Calamares - 翻譯團隊</a>。<br/><br/> - <a href='https://calamares.io/'>Calamares</a> - 的開發由 <br/> - <a href='http://www.blue-systems.com/'>Blue Systems</a> - - Liberating Software 贊助。 - - - + Back 返回 @@ -4254,17 +4238,17 @@ Output: 鍵盤型號： - + Layouts 佈局 - + Type here to test your keyboard 在此輸入以測試您的鍵盤 - + Variants 變種 @@ -4413,102 +4397,102 @@ Output: 若有多於一個人使用此電腦，您可以在安裝後建立多個帳號。 - + Only lowercase letters, numbers, underscore and hyphen are allowed. 僅允許小寫字母、數字、底線與連接號。 - + root is not allowed as username. 不允許使用 root 作為使用者名稱。 - + What is the name of this computer? 這部電腦的名字是？ - + Computer Name 電腦名稱 - + This name will be used if you make the computer visible to others on a network. 若您將此電腦設定為讓網路上的其他電腦可見時將會使用此名稱。 - + localhost is not allowed as hostname. 不允許使用 localhost 作為主機名稱。 - + Choose a password to keep your account safe. 輸入密碼以確保帳號的安全性。 - + Password 密碼 - + Repeat Password 確認密碼 - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. 輸入同一個密碼兩次，以檢查輸入錯誤。一個好的密碼包含了字母、數字及標點符號的組合、至少八個字母長，且按一固定週期更換。 - + Validate passwords quality 驗證密碼品質 - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. 當此勾選框被勾選，密碼強度檢查即完成，您也無法再使用弱密碼。 - + Log in automatically without asking for the password 自動登入，無需輸入密碼 - + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. 僅允許字母、數字、底線與連接號，最少兩個字元。 - + Reuse user password as root password 重用使用者密碼為 root 密碼 - + Use the same password for the administrator account. 為管理員帳號使用同樣的密碼。 - + Choose a root password to keep your account safe. 選擇 root 密碼來維護您的帳號安全。 - + Root Password Root 密碼 - + Repeat Root Password 確認 Root 密碼 - + Enter the same password twice, so that it can be checked for typing errors. 輸入同樣的密碼兩次，這樣可以檢查輸入錯誤。 diff --git a/lang/python.pot b/lang/python.pot index 1875d91be..2d16bb38d 100644 --- a/lang/python.pot +++ b/lang/python.pot @@ -2,426 +2,403 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-22 11:03+0200\n" +"POT-Creation-Date: 2022-05-29 16:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: src/modules/grubcfg/main.py:28 msgid "Configure GRUB." -msgstr "Configure GRUB." +msgstr "" #: src/modules/mount/main.py:42 msgid "Mounting partitions." -msgstr "Mounting partitions." +msgstr "" #: src/modules/mount/main.py:88 src/modules/mount/main.py:124 msgid "Internal error mounting zfs datasets" -msgstr "Internal error mounting zfs datasets" +msgstr "" #: src/modules/mount/main.py:100 msgid "Failed to import zpool" -msgstr "Failed to import zpool" +msgstr "" #: src/modules/mount/main.py:116 msgid "Failed to unlock zpool" -msgstr "Failed to unlock zpool" +msgstr "" #: src/modules/mount/main.py:133 src/modules/mount/main.py:138 msgid "Failed to set zfs mountpoint" -msgstr "Failed to set zfs mountpoint" +msgstr "" #: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235 #: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361 -#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394 +#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428 #: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105 msgid "Configuration Error" -msgstr "Configuration Error" +msgstr "" #: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236 #: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86 -#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362 +#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395 msgid "No partitions are defined for 
{!s}
to use." -msgstr "No partitions are defined for 
{!s}
to use." +msgstr "" #: src/modules/mount/main.py:253 msgid "zfs mounting error" -msgstr "zfs mounting error" +msgstr "" #: src/modules/services-systemd/main.py:26 msgid "Configure systemd services" -msgstr "Configure systemd services" +msgstr "" #: src/modules/services-systemd/main.py:59 #: src/modules/services-openrc/main.py:93 msgid "Cannot modify service" -msgstr "Cannot modify service" +msgstr "" #: src/modules/services-systemd/main.py:60 msgid "" "systemctl {arg!s} call in chroot returned error code {num!s}." msgstr "" -"systemctl {arg!s} call in chroot returned error code {num!s}." #: src/modules/services-systemd/main.py:63 #: src/modules/services-systemd/main.py:69 msgid "Cannot enable systemd service {name!s}." -msgstr "Cannot enable systemd service {name!s}." +msgstr "" #: src/modules/services-systemd/main.py:65 msgid "Cannot enable systemd target {name!s}." -msgstr "Cannot enable systemd target {name!s}." +msgstr "" #: src/modules/services-systemd/main.py:67 msgid "Cannot enable systemd timer {name!s}." -msgstr "Cannot enable systemd timer {name!s}." +msgstr "" #: src/modules/services-systemd/main.py:71 msgid "Cannot disable systemd target {name!s}." -msgstr "Cannot disable systemd target {name!s}." +msgstr "" #: src/modules/services-systemd/main.py:73 msgid "Cannot mask systemd unit {name!s}." -msgstr "Cannot mask systemd unit {name!s}." +msgstr "" #: src/modules/services-systemd/main.py:75 msgid "" -"Unknown systemd commands {command!s} and " -"{suffix!s} for unit {name!s}." +"Unknown systemd commands {command!s} and {suffix!s} for unit {name!s}." msgstr "" -"Unknown systemd commands {command!s} and " -"{suffix!s} for unit {name!s}." #: src/modules/unpackfs/main.py:34 msgid "Filling up filesystems." -msgstr "Filling up filesystems." +msgstr "" #: src/modules/unpackfs/main.py:254 msgid "rsync failed with error code {}." -msgstr "rsync failed with error code {}." +msgstr "" #: src/modules/unpackfs/main.py:299 msgid "Unpacking image {}/{}, file {}/{}" -msgstr "Unpacking image {}/{}, file {}/{}" +msgstr "" #: src/modules/unpackfs/main.py:314 msgid "Starting to unpack {}" -msgstr "Starting to unpack {}" +msgstr "" #: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:467 msgid "Failed to unpack image \"{}\"" -msgstr "Failed to unpack image \"{}\"" +msgstr "" #: src/modules/unpackfs/main.py:430 msgid "No mount point for root partition" -msgstr "No mount point for root partition" +msgstr "" #: src/modules/unpackfs/main.py:431 msgid "globalstorage does not contain a \"rootMountPoint\" key." -msgstr "globalstorage does not contain a \"rootMountPoint\" key." +msgstr "" #: src/modules/unpackfs/main.py:434 msgid "Bad mount point for root partition" -msgstr "Bad mount point for root partition" +msgstr "" #: src/modules/unpackfs/main.py:435 msgid "rootMountPoint is \"{}\", which does not exist." -msgstr "rootMountPoint is \"{}\", which does not exist." +msgstr "" #: src/modules/unpackfs/main.py:439 src/modules/unpackfs/main.py:455 #: src/modules/unpackfs/main.py:459 src/modules/unpackfs/main.py:465 #: src/modules/unpackfs/main.py:480 msgid "Bad unpackfs configuration" -msgstr "Bad unpackfs configuration" +msgstr "" #: src/modules/unpackfs/main.py:440 msgid "There is no configuration information." -msgstr "There is no configuration information." +msgstr "" #: src/modules/unpackfs/main.py:456 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" -msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel" +msgstr "" #: src/modules/unpackfs/main.py:460 msgid "The source filesystem \"{}\" does not exist" -msgstr "The source filesystem \"{}\" does not exist" +msgstr "" #: src/modules/unpackfs/main.py:466 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed." msgstr "" -"Failed to find unsquashfs, make sure you have the squashfs-tools package " -"installed." #: src/modules/unpackfs/main.py:481 msgid "The destination \"{}\" in the target system is not a directory" -msgstr "The destination \"{}\" in the target system is not a directory" +msgstr "" #: src/modules/displaymanager/main.py:524 msgid "Cannot write KDM configuration file" -msgstr "Cannot write KDM configuration file" +msgstr "" #: src/modules/displaymanager/main.py:525 msgid "KDM config file {!s} does not exist" -msgstr "KDM config file {!s} does not exist" +msgstr "" #: src/modules/displaymanager/main.py:586 msgid "Cannot write LXDM configuration file" -msgstr "Cannot write LXDM configuration file" +msgstr "" #: src/modules/displaymanager/main.py:587 msgid "LXDM config file {!s} does not exist" -msgstr "LXDM config file {!s} does not exist" +msgstr "" #: src/modules/displaymanager/main.py:670 msgid "Cannot write LightDM configuration file" -msgstr "Cannot write LightDM configuration file" +msgstr "" #: src/modules/displaymanager/main.py:671 msgid "LightDM config file {!s} does not exist" -msgstr "LightDM config file {!s} does not exist" +msgstr "" #: src/modules/displaymanager/main.py:745 msgid "Cannot configure LightDM" -msgstr "Cannot configure LightDM" +msgstr "" #: src/modules/displaymanager/main.py:746 msgid "No LightDM greeter installed." -msgstr "No LightDM greeter installed." +msgstr "" #: src/modules/displaymanager/main.py:777 msgid "Cannot write SLIM configuration file" -msgstr "Cannot write SLIM configuration file" +msgstr "" #: src/modules/displaymanager/main.py:778 msgid "SLIM config file {!s} does not exist" -msgstr "SLIM config file {!s} does not exist" - -#: src/modules/displaymanager/main.py:991 -msgid "No display managers selected for the displaymanager module." -msgstr "No display managers selected for the displaymanager module." +msgstr "" #: src/modules/displaymanager/main.py:992 +msgid "No display managers selected for the displaymanager module." +msgstr "" + +#: src/modules/displaymanager/main.py:993 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -"The displaymanagers list is empty or undefined in both globalstorage and " -"displaymanager.conf." -#: src/modules/displaymanager/main.py:1074 +#: src/modules/displaymanager/main.py:1075 msgid "Display manager configuration was incomplete" -msgstr "Display manager configuration was incomplete" +msgstr "" #: src/modules/initcpiocfg/main.py:28 msgid "Configuring mkinitcpio." -msgstr "Configuring mkinitcpio." +msgstr "" #: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90 -#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368 +#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401 #: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106 msgid "No root mount point is given for 
{!s}
to use." -msgstr "No root mount point is given for 
{!s}
to use." +msgstr "" #: src/modules/rawfs/main.py:26 msgid "Installing data." -msgstr "Installing data." +msgstr "" #: src/modules/services-openrc/main.py:29 msgid "Configure OpenRC services" -msgstr "Configure OpenRC services" +msgstr "" #: src/modules/services-openrc/main.py:57 msgid "Cannot add service {name!s} to run-level {level!s}." -msgstr "Cannot add service {name!s} to run-level {level!s}." +msgstr "" #: src/modules/services-openrc/main.py:59 msgid "Cannot remove service {name!s} from run-level {level!s}." -msgstr "Cannot remove service {name!s} from run-level {level!s}." +msgstr "" #: src/modules/services-openrc/main.py:61 msgid "" "Unknown service-action {arg!s} for service {name!s} in run-" "level {level!s}." msgstr "" -"Unknown service-action {arg!s} for service {name!s} in run-" -"level {level!s}." #: src/modules/services-openrc/main.py:94 msgid "" "rc-update {arg!s} call in chroot returned error code {num!s}." msgstr "" -"rc-update {arg!s} call in chroot returned error code {num!s}." #: src/modules/services-openrc/main.py:101 msgid "Target runlevel does not exist" -msgstr "Target runlevel does not exist" +msgstr "" #: src/modules/services-openrc/main.py:102 msgid "" "The path for runlevel {level!s} is {path!s}, which does not " "exist." msgstr "" -"The path for runlevel {level!s} is {path!s}, which does not " -"exist." #: src/modules/services-openrc/main.py:110 msgid "Target service does not exist" -msgstr "Target service does not exist" +msgstr "" #: src/modules/services-openrc/main.py:111 msgid "" -"The path for service {name!s} is {path!s}, which does not " -"exist." +"The path for service {name!s} is {path!s}, which does not exist." msgstr "" -"The path for service {name!s} is {path!s}, which does not " -"exist." #: src/modules/plymouthcfg/main.py:27 msgid "Configure Plymouth theme" -msgstr "Configure Plymouth theme" +msgstr "" #: src/modules/packages/main.py:54 src/modules/packages/main.py:65 #: src/modules/packages/main.py:75 msgid "Install packages." -msgstr "Install packages." +msgstr "" #: src/modules/packages/main.py:63 #, python-format msgid "Processing packages (%(count)d / %(total)d)" -msgstr "Processing packages (%(count)d / %(total)d)" +msgstr "" #: src/modules/packages/main.py:68 #, python-format msgid "Installing one package." msgid_plural "Installing %(num)d packages." -msgstr[0] "Installing one package." -msgstr[1] "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" #: src/modules/packages/main.py:71 #, python-format msgid "Removing one package." msgid_plural "Removing %(num)d packages." -msgstr[0] "Removing one package." -msgstr[1] "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" #: src/modules/packages/main.py:725 src/modules/packages/main.py:737 #: src/modules/packages/main.py:765 msgid "Package Manager error" -msgstr "Package Manager error" +msgstr "" #: src/modules/packages/main.py:726 msgid "" "The package manager could not prepare updates. The command 
{!s}
" "returned error code {!s}." msgstr "" -"The package manager could not prepare updates. The command 
{!s}
" -"returned error code {!s}." #: src/modules/packages/main.py:738 msgid "" -"The package manager could not update the system. The command 
{!s}
" -" returned error code {!s}." +"The package manager could not update the system. The command 
{!s}
" +"returned error code {!s}." msgstr "" -"The package manager could not update the system. The command 
{!s}
" -" returned error code {!s}." #: src/modules/packages/main.py:766 msgid "" "The package manager could not make changes to the installed system. The " "command 
{!s}
returned error code {!s}." msgstr "" -"The package manager could not make changes to the installed system. The " -"command 
{!s}
returned error code {!s}." #: src/modules/bootloader/main.py:43 msgid "Install bootloader." -msgstr "Install bootloader." +msgstr "" #: src/modules/bootloader/main.py:614 msgid "Failed to install grub, no partitions defined in global storage" -msgstr "Failed to install grub, no partitions defined in global storage" +msgstr "" #: src/modules/bootloader/main.py:782 msgid "Bootloader installation error" -msgstr "Bootloader installation error" +msgstr "" #: src/modules/bootloader/main.py:783 msgid "" -"The bootloader could not be installed. The installation command " -"
{!s}
returned error code {!s}." +"The bootloader could not be installed. The installation command 
{!s} returned error code {!s}."
 msgstr ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
-msgstr "Setting hardware clock."
+msgstr ""
 
 #: src/modules/mkinitfs/main.py:27
 msgid "Creating initramfs with mkinitfs."
-msgstr "Creating initramfs with mkinitfs."
+msgstr ""
 
 #: src/modules/mkinitfs/main.py:49
 msgid "Failed to run mkinitfs on the target"
-msgstr "Failed to run mkinitfs on the target"
+msgstr ""
 
 #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
 msgid "The exit code was {}"
-msgstr "The exit code was {}"
+msgstr ""
 
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
-msgstr "Creating initramfs with dracut."
+msgstr ""
 
 #: src/modules/dracut/main.py:49
 msgid "Failed to run dracut on the target"
-msgstr "Failed to run dracut on the target"
+msgstr ""
 
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
-msgstr "Configuring initramfs."
+msgstr ""
 
 #: src/modules/openrcdmcryptcfg/main.py:26
 msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuring OpenRC dmcrypt service."
+msgstr ""
 
-#: src/modules/fstab/main.py:29
+#: src/modules/fstab/main.py:28
 msgid "Writing fstab."
-msgstr "Writing fstab."
+msgstr ""
 
-#: src/modules/fstab/main.py:395
+#: src/modules/fstab/main.py:429
 msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
-msgstr "Dummy python job."
+msgstr ""
 
 #: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
 #: src/modules/dummypython/main.py:94
 msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
+msgstr ""
 
 #: src/modules/localecfg/main.py:31
 msgid "Configuring locales."
-msgstr "Configuring locales."
+msgstr ""
 
 #: src/modules/networkcfg/main.py:29
 msgid "Saving network configuration."
-msgstr "Saving network configuration."
+msgstr ""
diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po
index a861cb647..81b71f3a7 100644
--- a/lang/python/ar/LC_MESSAGES/python.po
+++ b/lang/python/ar/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: aboodilankaboot, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n"
@@ -22,89 +22,105 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "تثبيت الحزم"
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "جاري تحميل الحزم (%(count)d/%(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "جاري تركيب الأقسام"
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "جاري حفظ الإعدادات"
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "خطأ في الضبط"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "تعديل خدمات systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "لا يمكن تعديل الخدمة"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "كود الخروج كان {}"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -171,72 +187,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "فشلت كتابة ملف ضبط KDM."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "تعديل خدمات systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "ملف ضبط KDM {!s} غير موجود"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "لا يمكن تعديل الخدمة"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "فشلت كتابة ملف ضبط LXDM."
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "ملف ضبط LXDM {!s} غير موجود"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "فشلت كتابة ملف ضبط LightDM."
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "ملف ضبط LightDM {!s} غير موجود"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "فشل ضبط LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "لم يتم تصيب LightDM"
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "فشلت كتابة ملف ضبط SLIM."
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "ملف ضبط SLIM {!s} غير موجود"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "إعداد مدير العرض لم يكتمل"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "عملية بايثون دميه"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "عملية  دميه خطوه بايثون {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "تثبيت محمل الإقلاع"
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "جاري تركيب الأقسام"
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -282,99 +338,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "تثبيت الحزم"
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "جاري تحميل الحزم (%(count)d/%(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "تثبيت محمل الإقلاع"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "جاري إعداد ساعة الهاردوير"
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "كود الخروج كان {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -383,35 +346,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "فشلت كتابة ملف ضبط KDM."
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "ملف ضبط KDM {!s} غير موجود"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "فشلت كتابة ملف ضبط LXDM."
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "ملف ضبط LXDM {!s} غير موجود"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "فشلت كتابة ملف ضبط LightDM."
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "ملف ضبط LightDM {!s} غير موجود"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "فشل ضبط LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "لم يتم تصيب LightDM"
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "فشلت كتابة ملف ضبط SLIM."
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "ملف ضبط SLIM {!s} غير موجود"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "إعداد مدير العرض لم يكتمل"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "جاري إعداد ساعة الهاردوير"
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "عملية بايثون دميه"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "عملية  دميه خطوه بايثون {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "جاري حفظ الإعدادات"
diff --git a/lang/python/as/LC_MESSAGES/python.po b/lang/python/as/LC_MESSAGES/python.po
index 5744ae684..ae079b699 100644
--- a/lang/python/as/LC_MESSAGES/python.po
+++ b/lang/python/as/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Deep Jyoti Choudhury , 2020\n"
 "Language-Team: Assamese (https://www.transifex.com/calamares/teams/20061/as/)\n"
@@ -21,92 +21,98 @@ msgstr ""
 "Language: as\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB কনফিগাৰ কৰক।"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "পেকেজ ইন্স্তল কৰক।"
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "বিভাজন মাউন্ট্ কৰা।"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "(%(count)d / %(total)d) পেকেজবোৰ সংশোধন কৰি আছে"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installing one package."
+msgstr[1] "%(num)d পেকেজবোৰ ইনস্তল হৈ আছে।"
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removing one package."
+msgstr[1] "%(num)d পেকেজবোৰ আতৰোৱা হৈ আছে।"
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "নেটৱৰ্ক কন্ফিগাৰ জমা কৰি আছে।"
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "কনফিগাৰেচন ত্ৰুটি"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "ব্যৱহাৰৰ বাবে 
{!s}
ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio কনফিগাৰ কৰি আছে।"
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "
{!s}
ৰ ব্যৱহাৰৰ বাবে কোনো বিভাজনৰ বৰ্ণনা দিয়া হোৱা নাই।"
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd সেৱা সমুহ কনফিগাৰ কৰক"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "সেৱা সমুহৰ সংশোধন কৰিব নোৱাৰি"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chrootত systemctl {arg!s}ৰ call ক্ৰুটি কোড {num!s}।"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "systemd সেৱা {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd গন্তব্য স্থান {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd গন্তব্য স্থান {name!s} নিষ্ক্ৰিয় কৰিব নোৱাৰি।"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "এক্সিড্ কোড্ আছিল {}"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd একক {name!s} মাস্ক্ কৰিব নোৱাৰি।"
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"একক {name!s}ৰ বাবে {command!s} আৰু {suffix!s} "
-"অজ্ঞাত systemd কমাণ্ড্।"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt সেৱা কন্ফিগাৰ কৰি আছে।"
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -172,73 +178,115 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "লক্ষ্যৰ চিছটেম গন্তব্য স্থান \"{}\" এটা ডিৰেক্টৰী নহয়"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd সেৱা সমুহ কনফিগাৰ কৰক"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "সেৱা সমুহৰ সংশোধন কৰিব নোৱাৰি"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM কনফিগাৰ কৰিব নোৱাৰি"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "কোনো LightDM স্ৱাগতকৰ্তা ইন্স্তল নাই।"
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "displaymanager মডিউলৰ বাবে কোনো ডিস্প্লে প্ৰবন্ধক নাই।"
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chrootত systemctl {arg!s}ৰ call ক্ৰুটি কোড {num!s}।"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "systemd সেৱা {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd গন্তব্য স্থান {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "ডিস্প্লে প্ৰবন্ধক কন্ফিগাৰেচন অসমাপ্ত"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd গন্তব্য স্থান {name!s} নিষ্ক্ৰিয় কৰিব নোৱাৰি।"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio কনফিগাৰ কৰি আছে।"
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd একক {name!s} মাস্ক্ কৰিব নোৱাৰি।"
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "ব্যৱহাৰৰ বাবে 
{!s}
ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।"
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"একক {name!s}ৰ বাবে {command!s} আৰু {suffix!s} "
+"অজ্ঞাত systemd কমাণ্ড্।"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "ডাটা ইন্স্তল কৰি আছে।"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "ডামী Pythonৰ কায্য"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "ডামী Pythonৰ পদক্ষেপ {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "বুতলোডাৰ ইন্স্তল কৰক।"
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "স্থানীয়বোৰ কন্ফিগাৰ কৰি আছে।"
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "বিভাজন মাউন্ট্ কৰা।"
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab লিখি আছে।"
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -286,91 +334,6 @@ msgid ""
 "exist."
 msgstr "{name!s}ৰ বাবে পথ হ'ল {path!s} যিটো উপস্থিত নাই।"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "পেকেজ ইন্স্তল কৰক।"
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "(%(count)d / %(total)d) পেকেজবোৰ সংশোধন কৰি আছে"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "%(num)d পেকেজবোৰ ইনস্তল হৈ আছে।"
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "%(num)d পেকেজবোৰ আতৰোৱা হৈ আছে।"
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "বুতলোডাৰ ইন্স্তল কৰক।"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছে।"
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "এক্সিড্ কোড্ আছিল {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "dracutৰ সৈতে initramfs বনাই আছে।"
@@ -379,35 +342,72 @@ msgstr "dracutৰ সৈতে initramfs বনাই আছে।"
 msgid "Failed to run dracut on the target"
 msgstr "গন্তব্য স্থানত dracut চলোৱাত বিফল হ'ল"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB কনফিগাৰ কৰক।"
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM কনফিগাৰ কৰিব নোৱাৰি"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "কোনো LightDM স্ৱাগতকৰ্তা ইন্স্তল নাই।"
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "displaymanager মডিউলৰ বাবে কোনো ডিস্প্লে প্ৰবন্ধক নাই।"
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "ডিস্প্লে প্ৰবন্ধক কন্ফিগাৰেচন অসমাপ্ত"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "initramfs কন্ফিগাৰ কৰি আছে।"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt সেৱা কন্ফিগাৰ কৰি আছে।"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছে।"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab লিখি আছে।"
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "ডামী Pythonৰ কায্য"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "ডামী Pythonৰ পদক্ষেপ {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "স্থানীয়বোৰ কন্ফিগাৰ কৰি আছে।"
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "নেটৱৰ্ক কন্ফিগাৰ জমা কৰি আছে।"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "ডাটা ইন্স্তল কৰি আছে।"
diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po
index 7d14ee498..6e07d8ffe 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: enolp , 2020\n"
 "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n"
@@ -21,90 +21,98 @@ msgstr ""
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalación de paquetes."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Procesando paquetes (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando un paquete."
+msgstr[1] "Instalando %(num)d paquetes."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Desaniciando un paquete."
+msgstr[1] "Desaniciando %(num)d paquetes."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nun pue modificase'l serviciu"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "El códigu de salida foi {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando'l serviciu dmcrypt d'OpenRC."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -170,73 +178,113 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "El destín «{}» nel sistema de destín nun ye un direutoriu"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Nun pue escribise'l ficheru de configuración de KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Nun esiste'l ficheru de configuración de KDM {!s}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Nun pue modificase'l serviciu"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Nun pue escribise'l ficheru de configuración de LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Nun esiste'l ficheru de configuración de LXDM {!s}"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Nun pue escribise'l ficheru de configuración de LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Nun esiste'l ficheru de configuración de LightDM {!s}"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Nun pue configurase LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nun s'instaló nengún saludador de LightDM."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Nun pue escribise'l ficheru de configuración de SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Nun esiste'l ficheru de configuración de SLIM {!s}"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Nun s'esbillaron xestores de pantalles pal módulu displaymanager."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "La configuración del xestor de pantalles nun se completó"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando datos."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Trabayu maniquín en Python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pasu maniquín {} en Python"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalando'l xestor d'arrinque."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Configurando locales."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -282,91 +330,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalación de paquetes."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Procesando paquetes (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando un paquete."
-msgstr[1] "Instalando %(num)d paquetes."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Desaniciando un paquete."
-msgstr[1] "Desaniciando %(num)d paquetes."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalando'l xestor d'arrinque."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando'l reló de hardware."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El códigu de salida foi {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -375,35 +338,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr "Fallu al executar dracut nel destín"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Nun pue escribise'l ficheru de configuración de KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Nun esiste'l ficheru de configuración de KDM {!s}"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Nun pue escribise'l ficheru de configuración de LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Nun esiste'l ficheru de configuración de LXDM {!s}"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Nun pue escribise'l ficheru de configuración de LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Nun esiste'l ficheru de configuración de LightDM {!s}"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Nun pue configurase LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nun s'instaló nengún saludador de LightDM."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Nun pue escribise'l ficheru de configuración de SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Nun esiste'l ficheru de configuración de SLIM {!s}"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Nun s'esbillaron xestores de pantalles pal módulu displaymanager."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "La configuración del xestor de pantalles nun se completó"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando'l serviciu dmcrypt d'OpenRC."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando'l reló de hardware."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Trabayu maniquín en Python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pasu maniquín {} en Python"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Configurando locales."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalando datos."
diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po
index c1157b815..6bf1d5ea2 100644
--- a/lang/python/az/LC_MESSAGES/python.po
+++ b/lang/python/az/LC_MESSAGES/python.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# Xəyyam Qocayev , 2022
+# Kheyyam Gojayev , 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Xəyyam Qocayev , 2022\n"
+"Last-Translator: Kheyyam Gojayev , 2022\n"
 "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,94 +21,105 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB tənzimləmələri"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Paketləri quraşdırmaq."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Disk bölmələri qoşulur."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "(%(count)d / %(total)d) paketləri işlənir"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Zfs verilənlər dəstinin qoşulmasında daxil xəta"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Bir paket quraşdırılır."
+msgstr[1] "%(num)d paket quraşdırılır."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Zpool idxalı baş tutmadı"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Bir paket silinir"
+msgstr[1] "%(num)d paket silinir."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Zpool kiliddən çıxarıla bilmədi"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Paket meneceri xətası"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Zfs qoşulma nöqtəsi təyin olunmadı"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Bu paket meneceri yenilənmələri hazırlaya bilmədi. 
{!s}
 əmri xəta"
+" kodu {!s} ilə cavab verdi."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Paket meneceri sistemi yeniləyə bimədi. 
{!s}
 əmri xəta kodu {!s} "
+"ilə cavab verdi."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
{!s}
 "
+"əmri xəta kodu {!s} ilə cavab verdi."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Şəbəkə ayarları saxlanılır."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Tənzimləmə xətası"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"
{!s}
 istifadə etmək üçün kök qoşulma nöqtəsi təyin edilməyib."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio tənzimlənir."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "
{!s}
 istifadə etmək üçün bölmələr təyin edilməyib"
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs qoşulmasında xəta"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs ilə initramfs yaradılır"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd xidmətini tənzimləmək"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıxış kodu {} idi"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name!s} systemd xidməti aktiv edilmədi."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "{name!s} systemd hədəfi aktiv edilmədi"
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "{name!s} systemd taymeri aktiv edilə bilmir."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "{name!s} systemd hədfi sönsürülmədi."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "{name!s} systemd vahidi maskalanmır."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Naməlum systemd əmrləri {command!s} və {suffix!s} "
-"{name!s} vahidi üçün."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt xidməti tənzimlənir."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -177,76 +188,121 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM tənzimləmə faylı yazıla bilmir"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd xidmətini tənzimləmək"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM tənzimləmə faylı {!s} mövcud deyil"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM tənzimləmə faylı yazıla bilmir"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM tənzimləmə faylı {!s} mövcud deyil"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM tənzimləmə faylı yazıla bilmir"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM tənzimləmə faylı {!s} mövcud deyil"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM tənzimlənə bilmir"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM qarşılama quraşdırılmayıb."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLİM tənzimləmə faylı yazıla bilmir"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLİM tənzimləmə faylı {!s} mövcud deyil"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "displaymanager modulu üçün ekran menecerləri seçilməyib."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Ekran menecerləri siyahısı həm qlobal yaddaşda, həm də displaymanager.conf-"
-"da boşdur və ya təyin olunmamışdır."
+"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
+"{num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name!s} systemd xidməti aktiv edilmədi."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio tənzimlənir."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "{name!s} systemd hədəfi aktiv edilmədi"
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "{name!s} systemd taymeri aktiv edilə bilmir."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "{name!s} systemd hədfi sönsürülmədi."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "{name!s} systemd vahidi maskalanmır."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"
{!s}
 istifadə etmək üçün kök qoşulma nöqtəsi təyin edilməyib."
+"Naməlum systemd əmrləri {command!s} və {suffix!s} "
+"{name!s} vahidi üçün."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Quraşdırılma tarixi."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python işi."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "{} Dummy python addımı"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükləyici qurulur."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "Grub quraşdırılmadı, ümumi yaddaş üçün bölmələr təyin olunmayıb"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Önyükləyicinin quraşdırılmasında xəta"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
{!s}
, xəta kodu "
+"{!s} ilə cavab verdi."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Lokallaşma tənzimlənir."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Disk bölmələri qoşulur."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Zfs verilənlər dəstinin qoşulmasında daxil xəta"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Zpool idxalı baş tutmadı"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Zpool kiliddən çıxarıla bilmədi"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Zfs qoşulma nöqtəsi təyin olunmadı"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs qoşulmasında xəta"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth mövzusu tənzimlənməsi"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab yazılır."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"İstifadə etmək üçün, 
{!s}
 tənzimləməsi, 
{!s}
 üçün "
+"göstərilməyib."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -296,99 +352,6 @@ msgid ""
 "exist."
 msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth mövzusu tənzimlənməsi"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Paketləri quraşdırmaq."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "(%(count)d / %(total)d) paketləri işlənir"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Bir paket quraşdırılır."
-msgstr[1] "%(num)d paket quraşdırılır."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Bir paket silinir"
-msgstr[1] "%(num)d paket silinir."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Paket meneceri xətası"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Bu paket meneceri yenilənmələri hazırlaya bilmədi. 
{!s}
 əmri xəta"
-" kodu {!s} ilə cavab verdi."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Paket meneceri sistemi yeniləyə bimədi. 
{!s}
 əmri xəta kodu {!s} "
-"ilə cavab verdi."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
{!s}
 "
-"əmri xəta kodu {!s} ilə cavab verdi."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükləyici qurulur."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "Grub quraşdırılmadı, ümumi yaddaş üçün bölmələr təyin olunmayıb"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Önyükləyicinin quraşdırılmasında xəta"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
{!s}
, xəta kodu "
-"{!s} ilə cavab verdi."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Aparat saatını ayarlamaq."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs ilə initramfs yaradılır"
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıxış kodu {} idi"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Dracut ilə initramfs yaratmaq."
@@ -397,37 +360,74 @@ msgstr "Dracut ilə initramfs yaratmaq."
 msgid "Failed to run dracut on the target"
 msgstr "Hədəfdə dracut başladılmadı"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB tənzimləmələri"
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM tənzimləmə faylı yazıla bilmir"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM tənzimləmə faylı {!s} mövcud deyil"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM tənzimləmə faylı yazıla bilmir"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM tənzimləmə faylı {!s} mövcud deyil"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM tənzimləmə faylı yazıla bilmir"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM tənzimləmə faylı {!s} mövcud deyil"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM tənzimlənə bilmir"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM qarşılama quraşdırılmayıb."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLİM tənzimləmə faylı yazıla bilmir"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLİM tənzimləmə faylı {!s} mövcud deyil"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "displaymanager modulu üçün ekran menecerləri seçilməyib."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Ekran menecerləri siyahısı həm qlobal yaddaşda, həm də displaymanager.conf-"
+"da boşdur və ya təyin olunmamışdır."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "initramfs tənzimlənir."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt xidməti tənzimlənir."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Aparat saatını ayarlamaq."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab yazılır."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"İstifadə etmək üçün, 
{!s}
 tənzimləməsi, 
{!s}
 üçün "
-"göstərilməyib."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python işi."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "{} Dummy python addımı"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Lokallaşma tənzimlənir."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Şəbəkə ayarları saxlanılır."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Quraşdırılma tarixi."
diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po
index ceac2150a..63f150d45 100644
--- a/lang/python/az_AZ/LC_MESSAGES/python.po
+++ b/lang/python/az_AZ/LC_MESSAGES/python.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# Xəyyam Qocayev , 2022
+# Kheyyam Gojayev , 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Xəyyam Qocayev , 2022\n"
+"Last-Translator: Kheyyam Gojayev , 2022\n"
 "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,94 +21,105 @@ msgstr ""
 "Language: az_AZ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB tənzimləmələri"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Paketləri quraşdırmaq."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Disk bölmələri qoşulur."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "(%(count)d / %(total)d) paketləri işlənir"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Zfs verilənlər dəstinin qoşulmasında daxil xəta"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Bir paket quraşdırılır."
+msgstr[1] "%(num)d paket quraşdırılır."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Zpool idxalı baş tutmadı"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Bir paket silinir"
+msgstr[1] "%(num)d paket silinir."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Zpool kiliddən çıxarıla bilmədi"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Paket meneceri xətası"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Zfs qoşulma nöqtəsi təyin olunmadı"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Bu paket meneceri yenilənmələri hazırlaya bilmədi. 
{!s}
 əmri xəta"
+" kodu {!s} ilə cavab verdi."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Paket meneceri sistemi yeniləyə bimədi. 
{!s}
 əmri xəta kodu {!s} "
+"ilə cavab verdi."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
{!s}
 "
+"əmri xəta kodu {!s} ilə cavab verdi."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Şəbəkə ayarları saxlanılır."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Tənzimləmə xətası"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"
{!s}
 istifadə etmək üçün kök qoşulma nöqtəsi təyin edilməyib."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio tənzimlənir."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "
{!s}
 istifadə etmək üçün bölmələr təyin edilməyib"
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs qoşulmasında xəta"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs ilə initramfs yaradılır"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd xidmətini tənzimləmək"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıxış kodu {} idi"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name!s} systemd xidməti aktiv edilmədi."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "{name!s} systemd hədəfi aktiv edilmədi"
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "{name!s} systemd taymeri aktiv edilə bilmir."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "{name!s} systemd hədfi sönsürülmədi."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "{name!s} systemd vahidi maskalanmır."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Naməlum systemd əmrləri {command!s} və {suffix!s} "
-"{name!s} vahidi üçün."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt xidməti tənzimlənir."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -177,76 +188,121 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM tənzimləmə faylı yazıla bilmir"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd xidmətini tənzimləmək"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM tənzimləmə faylı {!s} mövcud deyil"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM tənzimləmə faylı yazıla bilmir"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM tənzimləmə faylı {!s} mövcud deyil"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM tənzimləmə faylı yazıla bilmir"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM tənzimləmə faylı {!s} mövcud deyil"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM tənzimlənə bilmir"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM qarşılama quraşdırılmayıb."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLİM tənzimləmə faylı yazıla bilmir"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLİM tənzimləmə faylı {!s} mövcud deyil"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "displaymanager modulu üçün ekran menecerləri seçilməyib."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Ekran menecerləri siyahısı həm qlobal yaddaşda, həm də displaymanager.conf-"
-"da boşdur və ya təyin olunmamışdır."
+"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
+"{num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name!s} systemd xidməti aktiv edilmədi."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio tənzimlənir."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "{name!s} systemd hədəfi aktiv edilmədi"
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "{name!s} systemd taymeri aktiv edilə bilmir."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "{name!s} systemd hədfi sönsürülmədi."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "{name!s} systemd vahidi maskalanmır."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"
{!s}
 istifadə etmək üçün kök qoşulma nöqtəsi təyin edilməyib."
+"Naməlum systemd əmrləri {command!s} və {suffix!s} "
+"{name!s} vahidi üçün."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Quraşdırılma tarixi."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python işi."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "{} Dummy python addımı"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükləyici qurulur."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "Grub quraşdırılmadı, ümumi yaddaş üçün bölmələr təyin olunmayıb"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Önyükləyicinin quraşdırılmasında xəta"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
{!s}
, xəta kodu "
+"{!s} ilə cavab verdi."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Lokallaşma tənzimlənir."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Disk bölmələri qoşulur."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Zfs verilənlər dəstinin qoşulmasında daxil xəta"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Zpool idxalı baş tutmadı"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Zpool kiliddən çıxarıla bilmədi"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Zfs qoşulma nöqtəsi təyin olunmadı"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs qoşulmasında xəta"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth mövzusu tənzimlənməsi"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab yazılır."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"İstifadə etmək üçün, 
{!s}
 tənzimləməsi, 
{!s}
 üçün "
+"göstərilməyib."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -296,99 +352,6 @@ msgid ""
 "exist."
 msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth mövzusu tənzimlənməsi"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Paketləri quraşdırmaq."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "(%(count)d / %(total)d) paketləri işlənir"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Bir paket quraşdırılır."
-msgstr[1] "%(num)d paket quraşdırılır."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Bir paket silinir"
-msgstr[1] "%(num)d paket silinir."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Paket meneceri xətası"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Bu paket meneceri yenilənmələri hazırlaya bilmədi. 
{!s}
 əmri xəta"
-" kodu {!s} ilə cavab verdi."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Paket meneceri sistemi yeniləyə bimədi. 
{!s}
 əmri xəta kodu {!s} "
-"ilə cavab verdi."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
{!s}
 "
-"əmri xəta kodu {!s} ilə cavab verdi."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükləyici qurulur."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "Grub quraşdırılmadı, ümumi yaddaş üçün bölmələr təyin olunmayıb"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Önyükləyicinin quraşdırılmasında xəta"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
{!s}
, xəta kodu "
-"{!s} ilə cavab verdi."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Aparat saatını ayarlamaq."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs ilə initramfs yaradılır"
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıxış kodu {} idi"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Dracut ilə initramfs yaratmaq."
@@ -397,37 +360,74 @@ msgstr "Dracut ilə initramfs yaratmaq."
 msgid "Failed to run dracut on the target"
 msgstr "Hədəfdə dracut başladılmadı"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB tənzimləmələri"
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM tənzimləmə faylı yazıla bilmir"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM tənzimləmə faylı {!s} mövcud deyil"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM tənzimləmə faylı yazıla bilmir"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM tənzimləmə faylı {!s} mövcud deyil"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM tənzimləmə faylı yazıla bilmir"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM tənzimləmə faylı {!s} mövcud deyil"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM tənzimlənə bilmir"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM qarşılama quraşdırılmayıb."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLİM tənzimləmə faylı yazıla bilmir"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLİM tənzimləmə faylı {!s} mövcud deyil"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "displaymanager modulu üçün ekran menecerləri seçilməyib."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Ekran menecerləri siyahısı həm qlobal yaddaşda, həm də displaymanager.conf-"
+"da boşdur və ya təyin olunmamışdır."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "initramfs tənzimlənir."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt xidməti tənzimlənir."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Aparat saatını ayarlamaq."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab yazılır."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"İstifadə etmək üçün, 
{!s}
 tənzimləməsi, 
{!s}
 üçün "
-"göstərilməyib."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python işi."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "{} Dummy python addımı"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Lokallaşma tənzimlənir."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Şəbəkə ayarları saxlanılır."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Quraşdırılma tarixi."
diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po
index 983cc35be..6e89c01bb 100644
--- a/lang/python/be/LC_MESSAGES/python.po
+++ b/lang/python/be/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Źmicier Turok , 2020\n"
 "Language-Team: Belarusian (https://www.transifex.com/calamares/teams/20061/be/)\n"
@@ -21,92 +21,102 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Наладзіць GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Усталяваць пакункі."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Мантаванне раздзелаў."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Апрацоўка пакункаў (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Усталёўка аднаго пакунка."
+msgstr[1] "Усталёўка %(num)d пакункаў."
+msgstr[2] "Усталёўка %(num)d пакункаў."
+msgstr[3] "Усталёўка%(num)d пакункаў."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Выдаленне аднаго пакунка."
+msgstr[1] "Выдаленне %(num)d пакункаў."
+msgstr[2] "Выдаленне %(num)d пакункаў."
+msgstr[3] "Выдаленне %(num)d пакункаў."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Захаванне сеткавай канфігурацыі."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Памылка канфігурацыі"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Каранёвы пункт мантавання для
{!s}
 не пададзены."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Наладка mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Раздзелы для 
{!s}
 не вызначаныя."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Стварэнне initramfs праз mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Наладзіць службы systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Не атрымалася запусціць mkinitfs у пункце прызначэння"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Немагчыма наладзіць службу"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Код выхаду {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "systemctl {arg!s} у chroot вярнуў код памылкі {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Немагчыма ўключыць службу systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Немагчыма ўключыць мэту systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Немагчыма выключыць мэту systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Немагчыма замаскаваць адзінку systemd {name!s}. "
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Невядомыя systemd загады {command!s} і {suffix!s} "
-"для адзінкі {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Наладка OpenRC dmcrypt."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -172,75 +182,115 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Пункт прызначэння \"{}\" у мэтавай сістэме не з’яўляецца каталогам"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Немагчыма запісаць файл канфігурацыі KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Наладзіць службы systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Файл канфігурацыі KDM {!s} не існуе"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Немагчыма наладзіць службу"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Немагчыма запісаць файл канфігурацыі LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Файл канфігурацыі LXDM {!s} не існуе"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Немагчыма запісаць файл канфігурацыі LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Файл канфігурацыі LightDM {!s} не існуе"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Немагчыма наладзіць LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM greeter не ўсталяваны."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Немагчыма запісаць файл канфігурацыі SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Файл канфігурацыі SLIM {!s} не існуе"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "У модулі дысплейных кіраўнікоў нічога не абрана."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "systemctl {arg!s} у chroot вярнуў код памылкі {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Немагчыма ўключыць службу systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Немагчыма ўключыць мэту systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
-"Спіс дысплейных кіраўнікоў пусты альбо не вызначаны ў both globalstorage і "
-"displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Наладка дысплейнага кіраўніка не завершаная."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Немагчыма выключыць мэту systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Наладка mkinitcpio."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Немагчыма замаскаваць адзінку systemd {name!s}. "
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Каранёвы пункт мантавання для
{!s}
 не пададзены."
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Невядомыя systemd загады {command!s} і {suffix!s} "
+"для адзінкі {name!s}."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Усталёўка даных."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Задача Dummy python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Крок Dummy python {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Усталяваць загрузчык."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Наладка лакаляў."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Мантаванне раздзелаў."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Наладзіць тэму Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Запіс fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -288,95 +338,6 @@ msgid ""
 "exist."
 msgstr "Шлях {path!s} да службы {level!s} не існуе."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Наладзіць тэму Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Усталяваць пакункі."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Апрацоўка пакункаў (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Усталёўка аднаго пакунка."
-msgstr[1] "Усталёўка %(num)d пакункаў."
-msgstr[2] "Усталёўка %(num)d пакункаў."
-msgstr[3] "Усталёўка%(num)d пакункаў."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Выдаленне аднаго пакунка."
-msgstr[1] "Выдаленне %(num)d пакункаў."
-msgstr[2] "Выдаленне %(num)d пакункаў."
-msgstr[3] "Выдаленне %(num)d пакункаў."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Усталяваць загрузчык."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Наладка апаратнага гадзінніка."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Стварэнне initramfs праз mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Не атрымалася запусціць mkinitfs у пункце прызначэння"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Код выхаду {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Стварэнне initramfs з dracut."
@@ -385,35 +346,74 @@ msgstr "Стварэнне initramfs з dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Не атрымалася запусціць dracut у пункце прызначэння"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Наладзіць GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Немагчыма запісаць файл канфігурацыі KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Файл канфігурацыі KDM {!s} не існуе"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Немагчыма запісаць файл канфігурацыі LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Файл канфігурацыі LXDM {!s} не існуе"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Немагчыма запісаць файл канфігурацыі LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Файл канфігурацыі LightDM {!s} не існуе"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Немагчыма наладзіць LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM greeter не ўсталяваны."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Немагчыма запісаць файл канфігурацыі SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Файл канфігурацыі SLIM {!s} не існуе"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "У модулі дысплейных кіраўнікоў нічога не абрана."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Спіс дысплейных кіраўнікоў пусты альбо не вызначаны ў both globalstorage і "
+"displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Наладка дысплейнага кіраўніка не завершаная."
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Наладка initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Наладка OpenRC dmcrypt."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Наладка апаратнага гадзінніка."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Запіс fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Задача Dummy python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Крок Dummy python {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Наладка лакаляў."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Захаванне сеткавай канфігурацыі."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Усталёўка даных."
diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po
index bdabcc259..864fe9b84 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Georgi Georgiev (Жоро) , 2022\n"
 "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
@@ -21,90 +21,98 @@ msgstr ""
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Конфигурирай GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Инсталирай пакетите."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Обработване на пакетите (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Инсталиране на пакета."
+msgstr[1] "Инсталиране на %(num)d пакета."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Премахване на пакета."
+msgstr[1] "Премахване на %(num)d пакета."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Конфигуриране на mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Конфигурирай systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Услугата не може да се промени"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Изходният код е {}"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Конфигуриране на услугата dmcrypt на OpenRC."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -170,72 +178,114 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Конфигурационният файл на KDM не може да бъде записан"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Конфигурирай systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Конфигурационният файл на KDM {!s} не съществува"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Услугата не може да се промени"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Конфигурационният файл на LXDM не може да бъде записан"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Конфигурационният файл на LXDM {!s} не съществува"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Конфигурационният файл на LightDM не може да бъде записан"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Конфигурационният файл на LightDM {!s} не съществува"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Конфигурационният файл на SLIM не може да бъде записан"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Конфигурационният файл на SLIM {!s} не съществува"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Конфигуриране на mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Фиктивна задача на python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Фиктивна стъпка на python {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Инсталирай програма за начално зареждане."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Инсталирането на grub е неуспешно – няма определени дялове в мястото за "
+"съхранение"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Грешка при инсталирането на програмата за начално зареждане"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Конфигуриране на локализацията."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Конфигурирай темата на Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Записване на fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -281,93 +331,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Конфигурирай темата на Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Инсталирай пакетите."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Обработване на пакетите (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Инсталиране на пакета."
-msgstr[1] "Инсталиране на %(num)d пакета."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Премахване на пакета."
-msgstr[1] "Премахване на %(num)d пакета."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Инсталирай програма за начално зареждане."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Инсталирането на grub е неуспешно – няма определени дялове в мястото за "
-"съхранение"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Грешка при инсталирането на програмата за начално зареждане"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Изходният код е {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Създаване на initramfs с dracut."
@@ -376,35 +339,72 @@ msgstr "Създаване на initramfs с dracut."
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Конфигурирай GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Конфигурационният файл на KDM не може да бъде записан"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Конфигурационният файл на KDM {!s} не съществува"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Конфигурационният файл на LXDM не може да бъде записан"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Конфигурационният файл на LXDM {!s} не съществува"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Конфигурационният файл на LightDM не може да бъде записан"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Конфигурационният файл на LightDM {!s} не съществува"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Конфигурационният файл на SLIM не може да бъде записан"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Конфигурационният файл на SLIM {!s} не съществува"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Конфигуриране на initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Конфигуриране на услугата dmcrypt на OpenRC."
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Записване на fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Фиктивна задача на python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Фиктивна стъпка на python {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Конфигуриране на локализацията."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/bn/LC_MESSAGES/python.po b/lang/python/bn/LC_MESSAGES/python.po
index 91b49dc23..092f8bc39 100644
--- a/lang/python/bn/LC_MESSAGES/python.po
+++ b/lang/python/bn/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 508a8b0ef95404aa3dc5178f0ccada5e_017b8a4 , 2020\n"
 "Language-Team: Bengali (https://www.transifex.com/calamares/teams/20061/bn/)\n"
@@ -21,90 +21,97 @@ msgstr ""
 "Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "কনফিগার করুন জিআরইউবি।"
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "মাউন্ট করছে পার্টিশনগুলো।"
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "কনফিগারেশন ত্রুটি"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি
{!এস}
 ব্যবহার করার জন্য।"
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "কনফিগার করুন সিস্টেমডি সেবাগুলি"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "সেবা পরিবর্তন করতে পারে না"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"সিস্টেমসিটিএল {এআরজি!এস}সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -171,72 +178,113 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr ""
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "কনফিগার করুন সিস্টেমডি সেবাগুলি"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr ""
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "সেবা পরিবর্তন করতে পারে না"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"সিস্টেমসিটিএল {এআরজি!এস}সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "মাউন্ট করছে পার্টিশনগুলো।"
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -282,91 +330,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -375,35 +338,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "কনফিগার করুন জিআরইউবি।"
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po
index 2fae1f08e..2336e78a5 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Davidmp , 2022\n"
 "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n"
@@ -21,95 +21,105 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura el GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instal·la els paquets."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Es munten les particions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Es processen paquets (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Error intern en muntar els conjunts de dades zfs"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "S'instal·la un paquet."
+msgstr[1] "S'instal·len %(num)d paquets."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "No s'ha pogut importar zpool."
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Se suprimeix un paquet."
+msgstr[1] "Se suprimeixen %(num)d paquets."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "No s'ha pogut desblocar zpool."
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Error del gestor de paquets"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "No s'ha pogut establir el punt de muntatge de zfs."
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut preparar les actualitzacions. "
+"L'ordre
{!s}
 ha retornat el codi d'error {!s}."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut actualitzar el sistema. L'ordre "
+"
{!s}
 ha retornat el codi d'error {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut fer canvis al sistema instal·lat. L'ordre "
+"
{!s}
 ha retornat el codi d'error {!s}."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Es desa la configuració de la xarxa."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Error de configuració"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"No s'ha proporcionat el punt de muntatge perquè l'usi 
{!s}
."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Es configura mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "No s'han definit particions perquè les usi 
{!s}
."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "error de muntatge de zfs"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Es creen initramfs amb mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura els serveis de systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Ha fallat executar mkinitfs a la destinació."
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No es pot modificar el servei."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "El codi de sortida ha estat {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La crida de systemctl {arg!s} a chroot ha retornat el codi "
-"d'error {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No es pot habilitar el servei de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No es pot habilitar la destinació de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-"No es pot habilitar el temporitzador de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No es pot emmascarar la unitat de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Ordres desconegudes de systemd: {command!s} i "
-"{suffix!s}, per a la unitat {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Es configura el sevei OpenRC dmcrypt."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -177,77 +187,123 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "La destinació \"{}\" al sistema de destinació no és un directori."
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "No es pot escriure el fitxer de configuració del KDM."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura els serveis de systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "El fitxer de configuració del KDM {!s} no existeix."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "No es pot modificar el servei."
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "No es pot escriure el fitxer de configuració de l'LXDM."
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "El fitxer de configuració de l'LXDM {!s} no existeix."
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "No es pot escriure el fitxer de configuració del LightDM."
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "El fitxer de configuració del LightDM {!s} no existeix."
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "No es pot configurar el LightDM."
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "No hi ha benvinguda instal·lada per al LightDM."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "No es pot escriure el fitxer de configuració de l'SLIM."
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "El fitxer de configuració de l'SLIM {!s} no existeix."
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-"No hi ha cap gestor de pantalla seleccionat per al mòdul displaymanager."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"La llista de gestors de pantalla és buida o no definida ni a globalstorage "
-"ni a displaymanager.conf."
+"La crida de systemctl {arg!s} a chroot ha retornat el codi "
+"d'error {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "La configuració del gestor de pantalla no era completa."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No es pot habilitar el servei de systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Es configura mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No es pot habilitar la destinació de systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
-"No s'ha proporcionat el punt de muntatge perquè l'usi 
{!s}
."
+"No es pot habilitar el temporitzador de systemd {name!s}."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "S'instal·len dades."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No es pot emmascarar la unitat de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Ordres desconegudes de systemd: {command!s} i "
+"{suffix!s}, per a la unitat {name!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tasca de python fictícia."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pas de python fitctici {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "S'instal·la el carregador d'arrencada."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"No s'ha pogut instal·lar el grub. No s'han definit particions a "
+"l'emmagatzematge global."
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Error d'instal·lació del carregador d'arrencada"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"No s'ha pogut instal·lar el carregador d'arrencada. L'ordre d'instal·lació "
+"
{!s}
ha retornat el codi d'error {!s}."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Es configuren les llengües."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Es munten les particions."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Error intern en muntar els conjunts de dades zfs"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "No s'ha pogut importar zpool."
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "No s'ha pogut desblocar zpool."
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "No s'ha pogut establir el punt de muntatge de zfs."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "error de muntatge de zfs"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura el tema del Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "S'escriu fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"No hi ha cap configuració de 
{!s}
 perquè la usi 
{!s}
."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -300,101 +356,6 @@ msgid ""
 msgstr ""
 "El camí per al servei {name!s} és {path!s}, però no existeix."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura el tema del Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instal·la els paquets."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Es processen paquets (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "S'instal·la un paquet."
-msgstr[1] "S'instal·len %(num)d paquets."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Se suprimeix un paquet."
-msgstr[1] "Se suprimeixen %(num)d paquets."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Error del gestor de paquets"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"El gestor de paquets no ha pogut preparar les actualitzacions. "
-"L'ordre
{!s}
 ha retornat el codi d'error {!s}."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"El gestor de paquets no ha pogut actualitzar el sistema. L'ordre "
-"
{!s}
 ha retornat el codi d'error {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"El gestor de paquets no ha pogut fer canvis al sistema instal·lat. L'ordre "
-"
{!s}
 ha retornat el codi d'error {!s}."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "S'instal·la el carregador d'arrencada."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"No s'ha pogut instal·lar el grub. No s'han definit particions a "
-"l'emmagatzematge global."
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Error d'instal·lació del carregador d'arrencada"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"No s'ha pogut instal·lar el carregador d'arrencada. L'ordre d'instal·lació "
-"
{!s}
ha retornat el codi d'error {!s}."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "S'estableix el rellotge del maquinari."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Es creen initramfs amb mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Ha fallat executar mkinitfs a la destinació."
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El codi de sortida ha estat {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Es creen initramfs amb dracut."
@@ -403,36 +364,75 @@ msgstr "Es creen initramfs amb dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Ha fallat executar dracut a la destinació."
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura el GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "No es pot escriure el fitxer de configuració del KDM."
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "El fitxer de configuració del KDM {!s} no existeix."
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "No es pot escriure el fitxer de configuració de l'LXDM."
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "El fitxer de configuració de l'LXDM {!s} no existeix."
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "No es pot escriure el fitxer de configuració del LightDM."
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "El fitxer de configuració del LightDM {!s} no existeix."
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "No es pot configurar el LightDM."
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "No hi ha benvinguda instal·lada per al LightDM."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "No es pot escriure el fitxer de configuració de l'SLIM."
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "El fitxer de configuració de l'SLIM {!s} no existeix."
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+"No hi ha cap gestor de pantalla seleccionat per al mòdul displaymanager."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"La llista de gestors de pantalla és buida o no definida ni a globalstorage "
+"ni a displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "La configuració del gestor de pantalla no era completa."
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Es configuren initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Es configura el sevei OpenRC dmcrypt."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "S'estableix el rellotge del maquinari."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "S'escriu fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"No hi ha cap configuració de 
{!s}
 perquè la usi 
{!s}
."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tasca de python fictícia."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pas de python fitctici {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Es configuren les llengües."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Es desa la configuració de la xarxa."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "S'instal·len dades."
diff --git a/lang/python/ca@valencia/LC_MESSAGES/python.po b/lang/python/ca@valencia/LC_MESSAGES/python.po
index aec33d82b..f5a80d134 100644
--- a/lang/python/ca@valencia/LC_MESSAGES/python.po
+++ b/lang/python/ca@valencia/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Raul , 2021\n"
 "Language-Team: Catalan (Valencian) (https://www.transifex.com/calamares/teams/20061/ca@valencia/)\n"
@@ -21,94 +21,99 @@ msgstr ""
 "Language: ca@valencia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura el GRUB"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instal·la els paquets."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "S'estan muntant les particions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "S'estan processant els paquets (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "S'està instal·lant un paquet."
+msgstr[1] "S'està instal·lant %(num)d paquets."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "S’està eliminant un paquet."
+msgstr[1] "S’està eliminant %(num)d paquets."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "S'està guardant la configuració de la xarxa."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "S'ha produït un error en la configuració."
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"No s'ha proporcionat el punt de muntatge perquè l'use 
{!s}
."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "S'està configurant mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "No s'han definit particions perquè les use 
{!s}
."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Creació d’initramfs amb mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura els serveis de systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "No s’ha pogut executar mkinitfs en la destinació."
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No es pot modificar el servei."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "El codi d'eixida ha estat {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La crida de systemctl {arg!s} a chroot ha retornat el codi "
-"d'error {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No es pot habilitar el servei de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No es pot habilitar la destinació de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No es pot emmascarar la unitat de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Es desconeixen les ordres de systemd: {command!s} i "
-"{suffix!s}, per a la unitat {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configuració del servei OpenRC dmcrypt."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -174,77 +179,117 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "La destinació \"{}\" en el sistema de destinació no és un directori."
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "No es pot escriure el fitxer de configuració del KDM."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura els serveis de systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "El fitxer de configuració del KDM {!s} no existeix."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "No es pot modificar el servei."
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "No es pot escriure el fitxer de configuració de l'LXDM."
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "El fitxer de configuració de l'LXDM {!s} no existeix."
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "No es pot escriure el fitxer de configuració del LightDM."
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "El fitxer de configuració del LightDM {!s} no existeix."
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "No es pot configurar el LightDM."
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "No hi ha benvinguda instal·lada per al LightDM."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "No es pot escriure el fitxer de configuració de l'SLIM."
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "El fitxer de configuració de l'SLIM {!s} no existeix."
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-"No hi ha cap gestor de pantalla seleccionat per al mòdul displaymanager."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"La llista de gestors de pantalla està buida o no està definida ni en "
-"globalstorage ni en displaymanager.conf."
+"La crida de systemctl {arg!s} a chroot ha retornat el codi "
+"d'error {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "La configuració del gestor de pantalla no era completa."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No es pot habilitar el servei de systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "S'està configurant mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No es pot habilitar la destinació de systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
-"No s'ha proporcionat el punt de muntatge perquè l'use 
{!s}
."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "S'estan instal·lant les dades."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No es pot emmascarar la unitat de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Es desconeixen les ordres de systemd: {command!s} i "
+"{suffix!s}, per a la unitat {name!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tasca de python de proves."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pas de python de proves {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instal·la el carregador d'arrancada."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Configuració d’idioma."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "S'estan muntant les particions."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura el tema del Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Escriptura d’fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -297,91 +342,6 @@ msgid ""
 msgstr ""
 "El camí per al servei {name!s} és {path!s}, però no existeix."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura el tema del Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instal·la els paquets."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "S'estan processant els paquets (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "S'està instal·lant un paquet."
-msgstr[1] "S'està instal·lant %(num)d paquets."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "S’està eliminant un paquet."
-msgstr[1] "S’està eliminant %(num)d paquets."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instal·la el carregador d'arrancada."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configuració del rellotge del maquinari."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creació d’initramfs amb mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "No s’ha pogut executar mkinitfs en la destinació."
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El codi d'eixida ha estat {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Creació d’initramfs amb dracut."
@@ -390,35 +350,75 @@ msgstr "Creació d’initramfs amb dracut."
 msgid "Failed to run dracut on the target"
 msgstr "No s’ha pogut executar dracut en la destinació."
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura el GRUB"
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "No es pot escriure el fitxer de configuració del KDM."
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "El fitxer de configuració del KDM {!s} no existeix."
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "No es pot escriure el fitxer de configuració de l'LXDM."
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "El fitxer de configuració de l'LXDM {!s} no existeix."
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "No es pot escriure el fitxer de configuració del LightDM."
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "El fitxer de configuració del LightDM {!s} no existeix."
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "No es pot configurar el LightDM."
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "No hi ha benvinguda instal·lada per al LightDM."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "No es pot escriure el fitxer de configuració de l'SLIM."
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "El fitxer de configuració de l'SLIM {!s} no existeix."
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+"No hi ha cap gestor de pantalla seleccionat per al mòdul displaymanager."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"La llista de gestors de pantalla està buida o no està definida ni en "
+"globalstorage ni en displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "La configuració del gestor de pantalla no era completa."
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Es configuren initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuració del servei OpenRC dmcrypt."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configuració del rellotge del maquinari."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escriptura d’fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tasca de python de proves."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pas de python de proves {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Configuració d’idioma."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "S'està guardant la configuració de la xarxa."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "S'estan instal·lant les dades."
diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po
index 938f20161..c765c28ad 100644
--- a/lang/python/cs_CZ/LC_MESSAGES/python.po
+++ b/lang/python/cs_CZ/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Pavel Borecki , 2022\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n"
@@ -23,93 +23,108 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Nastavování zavaděče GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Nainstalovat balíčky."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Připojování oddílů."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Zpracovávání balíčků (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Vnitřní chyba při připojování zfs datových sad"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Je instalován jeden balíček."
+msgstr[1] "Jsou instalovány %(num)d balíčky."
+msgstr[2] "Je instalováno %(num)d balíčků."
+msgstr[3] "Je instalováno %(num)d balíčků."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Nepodařilo se naimportovat zfs fond"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Odebírá se jeden balíček."
+msgstr[1] "Odebírají se %(num)d balíčky."
+msgstr[2] "Odebírá se %(num)d balíčků."
+msgstr[3] "Odebírá se %(num)d balíčků."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Nepodařilo se odemknout zfs fond"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Chyba nástroje pro správu balíčků"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Nepodařilo se nastavit zfs přípojný bod"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Nástroji pro správu balíčků se nepodařilo připravit aktualizace. Příkaz "
+"
{!s}
 vrátil chybový kód {!s}."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Nástroji pro správu balíčků se nepodařilo aktualizovat systém. Příkaz "
+"
{!s}
 vrátil chybový kód {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Nástroji pro správu balíčků se nepodařilo udělat změny v instalovaném "
+"systému. Příkaz 
{!s}
 vrátil chybový kód {!s}."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Ukládání nastavení sítě."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Chyba nastavení"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Pro 
{!s}
 není zadán žádný přípojný bod."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Nastavování mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Pro 
{!s}
 nejsou zadány žádné oddíly."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "Chyba při připojování zfs"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Vytváření initramfs nástrojem mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Nastavit služby systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Na cíli se nepodařilo spustit mkinitfs"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Službu se nedaří upravit"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Návratový kód byl {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Volání systemctl {arg!s} v chroot vrátilo chybový kód {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nedaří se zapnout systemd službu {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nedaří se zapnout systemd službu {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "Nedaří se zapnout systemd časovač {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nedaří se vypnout systemd cíl {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nedaří se maskovat systemd jednotku {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Neznámé systemd příkazy {command!s} a {suffix!s} "
-"pro jednotku {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Nastavování služby OpenRC dmcrypt."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -179,75 +194,122 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Cíl „{}“ v cílovém systému není složka"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Nedaří se zapsat soubor s nastaveními pro KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Nastavit služby systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Soubor s nastaveními pro KDM {!s} neexistuje"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Službu se nedaří upravit"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Nedaří se zapsat soubor s nastaveními pro LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Soubor s nastaveními pro LXDM {!s} neexistuje"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Nedaří se zapsat soubor s nastaveními pro LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Soubor s nastaveními pro LightDM {!s} neexistuje"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Nedaří se nastavit LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Není nainstalovaný žádný LightDM přivítač"
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Nedaří se zapsat soubor s nastaveními pro SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Soubor s nastaveními pro SLIM {!s} neexistuje"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Pro modul správce sezení nejsou vybrány žádní správci sezení."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Seznam správců displejů je prázdný nebo není definován v jak globalstorage, "
-"tak v displaymanager.conf."
+"Volání systemctl {arg!s} v chroot vrátilo chybový kód {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Nastavení správce displeje nebylo úplné"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nedaří se zapnout systemd službu {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Nastavování mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nedaří se zapnout systemd službu {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Pro 
{!s}
 není zadán žádný přípojný bod."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "Nedaří se zapnout systemd časovač {name!s}."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalace dat."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nedaří se vypnout systemd cíl {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nedaří se maskovat systemd jednotku {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Neznámé systemd příkazy {command!s} a {suffix!s} "
+"pro jednotku {name!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testovací úloha python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testovací krok {} python."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalace zavaděče systému."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Nepodařilo se nainstalovat zavaděč grub – v globálním úložišti nejsou "
+"definovány žádné oddíly"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Chyba při instalaci zavaděče systému"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Zavaděč systému se nepodařilo nainstalovat. Instalační příkaz 
{!s} "
+"vrátil chybový kód {!s}."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Nastavování místních a jazykových nastavení."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Připojování oddílů."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Vnitřní chyba při připojování zfs datových sad"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Nepodařilo se naimportovat zfs fond"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Nepodařilo se odemknout zfs fond"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Nepodařilo se nastavit zfs přípojný bod"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "Chyba při připojování zfs"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Nastavit téma vzhledu pro Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Zapisování fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"Pro 
{!s}
 není zadáno žádné nastavení 
{!s}
, které "
+"použít. "
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -301,105 +363,6 @@ msgstr ""
 "Popis umístění pro službu {name!s} je {path!s}, která "
 "neexistuje."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Nastavit téma vzhledu pro Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Nainstalovat balíčky."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Zpracovávání balíčků (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Je instalován jeden balíček."
-msgstr[1] "Jsou instalovány %(num)d balíčky."
-msgstr[2] "Je instalováno %(num)d balíčků."
-msgstr[3] "Je instalováno %(num)d balíčků."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Odebírá se jeden balíček."
-msgstr[1] "Odebírají se %(num)d balíčky."
-msgstr[2] "Odebírá se %(num)d balíčků."
-msgstr[3] "Odebírá se %(num)d balíčků."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Chyba nástroje pro správu balíčků"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Nástroji pro správu balíčků se nepodařilo připravit aktualizace. Příkaz "
-"
{!s}
 vrátil chybový kód {!s}."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Nástroji pro správu balíčků se nepodařilo aktualizovat systém. Příkaz "
-"
{!s}
 vrátil chybový kód {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Nástroji pro správu balíčků se nepodařilo udělat změny v instalovaném "
-"systému. Příkaz 
{!s}
 vrátil chybový kód {!s}."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalace zavaděče systému."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Nepodařilo se nainstalovat zavaděč grub – v globálním úložišti nejsou "
-"definovány žádné oddíly"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Chyba při instalaci zavaděče systému"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Zavaděč systému se nepodařilo nainstalovat. Instalační příkaz 
{!s} "
-"vrátil chybový kód {!s}."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nastavování hardwarových hodin."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Vytváření initramfs nástrojem mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Na cíli se nepodařilo spustit mkinitfs"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Návratový kód byl {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Vytváření initramfs s dracut."
@@ -408,37 +371,74 @@ msgstr "Vytváření initramfs s dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Na cíli se nepodařilo spustit dracut"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Nastavování zavaděče GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Nedaří se zapsat soubor s nastaveními pro KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Soubor s nastaveními pro KDM {!s} neexistuje"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Nedaří se zapsat soubor s nastaveními pro LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Soubor s nastaveními pro LXDM {!s} neexistuje"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Nedaří se zapsat soubor s nastaveními pro LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Soubor s nastaveními pro LightDM {!s} neexistuje"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Nedaří se nastavit LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Není nainstalovaný žádný LightDM přivítač"
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Nedaří se zapsat soubor s nastaveními pro SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Soubor s nastaveními pro SLIM {!s} neexistuje"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Pro modul správce sezení nejsou vybrány žádní správci sezení."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Seznam správců displejů je prázdný nebo není definován v jak globalstorage, "
+"tak v displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Nastavení správce displeje nebylo úplné"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Nastavování initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Nastavování služby OpenRC dmcrypt."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nastavování hardwarových hodin."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisování fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"Pro 
{!s}
 není zadáno žádné nastavení 
{!s}
, které "
-"použít. "
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testovací úloha python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testovací krok {} python."
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Nastavování místních a jazykových nastavení."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Ukládání nastavení sítě."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalace dat."
diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po
index 2caf04d9d..05e081e27 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: scootergrisen, 2020\n"
 "Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n"
@@ -22,93 +22,99 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurer GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Installér pakker."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Monterer partitioner."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Forarbejder pakker (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installerer én pakke."
+msgstr[1] "Installerer %(num)d pakker."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Fjerner én pakke."
+msgstr[1] "Fjerner %(num)d pakker."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Gemmer netværkskonfiguration."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Fejl ved konfiguration"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"Der er ikke angivet noget rodmonteringspunkt som 
{!s}
 kan bruge."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerer mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Der er ikke angivet nogle partitioner som 
{!s}
 kan bruge."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Opretter initramfs med mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurer systemd-tjenester"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Kunne ikke køre mkinitfs på målet"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Kan ikke redigere tjeneste"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Afslutningskoden var {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s}-kald i chroot returnerede fejlkoden {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Kan ikke aktivere systemd-tjenesten {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Kan ikke aktivere systemd-målet {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Kan ikke deaktivere systemd-målet {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Kan ikke maskere systemd-enheden {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Ukendte systemd-kommandoer {command!s} og "
-"{suffix!s} til enheden {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -174,77 +180,116 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Destinationen \"{}\" i målsystemet er ikke en mappe"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Kan ikke skrive KDM-konfigurationsfil"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurer systemd-tjenester"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM-konfigurationsfil {!s} findes ikke"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Kan ikke redigere tjeneste"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Kan ikke skrive LXDM-konfigurationsfil"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM-konfigurationsfil {!s} findes ikke"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Kan ikke skrive LightDM-konfigurationsfil"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM-konfigurationsfil {!s} findes ikke"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Kan ikke konfigurere LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Der er ikke installeret nogen LightDM greeter."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Kan ikke skrive SLIM-konfigurationsfil"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM-konfigurationsfil {!s} findes ikke"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-"Der er ikke valgt nogen displayhåndteringer til displayhåndtering-modulet."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Displayhåndteringerlisten er tom eller udefineret i både globalstorage og "
-"displaymanager.conf."
+"systemctl {arg!s}-kald i chroot returnerede fejlkoden {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Displayhåndtering-konfiguration er ikke komplet"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Kan ikke aktivere systemd-tjenesten {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurerer mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Kan ikke aktivere systemd-målet {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
-"Der er ikke angivet noget rodmonteringspunkt som 
{!s}
 kan bruge."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installerer data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Kan ikke deaktivere systemd-målet {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Kan ikke maskere systemd-enheden {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Ukendte systemd-kommandoer {command!s} og "
+"{suffix!s} til enheden {name!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python-job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python-trin {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installér bootloader."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Konfigurerer lokaliteter."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Monterer partitioner."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurer Plymouth-tema"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Skriver fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -295,91 +340,6 @@ msgid ""
 msgstr ""
 "Stien til tjenesten {name!s} er {path!s}, som ikke findes."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurer Plymouth-tema"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Installér pakker."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Forarbejder pakker (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installerer én pakke."
-msgstr[1] "Installerer %(num)d pakker."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Fjerner én pakke."
-msgstr[1] "Fjerner %(num)d pakker."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installér bootloader."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Indstiller hardwareur."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Opretter initramfs med mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Kunne ikke køre mkinitfs på målet"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Afslutningskoden var {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Opretter initramfs med dracut."
@@ -388,35 +348,75 @@ msgstr "Opretter initramfs med dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Kunne ikke køre dracut på målet"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurer GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Kan ikke skrive KDM-konfigurationsfil"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM-konfigurationsfil {!s} findes ikke"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Kan ikke skrive LXDM-konfigurationsfil"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM-konfigurationsfil {!s} findes ikke"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Kan ikke skrive LightDM-konfigurationsfil"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM-konfigurationsfil {!s} findes ikke"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Kan ikke konfigurere LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Der er ikke installeret nogen LightDM greeter."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Kan ikke skrive SLIM-konfigurationsfil"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM-konfigurationsfil {!s} findes ikke"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+"Der er ikke valgt nogen displayhåndteringer til displayhåndtering-modulet."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Displayhåndteringerlisten er tom eller udefineret i både globalstorage og "
+"displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Displayhåndtering-konfiguration er ikke komplet"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Konfigurerer initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Indstiller hardwareur."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Skriver fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python-job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python-trin {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Konfigurerer lokaliteter."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Gemmer netværkskonfiguration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installerer data."
diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po
index 539e0fd29..03803d311 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Gustav Gyges, 2022\n"
 "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n"
@@ -23,94 +23,106 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB konfigurieren."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Pakete installieren "
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Hänge Partitionen ein."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Verarbeite Pakete (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Interner Fehler beim Einhängen des ZFS-Datensets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installiere ein Paket"
+msgstr[1] "Installiere %(num)d Pakete."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Zpool konnte nicht importiert werden"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Entferne ein Paket"
+msgstr[1] "Entferne %(num)d Pakete."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Zpool konnte nicht entsperrt werden"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Fehler im Paketmanager"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Zpool-Einhängepunkt konnte nicht gesetzt werden"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Der Paketmanager konnte die Aktualisierungen nicht vorbereiten. Der Befehl "
+"
{!s}
 erzeugte Fehlercode {!s}."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Der Paketmanager konnte das System nicht aktualisieren. Der Befehl "
+"
{!s}
 erzeugte Fehlercode {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Der Paketmanager konnte das installierte System nicht verändern. Der Befehl "
+"
{!s}
 erzeugte Fehlercode {!s}."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Speichere Netzwerkkonfiguration."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Konfigurationsfehler"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"Für 
{!s}
 wurde kein Einhängepunkt für die Root-Partition "
+"angegeben."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriere mkinitcpio. "
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Für 
{!s}
 sind keine zu verwendenden Partitionen definiert."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "Fehler beim Einhängen von ZFS"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Erstelle initramfs mit mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguriere systemd-Dienste"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Ausführung von mkinitfs auf dem Ziel fehlgeschlagen."
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Der Dienst kann nicht geändert werden."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Der Exit-Code war {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} Aufruf in chroot lieferte Fehlercode {num!s} "
-"zurück."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Der systemd-Dienst {name!s} kann nicht aktiviert werden."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Das systemd-Ziel {name!s} kann nicht aktiviert werden."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "Systemd-Timer {name!s} kann nicht aktiviert werden."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Das systemd-Ziel {name!s} kann nicht deaktiviert werden."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Die systemd-Einheit {name!s} kann nicht maskiert werden."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Unbekannte systemd-Befehle {command!s} und "
-"{suffix!s} für Einheit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfiguriere den dmcrypt-Dienst von OpenRC."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -180,77 +192,123 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Das Ziel \"{}\" im Zielsystem ist kein Verzeichnis"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Schreiben der KDM-Konfigurationsdatei nicht möglich"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguriere systemd-Dienste"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM-Konfigurationsdatei {!s} existiert nicht"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Der Dienst kann nicht geändert werden."
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Schreiben der LXDM-Konfigurationsdatei nicht möglich"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM-Konfigurationsdatei {!s} existiert nicht"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Schreiben der LightDM-Konfigurationsdatei nicht möglich"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM-Konfigurationsdatei {!s} existiert nicht"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Konfiguration von LightDM ist nicht möglich"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Keine Benutzeroberfläche für LightDM installiert."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Schreiben der SLIM-Konfigurationsdatei nicht möglich"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM-Konfigurationsdatei {!s} existiert nicht"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Keine Displaymanager für das Displaymanager-Modul ausgewählt."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Die Liste der Displaymanager ist leer oder weder in globalstorage noch in "
-"displaymanager.conf definiert."
+"systemctl {arg!s} Aufruf in chroot lieferte Fehlercode {num!s} "
+"zurück."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Die Konfiguration des Displaymanager war unvollständig."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Der systemd-Dienst {name!s} kann nicht aktiviert werden."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfiguriere mkinitcpio. "
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Das systemd-Ziel {name!s} kann nicht aktiviert werden."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "Systemd-Timer {name!s} kann nicht aktiviert werden."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Das systemd-Ziel {name!s} kann nicht deaktiviert werden."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Die systemd-Einheit {name!s} kann nicht maskiert werden."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Für 
{!s}
 wurde kein Einhängepunkt für die Root-Partition "
-"angegeben."
+"Unbekannte systemd-Befehle {command!s} und "
+"{suffix!s} für Einheit {name!s}."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installiere Daten."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy Python-Job"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy Python-Schritt {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installiere Bootloader."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Grub konnte nicht installiert werden, keine Partitionen im globalen Speicher"
+" definiert."
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Fehler beim Installieren des Bootloaders"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Der Bootloader konnte nicht installiert werden. Der Installationsbefehl "
+"
{!s}
 erzeugte Fehlercode {!s}."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Konfiguriere Lokalisierungen."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Hänge Partitionen ein."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Interner Fehler beim Einhängen des ZFS-Datensets"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Zpool konnte nicht importiert werden"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Zpool konnte nicht entsperrt werden"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Zpool-Einhängepunkt konnte nicht gesetzt werden"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "Fehler beim Einhängen von ZFS"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguriere Plymouth-Thema"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Schreibe fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"Keine 
{!s}
 Konfiguration gegeben die 
{!s}
 benutzen "
+"könnte."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -303,101 +361,6 @@ msgstr ""
 "Der Pfad für den Dienst {name!s} is {path!s}, welcher nicht "
 "existiert."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfiguriere Plymouth-Thema"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Pakete installieren "
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Verarbeite Pakete (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installiere ein Paket"
-msgstr[1] "Installiere %(num)d Pakete."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Entferne ein Paket"
-msgstr[1] "Entferne %(num)d Pakete."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Fehler im Paketmanager"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Der Paketmanager konnte die Aktualisierungen nicht vorbereiten. Der Befehl "
-"
{!s}
 erzeugte Fehlercode {!s}."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Der Paketmanager konnte das System nicht aktualisieren. Der Befehl "
-"
{!s}
 erzeugte Fehlercode {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Der Paketmanager konnte das installierte System nicht verändern. Der Befehl "
-"
{!s}
 erzeugte Fehlercode {!s}."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installiere Bootloader."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Grub konnte nicht installiert werden, keine Partitionen im globalen Speicher"
-" definiert."
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Fehler beim Installieren des Bootloaders"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Der Bootloader konnte nicht installiert werden. Der Installationsbefehl "
-"
{!s}
 erzeugte Fehlercode {!s}."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Einstellen der Hardware-Uhr."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Erstelle initramfs mit mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Ausführung von mkinitfs auf dem Ziel fehlgeschlagen."
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Der Exit-Code war {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Erstelle initramfs mit dracut."
@@ -406,37 +369,74 @@ msgstr "Erstelle initramfs mit dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Ausführen von dracut auf dem Ziel schlug fehl"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB konfigurieren."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Schreiben der KDM-Konfigurationsdatei nicht möglich"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM-Konfigurationsdatei {!s} existiert nicht"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Schreiben der LXDM-Konfigurationsdatei nicht möglich"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM-Konfigurationsdatei {!s} existiert nicht"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Schreiben der LightDM-Konfigurationsdatei nicht möglich"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM-Konfigurationsdatei {!s} existiert nicht"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Konfiguration von LightDM ist nicht möglich"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Keine Benutzeroberfläche für LightDM installiert."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Schreiben der SLIM-Konfigurationsdatei nicht möglich"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM-Konfigurationsdatei {!s} existiert nicht"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Keine Displaymanager für das Displaymanager-Modul ausgewählt."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Die Liste der Displaymanager ist leer oder weder in globalstorage noch in "
+"displaymanager.conf definiert."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Die Konfiguration des Displaymanager war unvollständig."
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Konfiguriere initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfiguriere den dmcrypt-Dienst von OpenRC."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Einstellen der Hardware-Uhr."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Schreibe fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"Keine 
{!s}
 Konfiguration gegeben die 
{!s}
 benutzen "
-"könnte."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy Python-Job"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy Python-Schritt {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Konfiguriere Lokalisierungen."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Speichere Netzwerkkonfiguration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installiere Daten."
diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po
index 18153ef11..852b9a132 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Efstathios Iosifidis , 2022\n"
 "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n"
@@ -21,89 +21,97 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Ρύθμιση GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "εγκατάσταση πακέτων."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Προσάρτηση κατατμήσεων."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Σφάλμα διαχειριστή πακέτων"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -170,73 +178,113 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Αδυναμία ρύθμισης LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Εγκατάσταση δεδομένων."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Προσάρτηση κατατμήσεων."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Εγγραγή fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -281,91 +329,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "εγκατάσταση πακέτων."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Σφάλμα διαχειριστή πακέτων"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -374,35 +337,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Ρύθμιση GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Αδυναμία ρύθμισης LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Εγγραγή fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Εγκατάσταση δεδομένων."
diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po
index a093a3121..ac9021b4a 100644
--- a/lang/python/en_GB/LC_MESSAGES/python.po
+++ b/lang/python/en_GB/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Karthik Balan, 2021\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n"
@@ -22,89 +22,97 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Install packages."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Processing packages (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installing one package."
+msgstr[1] "Installing %(num)d packages."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removing one package."
+msgstr[1] "Removing %(num)d packages."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Package Manager error"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Saving network configuration "
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Configuration  Error "
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -171,72 +179,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Cannot write KDM configuration file"
-
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Bootloader installation error"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -282,91 +330,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Install packages."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processing packages (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "Installing %(num)d packages."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "Removing %(num)d packages."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Package Manager error"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Bootloader installation error"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -375,35 +338,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Cannot write KDM configuration file"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Saving network configuration "
diff --git a/lang/python/eo/LC_MESSAGES/python.po b/lang/python/eo/LC_MESSAGES/python.po
index b306336f9..6ea8e7c4b 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kurt Ankh Phoenix , 2018\n"
 "Language-Team: Esperanto (https://www.transifex.com/calamares/teams/20061/eo/)\n"
@@ -21,89 +21,97 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instali pakaĵoj."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Prilaborante pakaĵoj (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalante unu pakaĵo."
+msgstr[1] "Instalante %(num)d pakaĵoj."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Forigante unu pakaĵo."
+msgstr[1] "Forigante %(num)d pakaĵoj."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -170,72 +178,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Formala python laboro."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Formala python paŝo {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -281,91 +329,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instali pakaĵoj."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Prilaborante pakaĵoj (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalante unu pakaĵo."
-msgstr[1] "Instalante %(num)d pakaĵoj."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Forigante unu pakaĵo."
-msgstr[1] "Forigante %(num)d pakaĵoj."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -374,35 +337,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Formala python laboro."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Formala python paŝo {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po
index 253fea1a7..0a2ad73e5 100644
--- a/lang/python/es/LC_MESSAGES/python.po
+++ b/lang/python/es/LC_MESSAGES/python.po
@@ -4,125 +4,128 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# strel, 2017
 # Guido Grasso , 2018
 # Adolfo Jayme-Barrientos, 2019
 # Miguel Mayol , 2020
 # Pier Jose Gotta Perez , 2020
 # Swyter , 2022
+# strel, 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Swyter , 2022\n"
+"Last-Translator: strel, 2022\n"
 "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurar GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalar paquetes."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montando las particiones."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Procesando paquetes (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando un paquete."
+msgstr[1] "Instalando %(num)d paquetes."
+msgstr[2] "Instalando %(num)d paquetes."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Eliminando un paquete."
+msgstr[1] "Eliminando %(num)d paquetes."
+msgstr[2] "Eliminando %(num)d paquetes."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Hubo un error del gestor de paquetes"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
-"No se pudieron montar los conjuntos de datos («datasets») de zfs por un "
-"error interno"
+"El gestor de paquetes no pudo preparar las actualizaciones; la orden "
+"
{!s}
 devolvió el código de error {!s}."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "No se pudo importar el «zpool»"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"El gestor de paquetes no pudo actualizar el sistema; la orden "
+"
{!s}
 devolvió el código de error {!s}."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "No se pudo desbloquear el «zpool»"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"El gestor de paquetes no pudo realizar cambios en el sistema a instalar; la "
+"orden 
{!s}
 devolvió el código de error {!s}."
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "No se pudo establecer el punto de montaje zfs"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Guardando configuración de red."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Error de configuración"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "No hay ningún punto de montaje en 
{!s}
 que se pueda usar."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando «mkinitcpio»."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "No hay ninguna partición en 
{!s}
 que se pueda usar."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "hubo un error con el montaje zfs"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Creando el «initramfs» con «mkinitfs»."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar los servicios de systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hubo un error al ejecutar «mkinitfs» en el destino"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No se puede modificar el servicio"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "El código de salida fue {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La orden systemctl {arg!s} del «chroot» devolvió el código de "
-"error {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No se puede activar el servicio de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-"No se puede activar el objetivo («target») de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-"No se puede activar el temporizador («timer») de systemd "
-"{name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-"No se puede desactivar el objetivo («target») de systemd "
-"{name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-"No se puede enmascarar («mask») la unidad («unit») de systemd "
-"{name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"systemd no reconoce las órdenes {command!s} ni "
-"{suffix!s} para la unidad {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando el servicio de arranque cifrado «dmcrypt» para OpenRC "
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -191,78 +194,132 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "El destino «{}» en el sistema escogido no es una carpeta"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "No se puede escribir el archivo de configuración de KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar los servicios de systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "El archivo de configuración {!s} de KDM no existe"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "No se puede modificar el servicio"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "No se puede escribir el archivo de configuración LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "El archivo de configuracion {!s} de LXDM no existe"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "No se puede escribir el archivo de configuración de LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "El archivo de configuración {!s} de LightDM no existe"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "No se puede configurar LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "No hay ningún menú de bienvenida («greeter») de LightDM instalado."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "No se puede escribir el archivo de configuración de SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "El archivo de configuración {!s} de SLIM no existe"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-"No se ha elegido ningún gestor de pantalla para el módulo «displaymanager»."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"La lista de gestores de pantalla está vacía o sin definir tanto en "
-"«globalstorage» como en «displaymanager.conf»."
+"La orden systemctl {arg!s} del «chroot» devolvió el código de "
+"error {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No se puede activar el servicio de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
-"La configuración del gestor de pantalla («display manager») estaba "
-"incompleta"
+"No se puede activar el objetivo («target») de systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando «mkinitcpio»."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+"No se puede activar el temporizador («timer») de systemd "
+"{name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "No hay ningún punto de montaje en 
{!s}
 que se pueda usar."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"No se puede desactivar el objetivo («target») de systemd "
+"{name!s}."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando los datos."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+"No se puede enmascarar («mask») la unidad («unit») de systemd "
+"{name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"systemd no reconoce las órdenes {command!s} ni "
+"{suffix!s} para la unidad {name!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarea de python ficticia."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso ficticio de python {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar gestor de arranque."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Hubo un error al instalar «grub»; no hay particiones definidas en el "
+"almacenamiento global"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Hubo un error al instalar el cargador de arranque"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"No se pudo instalar el cargador de arranque; la orden de instalación "
+"
{!s}
 devolvió el código de error {!s}."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Aplicando la configuración regional."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montando las particiones."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+"No se pudieron montar los conjuntos de datos («datasets») de zfs por un "
+"error interno"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "No se pudo importar el «zpool»"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "No se pudo desbloquear el «zpool»"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "No se pudo establecer el punto de montaje zfs"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "hubo un error con el montaje zfs"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema de Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Escribiendo el «fstab»."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"No se proporciona ninguna configuración de 
{!s}
 que "
+"
{!s}
 pueda usar."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -318,101 +375,6 @@ msgid ""
 msgstr ""
 "La ruta para el servicio {name!s} es {path!s}, que no existe."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema de Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalar paquetes."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Procesando paquetes (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando un paquete."
-msgstr[1] "Instalando %(num)d paquetes."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Eliminando un paquete."
-msgstr[1] "Eliminando %(num)d paquetes."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Hubo un error del gestor de paquetes"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"El gestor de paquetes no pudo preparar las actualizaciones; la orden "
-"
{!s}
 devolvió el código de error {!s}."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"El gestor de paquetes no pudo actualizar el sistema; la orden "
-"
{!s}
 devolvió el código de error {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"El gestor de paquetes no pudo realizar cambios en el sistema a instalar; la "
-"orden 
{!s}
 devolvió el código de error {!s}."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar gestor de arranque."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Hubo un error al instalar «grub»; no hay particiones definidas en el "
-"almacenamiento global"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Hubo un error al instalar el cargador de arranque"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"No se pudo instalar el cargador de arranque; la orden de instalación "
-"
{!s}
 devolvió el código de error {!s}."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ajustando el reloj interno del equipo."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creando el «initramfs» con «mkinitfs»."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hubo un error al ejecutar «mkinitfs» en el destino"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El código de salida fue {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Creando «initramfs» (archivos de arranque) con «dracut»."
@@ -421,37 +383,77 @@ msgstr "Creando «initramfs» (archivos de arranque) con «dracut»."
 msgid "Failed to run dracut on the target"
 msgstr "Hubo un error al ejecutar «dracut» en el destino"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "No se puede escribir el archivo de configuración de KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "El archivo de configuración {!s} de KDM no existe"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "No se puede escribir el archivo de configuración LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "El archivo de configuracion {!s} de LXDM no existe"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "No se puede escribir el archivo de configuración de LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "El archivo de configuración {!s} de LightDM no existe"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "No se puede configurar LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "No hay ningún menú de bienvenida («greeter») de LightDM instalado."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "No se puede escribir el archivo de configuración de SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "El archivo de configuración {!s} de SLIM no existe"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+"No se ha elegido ningún gestor de pantalla para el módulo «displaymanager»."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"La lista de gestores de pantalla está vacía o sin definir tanto en "
+"«globalstorage» como en «displaymanager.conf»."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+"La configuración del gestor de pantalla («display manager») estaba "
+"incompleta"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Configurando «initramfs» (archivos de arranque)."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando el servicio de arranque cifrado «dmcrypt» para OpenRC "
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ajustando el reloj interno del equipo."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escribiendo el «fstab»."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"No se proporciona ninguna configuración de 
{!s}
 que "
-"
{!s}
 pueda usar."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarea de python ficticia."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso ficticio de python {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Aplicando la configuración regional."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Guardando configuración de red."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalando los datos."
diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po
index 27951e65e..97912062d 100644
--- a/lang/python/es_MX/LC_MESSAGES/python.po
+++ b/lang/python/es_MX/LC_MESSAGES/python.po
@@ -4,114 +4,119 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# guillermo pacheco , 2018
 # a1a9b52a3f40dff112eca965c254c602_089360e , 2018
 # Erland Huaman , 2021
+# guillermo pacheco , 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Erland Huaman , 2021\n"
+"Last-Translator: guillermo pacheco , 2022\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_MX\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalar paquetes."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montando particiones."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Procesando paquetes (%(count)d/%(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando un paquete."
+msgstr[1] "Instalando%(num)d paquetes."
+msgstr[2] "Instalando%(num)d paquetes."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removiendo un paquete."
+msgstr[1] "Removiendo %(num)dpaquetes."
+msgstr[2] "Removiendo %(num)dpaquetes."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Guardando configuración de red."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Error de configuración"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio"
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "No hay particiones definidas para que 
{!s}
 use."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Creando initramfs con mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura los servicios de systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Se falló al intentar correr mkinitfs en el objetivo"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No se puede modificar el servicio."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "El código de salida fue {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La llamada de: systemctl {arg!s} en chroot retorna código de "
-"error {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No se puede habilitar el servicio {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No se puede habilitar el objetivo {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-"No se puede deshabilitar el objetivo {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No se puede enmascarar la unidad {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"systemd no reconoce los comandos {command!s} y "
-"{suffix!s}para la unidad {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando el servicio OpenRc dmcrypt."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -179,75 +184,118 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "El destino \"{}\" en el sistema objetivo no es un directorio"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "No se puede escribir el archivo de configuración de KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura los servicios de systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "El archivo de configuración de KDM {!s} no existe"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "No se puede modificar el servicio."
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "No se puede escribir el archivo de configuración de LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "El archivo de configuración de LXDM {!s} no existe"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "No se puede escribir el archivo de configuración de LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "El archivo de configuración de LightDM {!s} no existe"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "No se puede configurar LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM greeter no está instalado."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "No se puede escribir el archivo de configuración de SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "No se seleccionaron gestores para el módulo de gestor de pantalla."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"La lista de gestores de pantalla está vacía o indefinida tanto en el "
-"globalstorage como en el displaymanager.conf."
+"La llamada de: systemctl {arg!s} en chroot retorna código de "
+"error {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "La configuración del gestor de pantalla estaba incompleta"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No se puede habilitar el servicio {name!s} de systemd."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No se puede habilitar el objetivo {name!s} de systemd."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"No se puede deshabilitar el objetivo {name!s} de systemd."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No se puede enmascarar la unidad {name!s} de systemd."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"systemd no reconoce los comandos {command!s} y "
+"{suffix!s}para la unidad {name!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Trabajo python ficticio."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso python ficticio {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar el cargador de arranque."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Configurando locales."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montando particiones."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurando el tema de Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Escribiento fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -292,91 +340,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurando el tema de Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalar paquetes."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Procesando paquetes (%(count)d/%(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando un paquete."
-msgstr[1] "Instalando%(num)d paquetes."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removiendo un paquete."
-msgstr[1] "Removiendo %(num)dpaquetes."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar el cargador de arranque."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando el reloj del hardware."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creando initramfs con mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Se falló al intentar correr mkinitfs en el objetivo"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El código de salida fue {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Creando initramfs con dracut"
@@ -385,35 +348,74 @@ msgstr "Creando initramfs con dracut"
 msgid "Failed to run dracut on the target"
 msgstr "Se falló al intentar correr dracut en el objetivo"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "No se puede escribir el archivo de configuración de KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "El archivo de configuración de KDM {!s} no existe"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "No se puede escribir el archivo de configuración de LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "El archivo de configuración de LXDM {!s} no existe"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "No se puede escribir el archivo de configuración de LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "El archivo de configuración de LightDM {!s} no existe"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "No se puede configurar LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM greeter no está instalado."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "No se puede escribir el archivo de configuración de SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "No se seleccionaron gestores para el módulo de gestor de pantalla."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"La lista de gestores de pantalla está vacía o indefinida tanto en el "
+"globalstorage como en el displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "La configuración del gestor de pantalla estaba incompleta"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Configurando initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando el servicio OpenRc dmcrypt."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando el reloj del hardware."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escribiento fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Trabajo python ficticio."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso python ficticio {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Configurando locales."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Guardando configuración de red."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalando data."
diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po
index ff00806a3..25e3cceb5 100644
--- a/lang/python/es_PR/LC_MESSAGES/python.po
+++ b/lang/python/es_PR/LC_MESSAGES/python.po
@@ -8,98 +8,108 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_PR\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +176,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,91 +327,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -370,35 +335,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/et/LC_MESSAGES/python.po b/lang/python/et/LC_MESSAGES/python.po
index 6d5c52a4f..4dfabe52a 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Madis Otenurm, 2019\n"
 "Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n"
@@ -21,89 +21,97 @@ msgstr ""
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Paigalda paketid."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Pakkide töötlemine (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Paigaldan ühe paketi."
+msgstr[1] "Paigaldan %(num)d paketti."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Eemaldan ühe paketi."
+msgstr[1] "Eemaldan %(num)d paketti."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -170,72 +178,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM-konfiguratsioonifaili ei saa kirjutada"
-
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM-konfiguratsioonifail {!s} puudub"
-
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM-konfiguratsioonifaili ei saa kirjutada"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM-konfiguratsioonifail {!s} puudub"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM-konfiguratsioonifaili ei saa kirjutada"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM-konfiguratsioonifail {!s} puudub"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM seadistamine ebaõnnestus"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM-konfiguratsioonifaili ei saa kirjutada"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM-konfiguratsioonifail {!s} puudub"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testiv python'i töö."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testiv python'i aste {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -281,91 +329,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Paigalda paketid."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Pakkide töötlemine (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Paigaldan ühe paketi."
-msgstr[1] "Paigaldan %(num)d paketti."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Eemaldan ühe paketi."
-msgstr[1] "Eemaldan %(num)d paketti."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -374,35 +337,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM-konfiguratsioonifaili ei saa kirjutada"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM-konfiguratsioonifail {!s} puudub"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM-konfiguratsioonifaili ei saa kirjutada"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM-konfiguratsioonifail {!s} puudub"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM-konfiguratsioonifaili ei saa kirjutada"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM-konfiguratsioonifail {!s} puudub"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM seadistamine ebaõnnestus"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM-konfiguratsioonifaili ei saa kirjutada"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM-konfiguratsioonifail {!s} puudub"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testiv python'i töö."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testiv python'i aste {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po
index 2ed956bce..c9c388fd3 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\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"
@@ -21,89 +21,97 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalatu paketeak"
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Paketeak prozesatzen (%(count)d/ %(total)d) "
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Pakete bat instalatzen."
+msgstr[1] "%(num)dpakete instalatzen."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Pakete bat kentzen."
+msgstr[1] "%(num)dpakete kentzen."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -170,73 +178,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Ezin da KDM konfigurazio fitxategia idatzi"
-
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM konfigurazio fitxategia {!s} ez da existitzen"
-
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Ezin da LXDM konfigurazio fitxategia idatzi"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM konfigurazio fitxategia {!s} ez da existitzen"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Ezin da LightDM konfigurazio fitxategia idatzi"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM konfigurazio fitxategia {!s} ez da existitzen"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Ezin da LightDM konfiguratu"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Ez dago LightDM harrera instalatua."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Ezin da SLIM konfigurazio fitxategia idatzi"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM konfigurazio fitxategia {!s} ez da existitzen"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
-"Ez da pantaila kudeatzailerik aukeratu pantaila-kudeatzaile modulurako."
 
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Pantaila kudeatzaile konfigurazioa osotu gabe"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python lana."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python urratsa {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -282,91 +329,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalatu paketeak"
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Paketeak prozesatzen (%(count)d/ %(total)d) "
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Pakete bat instalatzen."
-msgstr[1] "%(num)dpakete instalatzen."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Pakete bat kentzen."
-msgstr[1] "%(num)dpakete kentzen."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -375,35 +337,73 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Ezin da KDM konfigurazio fitxategia idatzi"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM konfigurazio fitxategia {!s} ez da existitzen"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Ezin da LXDM konfigurazio fitxategia idatzi"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM konfigurazio fitxategia {!s} ez da existitzen"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Ezin da LightDM konfigurazio fitxategia idatzi"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM konfigurazio fitxategia {!s} ez da existitzen"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Ezin da LightDM konfiguratu"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Ez dago LightDM harrera instalatua."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Ezin da SLIM konfigurazio fitxategia idatzi"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM konfigurazio fitxategia {!s} ez da existitzen"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+"Ez da pantaila kudeatzailerik aukeratu pantaila-kudeatzaile modulurako."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Pantaila kudeatzaile konfigurazioa osotu gabe"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python lana."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python urratsa {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po
index 73191019b..88111cffa 100644
--- a/lang/python/fa/LC_MESSAGES/python.po
+++ b/lang/python/fa/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Mahdy Mirzade , 2021\n"
 "Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n"
@@ -23,94 +23,104 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "در حال پیکربندی گراب."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "نصب بسته‌ها."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "در حال سوار کردن افرازها."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "در حال پردازش بسته‌ها (%(count)d/%(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "در حال نصب یک بسته."
+msgstr[1] "در حال نصب %(num)d بسته."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "در حال برداشتن یک بسته."
+msgstr[1] "در حال برداشتن %(num)d بسته."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "خطای مدیر بسته"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
+"مدیر بسته نتوانست برای بروزرسانی ها آماده شود، دستور 
{!s}
 با خطای"
+" {!s} مواجه شد."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
+"مدیر بسته نتوانست سامانه را بروز کند. دستور 
{!s}
 با خطای {!s} "
+"مواجه شد."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
+"مدیر بسته نتوانست تغییرات را برای نصب سامانه انجام دهد. دستور "
+"
{!s}
 با خطای {!s} مواجه شد."
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "در حال ذخیرهٔ پیکربندی شبکه."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "خطای پیکربندی"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "هیچ نقطهٔ اتّصال ریشه‌ای برای استفادهٔ 
{!s}
 داده نشده."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "پیکربندی mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "هیچ افرازی برای استفادهٔ 
{!s}
 تعریف نشده."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "درحال ایجاد initramfs با mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "در حال پیکربندی خدمات سیستم‌دی"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "شکست در اجرا mkinitfs روی هدف"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "نمی‌توان خدمت را دستکاری کرد"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "رمز خروج {} بود"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"فراخوانی systemctl {arg!s} در chroot رمز خطای {num!s} را "
-"برگرداند."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را به کار انداخت."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "نمی‌توان هدف سیستم‌دی {name!s} را به کار انداخت."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "نمی‌توان تایمر سیستم‌دی {name!s} را به کار انداخت."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را از کار انداخت."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "نمی‌توان واحد سیستم‌دی {name!s} را پوشاند."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"دستورات ناشناختهٔ سیستم‌دی {command!s} و "
-"{suffix!s} برای واحد {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "در حال پیکربندی خدمت dmcrypt OpenRC."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -176,75 +186,120 @@ msgstr "شکست در یافتن unsquashfs. مطمئن شوید بسته squash
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "مقصد {} در سامانهٔ هدف، یک شاخه نیست"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "نمی‌توان پروندهٔ پیکربندی KDM را نوشت"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "در حال پیکربندی خدمات سیستم‌دی"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "نمی‌توان خدمت را دستکاری کرد"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "نمی‌توان پروندهٔ پیکربندی LXDM را نوشت"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "نمی‌توان پروندهٔ پیکربندی LightDM را نوشت"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "نمی‌توان LightDM را پیکربندی کرد"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "هیچ خوش‌آمدگوی LightDMای نصب نشده."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "نمی‌توان پروندهٔ پیکربندی LightDM را نوشت"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "هیچ مدیر نمایشی برای پیمانهٔ displaymanager گزیده نشده."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"فهرست مدیریت صفحه نمایش ها خالی بوده یا در محل ذخیره داده و "
-"displaymanager.conf تعریف نشده است."
+"فراخوانی systemctl {arg!s} در chroot رمز خطای {num!s} را "
+"برگرداند."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "پیکربندی مدیر نمایش کامل نبود"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را به کار انداخت."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "پیکربندی mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "نمی‌توان هدف سیستم‌دی {name!s} را به کار انداخت."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "هیچ نقطهٔ اتّصال ریشه‌ای برای استفادهٔ 
{!s}
 داده نشده."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "نمی‌توان تایمر سیستم‌دی {name!s} را به کار انداخت."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "داده‌های نصب"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را از کار انداخت."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "نمی‌توان واحد سیستم‌دی {name!s} را پوشاند."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"دستورات ناشناختهٔ سیستم‌دی {command!s} و "
+"{suffix!s} برای واحد {name!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "کار پایتونی الکی."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "گام پایتونی الکی {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "نصب بارکنندهٔ راه‌اندازی."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "خطای نصب بوت لودر"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"بوت لودر نتوانست نصب شود. دستور 
{!s}
 برای نصب با خطای {!s} مواجه "
+"شد."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "پیکربندی مکانها"
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "در حال سوار کردن افرازها."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "در حال پیکربندی زمینهٔ پلی‌موث"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "در حال نوشتن fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"هیچ تنظیمات 
{!s}
 برای استفاده برای 
{!s}
 داده نشده است."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -296,99 +351,6 @@ msgid ""
 msgstr ""
 "مسیر برای سرویس {name!s} برابر {path!s} است، که وجود ندارد."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "در حال پیکربندی زمینهٔ پلی‌موث"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "نصب بسته‌ها."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "در حال پردازش بسته‌ها (%(count)d/%(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "در حال نصب یک بسته."
-msgstr[1] "در حال نصب %(num)d بسته."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "در حال برداشتن یک بسته."
-msgstr[1] "در حال برداشتن %(num)d بسته."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "خطای مدیر بسته"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"مدیر بسته نتوانست برای بروزرسانی ها آماده شود، دستور 
{!s}
 با خطای"
-" {!s} مواجه شد."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"مدیر بسته نتوانست سامانه را بروز کند. دستور 
{!s}
 با خطای {!s} "
-"مواجه شد."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"مدیر بسته نتوانست تغییرات را برای نصب سامانه انجام دهد. دستور "
-"
{!s}
 با خطای {!s} مواجه شد."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "نصب بارکنندهٔ راه‌اندازی."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "خطای نصب بوت لودر"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"بوت لودر نتوانست نصب شود. دستور 
{!s}
 برای نصب با خطای {!s} مواجه "
-"شد."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "در حال تنظیم ساعت سخت‌افزاری."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "درحال ایجاد initramfs با mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "شکست در اجرا mkinitfs روی هدف"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "رمز خروج {} بود"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "در حال ایجاد initramfs با dracut."
@@ -397,36 +359,74 @@ msgstr "در حال ایجاد initramfs با dracut."
 msgid "Failed to run dracut on the target"
 msgstr "شکست در اجرای dracut روی هدف"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "در حال پیکربندی گراب."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "نمی‌توان پروندهٔ پیکربندی KDM را نوشت"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "نمی‌توان پروندهٔ پیکربندی LXDM را نوشت"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "نمی‌توان پروندهٔ پیکربندی LightDM را نوشت"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "نمی‌توان LightDM را پیکربندی کرد"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "هیچ خوش‌آمدگوی LightDMای نصب نشده."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "نمی‌توان پروندهٔ پیکربندی LightDM را نوشت"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "هیچ مدیر نمایشی برای پیمانهٔ displaymanager گزیده نشده."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"فهرست مدیریت صفحه نمایش ها خالی بوده یا در محل ذخیره داده و "
+"displaymanager.conf تعریف نشده است."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "پیکربندی مدیر نمایش کامل نبود"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "در حال پیکربندی initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "در حال پیکربندی خدمت dmcrypt OpenRC."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "در حال تنظیم ساعت سخت‌افزاری."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "در حال نوشتن fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"هیچ تنظیمات 
{!s}
 برای استفاده برای 
{!s}
 داده نشده است."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "کار پایتونی الکی."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "گام پایتونی الکی {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "پیکربندی مکانها"
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "در حال ذخیرهٔ پیکربندی شبکه."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "داده‌های نصب"
diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po
index e621334f8..4c4e26489 100644
--- a/lang/python/fi_FI/LC_MESSAGES/python.po
+++ b/lang/python/fi_FI/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Jiri Grönroos , 2022\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n"
@@ -22,92 +22,104 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Määritä GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Asenna paketit."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Liitetään osioita."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Käsitellään paketteja (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Sisäinen virhe liitettäessä zfs-tietojoukkoa"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Asennetaan yhtä pakettia."
+msgstr[1] "Asennetaan %(num)d pakettia."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Zpoolin tuonti epäonnistui"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Poistetaan yhtä pakettia."
+msgstr[1] "Poistetaan %(num)d pakettia."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Zpoolin lukituksen avaaminen epäonnistui"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Paketinhallinnan virhe"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Määritys zfs-liitospisteen epäonnistui"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Paketinhallinta ei voinut valmistella päivityksiä. Komento 
{!s}
 "
+"palautti virhekoodin {!s}."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Paketinhallinta ei voinut päivittää järjestelmää. Komento 
{!s}
 "
+"palautti virhekoodin {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Paketinhallinta ei voinut tehdä muutoksia asennettuun järjestelmään. Komento"
+" 
{!s}
 palautti virhekoodin {!s}."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Tallennetaan verkon määrityksiä."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Määritysvirhe"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Kohteelle 
{!s}
 ei ole annettu juuriliitospistettä."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Määritetään mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Osioita ei ole määritetty käytettäväksi kohteelle 
{!s}
 ."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs-liitosvirhe"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Luodaan initramfs mkinitfs:llä."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Määritä systemd-palvelut"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "mkinitfs:n suorittaminen kohteessa epäonnistui"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Palvelua ei voi muokata"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Poistumiskoodi oli {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "systemctl {arg!s} chroot palautti virhe koodin {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Systemd-palvelua {name!s} ei voi ottaa käyttöön."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Systemd-kohdetta {name!s} ei voi ottaa käyttöön."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "Systemd-ajastinta {name!s} ei voi ottaa käyttöön."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Systemd-kohdetta {name!s} ei voi poistaa käytöstä."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Ei voi peittää systemd-yksikköä {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Tuntemattomia systemd-komentoja {command!s} ja "
-"{suffix!s} yksikölle {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Määritetään OpenRC:n dmcrypt-palvelua."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -175,75 +187,120 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Kohdejärjestelmän kohde \"{}\"  ei ole hakemisto"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM-määritystiedostoa ei voi kirjoittaa"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Määritä systemd-palvelut"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM-määritystiedostoa {!s} ei ole olemassa"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Palvelua ei voi muokata"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM-määritystiedostoa ei voi kirjoittaa"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM-määritystiedostoa {!s} ei ole olemassa"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM-määritystiedostoa ei voi kirjoittaa"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM-määritystiedostoa {!s} ei ole olemassa"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM-määritysvirhe"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM:ää ei ole asennettu."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM-määritystiedostoa ei voi kirjoittaa"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM-määritystiedostoa {!s} ei ole olemassa"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Displaymanager-moduulia varten ei ole valittu näytönhallintaa."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "systemctl {arg!s} chroot palautti virhe koodin {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Systemd-palvelua {name!s} ei voi ottaa käyttöön."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Systemd-kohdetta {name!s} ei voi ottaa käyttöön."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "Systemd-ajastinta {name!s} ei voi ottaa käyttöön."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Systemd-kohdetta {name!s} ei voi poistaa käytöstä."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Ei voi peittää systemd-yksikköä {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Luettelo on tyhjä tai määrittelemätön, sekä globalstorage, että "
-"displaymanager.conf tiedostossa."
+"Tuntemattomia systemd-komentoja {command!s} ja "
+"{suffix!s} yksikölle {name!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Näytönhallinnan kokoonpano oli puutteellinen"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy-mallinen python-työ."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Määritetään mkinitcpio."
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy-mallinen python-vaihe {}"
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Kohteelle 
{!s}
 ei ole annettu juuriliitospistettä."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Asenna käynnistyslatain."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Asennetaan tietoja."
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Grubin asennus epäonnistui, yleisessä levytilassa ei ole määritetty osioita"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Käynnistyslataimen asennusvirhe"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Käynnistyslatainta ei voitu asentaa. Asennuskomento 
{!s}
 palautti"
+" virhekoodin {!s}."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Määritetään maa-asetuksia."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Liitetään osioita."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Sisäinen virhe liitettäessä zfs-tietojoukkoa"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Zpoolin tuonti epäonnistui"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Zpoolin lukituksen avaaminen epäonnistui"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Määritys zfs-liitospisteen epäonnistui"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs-liitosvirhe"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Määritä Plymouthin teema"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Kirjoitetaan fstabiin."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"\"
{!s}
\"-määritystä ei ole annettu käytettäväksi kohteelle "
+"
{!s}
."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -292,100 +349,6 @@ msgid ""
 msgstr ""
 "Palvelun polku {name!s} on {path!s},  jota ei ole olemassa."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Määritä Plymouthin teema"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Asenna paketit."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Käsitellään paketteja (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Asennetaan yhtä pakettia."
-msgstr[1] "Asennetaan %(num)d pakettia."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Poistetaan yhtä pakettia."
-msgstr[1] "Poistetaan %(num)d pakettia."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Paketinhallinnan virhe"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Paketinhallinta ei voinut valmistella päivityksiä. Komento 
{!s}
 "
-"palautti virhekoodin {!s}."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Paketinhallinta ei voinut päivittää järjestelmää. Komento 
{!s}
 "
-"palautti virhekoodin {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Paketinhallinta ei voinut tehdä muutoksia asennettuun järjestelmään. Komento"
-" 
{!s}
 palautti virhekoodin {!s}."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Asenna käynnistyslatain."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Grubin asennus epäonnistui, yleisessä levytilassa ei ole määritetty osioita"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Käynnistyslataimen asennusvirhe"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Käynnistyslatainta ei voitu asentaa. Asennuskomento 
{!s}
 palautti"
-" virhekoodin {!s}."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Asetetaan laitteiston kelloa."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Luodaan initramfs mkinitfs:llä."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "mkinitfs:n suorittaminen kohteessa epäonnistui"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Poistumiskoodi oli {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Luodaan initramfs:ää dracutilla."
@@ -394,37 +357,74 @@ msgstr "Luodaan initramfs:ää dracutilla."
 msgid "Failed to run dracut on the target"
 msgstr "Dracutin suorittaminen kohteessa ei onnistunut"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Määritä GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM-määritystiedostoa ei voi kirjoittaa"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM-määritystiedostoa {!s} ei ole olemassa"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM-määritystiedostoa ei voi kirjoittaa"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM-määritystiedostoa {!s} ei ole olemassa"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM-määritystiedostoa ei voi kirjoittaa"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM-määritystiedostoa {!s} ei ole olemassa"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM-määritysvirhe"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM:ää ei ole asennettu."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM-määritystiedostoa ei voi kirjoittaa"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM-määritystiedostoa {!s} ei ole olemassa"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Displaymanager-moduulia varten ei ole valittu näytönhallintaa."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Luettelo on tyhjä tai määrittelemätön, sekä globalstorage, että "
+"displaymanager.conf tiedostossa."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Näytönhallinnan kokoonpano oli puutteellinen"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Määritetään initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Määritetään OpenRC:n dmcrypt-palvelua."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Asetetaan laitteiston kelloa."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Kirjoitetaan fstabiin."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"\"
{!s}
\"-määritystä ei ole annettu käytettäväksi kohteelle "
-"
{!s}
."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy-mallinen python-työ."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy-mallinen python-vaihe {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Määritetään maa-asetuksia."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Tallennetaan verkon määrityksiä."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Asennetaan tietoja."
diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po
index 4f9188073..e51a050e3 100644
--- a/lang/python/fr/LC_MESSAGES/python.po
+++ b/lang/python/fr/LC_MESSAGES/python.po
@@ -6,118 +6,126 @@
 # Translators:
 # Paul Combal , 2017
 # Abdellah B , 2017
-# Aestan , 2018
 # Aurnytoraink , 2018
 # a270031086f2a0d3514bc0cb507b48f6, 2019
 # Seboss666 , 2019
 # Florian B , 2019
 # Arnaud Ferraris , 2019
 # roxfr , 2021
+# Aestan , 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: roxfr , 2021\n"
+"Last-Translator: Aestan , 2022\n"
 "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configuration du GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Installer les paquets."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montage des partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Traitement des paquets (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installation d'un paquet."
+msgstr[1] "Installation de %(num)d paquets."
+msgstr[2] "Installation de %(num)d paquets."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Suppression d'un paquet."
+msgstr[1] "Suppression de %(num)d paquets."
+msgstr[2] "Suppression de %(num)d paquets."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Sauvegarde de la configuration du réseau en cours."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Erreur de configuration"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"Aucun point de montage racine n'a été donné pour être utilisé par "
+"
{!s}
."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configuration de mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 "Aucune partition n'est définie pour être utilisée par 
{!s}
."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Création d'initramfs avec mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurer les services systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Échec de l'exécution de mkinitfs sur la cible"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Impossible de modifier le service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Le code de sortie était {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"L'appel systemctl {arg!s} en chroot a renvoyé le code d'erreur "
-"{num!s}"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Impossible d'activer le service systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Impossible d'activer la cible systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Impossible de désactiver la cible systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Impossible de masquer l'unit systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Commandes systemd {command!s} et {suffix!s} "
-"inconnues pour l'unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configuration du service OpenRC dmcrypt."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -185,79 +193,117 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "La destination \"{}\" dans le système cible n'est pas un répertoire"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Impossible d'écrire le fichier de configuration KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurer les services systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Le fichier de configuration KDM n'existe pas"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Impossible de modifier le service"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Impossible d'écrire le fichier de configuration LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Le fichier de configuration LXDM n'existe pas"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Impossible d'écrire le fichier de configuration LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Le fichier de configuration LightDM {!S} n'existe pas"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Impossible de configurer LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Aucun hôte LightDM est installé"
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Impossible d'écrire le fichier de configuration SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Le fichier de configuration SLIM {!S} n'existe pas"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-"Aucun gestionnaire d'affichage n'a été sélectionné pour le module de "
-"gestionnaire d'affichage"
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"La liste des gestionnaires d'affichage est vide ou indéfinie à la fois dans "
-"globalstorage et displaymanager.conf."
+"L'appel systemctl {arg!s} en chroot a renvoyé le code d'erreur "
+"{num!s}"
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "La configuration du gestionnaire d'affichage était incomplète"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Impossible d'activer le service systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configuration de mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Impossible d'activer la cible systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
-"Aucun point de montage racine n'a été donné pour être utilisé par "
-"
{!s}
."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installation de données."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Impossible de désactiver la cible systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impossible de masquer l'unit systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Commandes systemd {command!s} et {suffix!s} "
+"inconnues pour l'unit {name!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tâche factice de python"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Étape factice de python {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installation du bootloader."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Configuration des locales."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montage des partitions."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurer le thème Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Écriture du fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -310,91 +356,6 @@ msgstr ""
 "Le chemin pour le service {name!s} est {path!s}, qui n'existe "
 "pas."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurer le thème Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Installer les paquets."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Traitement des paquets (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installation d'un paquet."
-msgstr[1] "Installation de %(num)d paquets."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Suppression d'un paquet."
-msgstr[1] "Suppression de %(num)d paquets."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installation du bootloader."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configuration de l'horloge matériel."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Création d'initramfs avec mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Échec de l'exécution de mkinitfs sur la cible"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Le code de sortie était {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Configuration du initramfs avec dracut."
@@ -403,35 +364,76 @@ msgstr "Configuration du initramfs avec dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Erreur d'exécution de dracut sur la cible."
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configuration du GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Impossible d'écrire le fichier de configuration KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Le fichier de configuration KDM n'existe pas"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Impossible d'écrire le fichier de configuration LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Le fichier de configuration LXDM n'existe pas"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Impossible d'écrire le fichier de configuration LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Le fichier de configuration LightDM {!S} n'existe pas"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Impossible de configurer LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Aucun hôte LightDM est installé"
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Impossible d'écrire le fichier de configuration SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Le fichier de configuration SLIM {!S} n'existe pas"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+"Aucun gestionnaire d'affichage n'a été sélectionné pour le module de "
+"gestionnaire d'affichage"
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"La liste des gestionnaires d'affichage est vide ou indéfinie à la fois dans "
+"globalstorage et displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "La configuration du gestionnaire d'affichage était incomplète"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Configuration du initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuration du service OpenRC dmcrypt."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configuration de l'horloge matériel."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Écriture du fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tâche factice de python"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Étape factice de python {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Configuration des locales."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Sauvegarde de la configuration du réseau en cours."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installation de données."
diff --git a/lang/python/fur/LC_MESSAGES/python.po b/lang/python/fur/LC_MESSAGES/python.po
index 40d242512..fe1c9b56d 100644
--- a/lang/python/fur/LC_MESSAGES/python.po
+++ b/lang/python/fur/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Fabio Tomat , 2020\n"
 "Language-Team: Friulian (https://www.transifex.com/calamares/teams/20061/fur/)\n"
@@ -21,95 +21,99 @@ msgstr ""
 "Language: fur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instale pachets."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montaç des partizions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Elaborazion dai pachets (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Daûr a instalâ un pachet."
+msgstr[1] "Daûr a instalâ %(num)d pachets."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Daûr a gjavâ un pachet."
+msgstr[1] "Daûr a gjavâ %(num)d pachets."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Salvament de configurazion di rêt."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Erôr di configurazion"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"Nol è stât indicât nissun pont di montaç di doprâ par 
{!s}
."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Daûr a configurâ di mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "No je stade definide nissune partizion di doprâ par 
{!s}
."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Daûr a creâ il initramfs cun mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configure i servizis di systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "No si è rivâts a eseguî mkinitfs su la destinazion"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Impussibil modificâ il servizi"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Il codiç di jessude al jere {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La clamade systemctl {arg!s} in chroot e à tornât il codiç di "
-"erôr {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Impussibil abilitâ il servizi di systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Impussibil abilitâ la destinazion di systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-"Impussibil disabilitâ la destinazion di systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Impussibil mascarâ la unitât di systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Comants di systemd {command!s} e {suffix!s} no "
-"cognossûts pe unitât {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Daûr a configurâ il servizi dmcrypt di OpenRC."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -175,76 +179,118 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "La destinazion \"{}\" tal sisteme che si va a creâ no je une cartele"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Impussibil scrivi il file di configurazion di KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configure i servizis di systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Il file di configurazion di KDM {!s} nol esist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Impussibil modificâ il servizi"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Impussibil scrivi il file di configurazion di LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Il file di configurazion di LXDM {!s} nol esist"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Impussibil scrivi il file di configurazion di LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Il file di configurazion di LightDM {!s} nol esist"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Impussibil configurâ LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nissun menù di benvignût par LightDM instalât."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Impussibil scrivi il file di configurazion SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Il file di configurazion di SLIM {!s} nol esist"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Nissun gjestôr di visôrs selezionât pal modul displaymanager."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"La liste dai gjestôrs di visôrs e je vueide o no je definide sedi in "
-"globalstorage che in displaymanager.conf."
+"La clamade systemctl {arg!s} in chroot e à tornât il codiç di "
+"erôr {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "La configurazion dal gjestôr dai visôrs no jere complete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Impussibil abilitâ il servizi di systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Daûr a configurâ di mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Impussibil abilitâ la destinazion di systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
-"Nol è stât indicât nissun pont di montaç di doprâ par 
{!s}
."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Daûr a instalâ i dâts."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"Impussibil disabilitâ la destinazion di systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impussibil mascarâ la unitât di systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Comants di systemd {command!s} e {suffix!s} no "
+"cognossûts pe unitât {name!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Lavôr di python pustiç."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Passaç di python pustiç {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instale il bootloader."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Daûr a configurâ la localizazion."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montaç des partizions."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configure il teme di Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Daûr a scrivi fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -295,91 +341,6 @@ msgid ""
 msgstr ""
 "Il percors pal servizi {name!s} al è {path!s}, che nol esist."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configure il teme di Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instale pachets."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Elaborazion dai pachets (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Daûr a instalâ un pachet."
-msgstr[1] "Daûr a instalâ %(num)d pachets."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Daûr a gjavâ un pachet."
-msgstr[1] "Daûr a gjavâ %(num)d pachets."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instale il bootloader."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Daûr a configurâ l'orloi hardware."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Daûr a creâ il initramfs cun mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "No si è rivâts a eseguî mkinitfs su la destinazion"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Il codiç di jessude al jere {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Daûr a creâ initramfs cun dracut."
@@ -388,35 +349,74 @@ msgstr "Daûr a creâ initramfs cun dracut."
 msgid "Failed to run dracut on the target"
 msgstr "No si è rivâts a eseguî dracut su la destinazion"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configure GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Impussibil scrivi il file di configurazion di KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Il file di configurazion di KDM {!s} nol esist"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Impussibil scrivi il file di configurazion di LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Il file di configurazion di LXDM {!s} nol esist"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Impussibil scrivi il file di configurazion di LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Il file di configurazion di LightDM {!s} nol esist"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Impussibil configurâ LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nissun menù di benvignût par LightDM instalât."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Impussibil scrivi il file di configurazion SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Il file di configurazion di SLIM {!s} nol esist"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Nissun gjestôr di visôrs selezionât pal modul displaymanager."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"La liste dai gjestôrs di visôrs e je vueide o no je definide sedi in "
+"globalstorage che in displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "La configurazion dal gjestôr dai visôrs no jere complete"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Daûr a configurâ initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Daûr a configurâ il servizi dmcrypt di OpenRC."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Daûr a configurâ l'orloi hardware."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Daûr a scrivi fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Lavôr di python pustiç."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Passaç di python pustiç {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Daûr a configurâ la localizazion."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Salvament de configurazion di rêt."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Daûr a instalâ i dâts."
diff --git a/lang/python/gl/LC_MESSAGES/python.po b/lang/python/gl/LC_MESSAGES/python.po
index 51c1bc795..90d46d053 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\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"
@@ -21,89 +21,97 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalar paquetes."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "A procesar paquetes  (%(count)d/%(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "A instalar un paquete."
+msgstr[1] "A instalar %(num)d paquetes."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "A retirar un paquete."
+msgstr[1] "A retirar %(num)d paquetes."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -170,73 +178,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Non é posíbel escribir o ficheiro de configuración de KDM"
-
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "O ficheiro de configuración de KDM {!s} non existe"
-
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Non é posíbel escribir o ficheiro de configuración de LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "O ficheiro de configuración de LXDM {!s} non existe"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Non é posíbel escribir o ficheiro de configuración de LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "O ficheiro de configuración de LightDM {!s} non existe"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Non é posíbel configurar LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Non se instalou o saudador de LightDM."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Non é posíbel escribir o ficheiro de configuración de SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "O ficheiro de configuración de SLIM {!s} non existe"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
-"Non hai xestores de pantalla seleccionados para o módulo displaymanager."
 
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "A configuración do xestor de pantalla foi incompleta"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa parva de python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso parvo de python {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -282,91 +329,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalar paquetes."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "A procesar paquetes  (%(count)d/%(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "A instalar un paquete."
-msgstr[1] "A instalar %(num)d paquetes."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "A retirar un paquete."
-msgstr[1] "A retirar %(num)d paquetes."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -375,35 +337,73 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Non é posíbel escribir o ficheiro de configuración de KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "O ficheiro de configuración de KDM {!s} non existe"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Non é posíbel escribir o ficheiro de configuración de LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "O ficheiro de configuración de LXDM {!s} non existe"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Non é posíbel escribir o ficheiro de configuración de LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "O ficheiro de configuración de LightDM {!s} non existe"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Non é posíbel configurar LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Non se instalou o saudador de LightDM."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Non é posíbel escribir o ficheiro de configuración de SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "O ficheiro de configuración de SLIM {!s} non existe"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+"Non hai xestores de pantalla seleccionados para o módulo displaymanager."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "A configuración do xestor de pantalla foi incompleta"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa parva de python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso parvo de python {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po
index 32fe90fc3..873b44cc5 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\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"
@@ -17,89 +17,97 @@ msgstr ""
 "Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +174,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,91 +325,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -370,35 +333,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po
index a8afc0fc7..9b74ec228 100644
--- a/lang/python/he/LC_MESSAGES/python.po
+++ b/lang/python/he/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Yaron Shahrabani , 2022\n"
 "Language-Team: Hebrew (https://www.transifex.com/calamares/teams/20061/he/)\n"
@@ -23,95 +23,108 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "הגדרת GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "התקנת חבילות."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "מחיצות מעוגנות."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "החבילות מעובדות (%(count)d/%(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "שגיאה פנימית בעיגון סדרות נתונים של zfs"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "מותקנת חבילה אחת."
+msgstr[1] "מותקנות %(num)d חבילות."
+msgstr[2] "מותקנות %(num)d חבילות."
+msgstr[3] "מותקנות %(num)d חבילות."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "ייבוא zpool נכשל"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "מתבצעת הסרה של חבילה אחת."
+msgstr[1] "מתבצעת הסרה של %(num)d חבילות."
+msgstr[2] "מתבצעת הסרה של %(num)d חבילות."
+msgstr[3] "מתבצעת הסרה של %(num)d חבילות."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "שחרור zpool נכשל"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "שגיאת מנהל חבילות"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "הגדרת נקודת עיגון של zfs נכשלה"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"מנהל החבילות לא הצליח להכין את העדכונים. הפקודה 
{!s}
 החזירה את "
+"קוד השגיאה {!s}."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"מנהל החבילות לא הצליח לעדכן את המערכת. הפקודה 
{!s}
 החזירה את קוד "
+"השגיאה {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"מנהל החבילות לא הצליח לערוך שינויים במערכת המותקנת. הפקודה 
{!s}
 "
+"החזירה את קוד השגיאה {!s}."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "הגדרות הרשת נשמרות."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "שגיאת הגדרות"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "לא סופקה נקודת עגינת שורש לשימוש של 
{!s}
."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio מותקן."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "לא הוגדרו מחיצות לשימוש של 
{!s}
."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "שגיאת עיגון zfs"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "initramfs נוצר בעזרת mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "הגדרת שירותי systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "הרצת mkinitfs על היעד נכשלה"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "לא ניתן לשנות את השירות"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "קוד היציאה היה {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} הקריאה ב־chroot החזירה את קוד השגיאה {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "לא ניתן להפעיל את השירות הבא של systemd:‏ {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "לא ניתן להפעיל את היעד של systemd בשם {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-"לא ניתן להפעיל את המתזמן ב־systemd בשם "
-"{name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "לא ניתן להשבית את היעד של systemd בשם  {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "לא ניתן למסך את היחידה של systemd בשם  {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"פקודות לא ידועות של systemd‏ {command!s} "
-"ו־{suffix!s} עבור היחידה {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "שירות dmcrypt ל־OpenRC מוגדר."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -179,75 +192,120 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "היעד „{}” במערכת הקבצים המיועדת אינו תיקייה"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "לא ניתן לכתוב את קובץ התצורה של KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "הגדרת שירותי systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "קובץ התצורה של KDM ‏{!s} אינו קיים"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "לא ניתן לשנות את השירות"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "לא ניתן לכתוב את קובץ התצורה של LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "קובץ התצורה של LXDM ‏{!s} אינו קיים"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "לא ניתן לכתוב את קובץ התצורה של LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "קובץ התצורה של LightDM ‏{!s} אינו קיים"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "לא ניתן להגדיר את LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "לא מותקן מקבל פנים מסוג LightDM."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "לא ניתן לכתוב קובץ תצורה של SLIM."
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "קובץ התצורה {!s} של SLIM אינו קיים"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "לא נבחרו מנהלי תצוגה למודול displaymanager."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"רשימת מנהלי התצוגה ריקה או שאינה מוגדרת גם באחסון הכללי (globalstorage) וגם "
-"ב־displaymanager.conf."
+"systemctl {arg!s} הקריאה ב־chroot החזירה את קוד השגיאה {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "תצורת מנהל התצוגה אינה שלמה"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "לא ניתן להפעיל את השירות הבא של systemd:‏ {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio מותקן."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "לא ניתן להפעיל את היעד של systemd בשם {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "לא סופקה נקודת עגינת שורש לשימוש של 
{!s}
."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+"לא ניתן להפעיל את המתזמן ב־systemd בשם "
+"{name!s}."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "הנתונים מותקנים."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "לא ניתן להשבית את היעד של systemd בשם  {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "לא ניתן למסך את היחידה של systemd בשם  {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"פקודות לא ידועות של systemd‏ {command!s} "
+"ו־{suffix!s} עבור היחידה {name!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "משימת דמה של Python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "צעד דמה של Python {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "התקנת מנהל אתחול."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "ההתקנה של grub נכשלה, לא הוגדרו מחיצות באחסון הכללי"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "שגיאת התקנת מנהל אתחול"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"לא ניתן להתקין את מנהל האתחול. פקודת ההתקנה 
{!s}
 החזירה את קוד "
+"השגיאה {!s}."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "השפות מוגדרות."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "מחיצות מעוגנות."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "שגיאה פנימית בעיגון סדרות נתונים של zfs"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "ייבוא zpool נכשל"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "שחרור zpool נכשל"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "הגדרת נקודת עיגון של zfs נכשלה"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "שגיאת עיגון zfs"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "הגדרת ערכת עיצוב של Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab נכתב."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr "לא סופקה תצורת 
{!s}
 לשימוש 
{!s}
."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -297,103 +355,6 @@ msgid ""
 "exist."
 msgstr "הנתיב לשירות {name!s} הוא {path!s}, שאינו קיים."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "הגדרת ערכת עיצוב של Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "התקנת חבילות."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "החבילות מעובדות (%(count)d/%(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "מותקנת חבילה אחת."
-msgstr[1] "מותקנות %(num)d חבילות."
-msgstr[2] "מותקנות %(num)d חבילות."
-msgstr[3] "מותקנות %(num)d חבילות."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "מתבצעת הסרה של חבילה אחת."
-msgstr[1] "מתבצעת הסרה של %(num)d חבילות."
-msgstr[2] "מתבצעת הסרה של %(num)d חבילות."
-msgstr[3] "מתבצעת הסרה של %(num)d חבילות."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "שגיאת מנהל חבילות"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"מנהל החבילות לא הצליח להכין את העדכונים. הפקודה 
{!s}
 החזירה את "
-"קוד השגיאה {!s}."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"מנהל החבילות לא הצליח לעדכן את המערכת. הפקודה 
{!s}
 החזירה את קוד "
-"השגיאה {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"מנהל החבילות לא הצליח לערוך שינויים במערכת המותקנת. הפקודה 
{!s}
 "
-"החזירה את קוד השגיאה {!s}."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "התקנת מנהל אתחול."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "ההתקנה של grub נכשלה, לא הוגדרו מחיצות באחסון הכללי"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "שגיאת התקנת מנהל אתחול"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"לא ניתן להתקין את מנהל האתחול. פקודת ההתקנה 
{!s}
 החזירה את קוד "
-"השגיאה {!s}."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "שעון החומרה מוגדר."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "initramfs נוצר בעזרת mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "הרצת mkinitfs על היעד נכשלה"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "קוד היציאה היה {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "נוצר initramfs עם dracut."
@@ -402,35 +363,74 @@ msgstr "נוצר initramfs עם dracut."
 msgid "Failed to run dracut on the target"
 msgstr "הרצת dracut על היעד נכשלה"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "הגדרת GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "לא ניתן לכתוב את קובץ התצורה של KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "קובץ התצורה של KDM ‏{!s} אינו קיים"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "לא ניתן לכתוב את קובץ התצורה של LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "קובץ התצורה של LXDM ‏{!s} אינו קיים"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "לא ניתן לכתוב את קובץ התצורה של LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "קובץ התצורה של LightDM ‏{!s} אינו קיים"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "לא ניתן להגדיר את LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "לא מותקן מקבל פנים מסוג LightDM."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "לא ניתן לכתוב קובץ תצורה של SLIM."
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "קובץ התצורה {!s} של SLIM אינו קיים"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "לא נבחרו מנהלי תצוגה למודול displaymanager."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"רשימת מנהלי התצוגה ריקה או שאינה מוגדרת גם באחסון הכללי (globalstorage) וגם "
+"ב־displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "תצורת מנהל התצוגה אינה שלמה"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "initramfs מוגדר."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "שירות dmcrypt ל־OpenRC מוגדר."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "שעון החומרה מוגדר."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab נכתב."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr "לא סופקה תצורת 
{!s}
 לשימוש 
{!s}
."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "משימת דמה של Python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "צעד דמה של Python {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "השפות מוגדרות."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "הגדרות הרשת נשמרות."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "הנתונים מותקנים."
diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po
index bc27e2002..1de7c2b87 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Panwar108 , 2022\n"
 "Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n"
@@ -21,92 +21,105 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB विन्यस्त करना।"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "पैकेज इंस्टॉल करना।"
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "विभाजन माउंट करना।"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "पैकेज (%(count)d / %(total)d) संसाधित किए जा रहे हैं"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "zfs डेटासेट माउंट करते समय आंतरिक त्रुटि"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "एक पैकेज इंस्टॉल किया जा रहा है।"
+msgstr[1] "%(num)d पैकेज इंस्टॉल किए जा रहे हैं।"
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "zpool आयात विफल"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "एक पैकेज हटाया जा रहा है।"
+msgstr[1] "%(num)d पैकेज हटाए जा रहे हैं।"
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "zpool अनलॉक करना विफल"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "पैकेज प्रबंधक त्रुटि"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "zfs माउंट पॉइंट निर्धारण विफल"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"पैकेज प्रबंधक द्वारा अपडेट तैयार करना विफल। कमांड 
{!s}
 हेतु "
+"त्रुटि कोड {!s} प्राप्त।"
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"पैकेज प्रबंधक द्वारा सिस्टम अपडेट करना विफल। कमांड 
{!s}
 हेतु "
+"त्रुटि कोड {!s} प्राप्त।"
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"पैकेज प्रबंधक द्वारा इंस्टॉल हो रखें सिस्टम पर परिवर्तन करना विफल। कमांड "
+"
{!s}
 हेतु त्रुटि कोड {!s} प्राप्त।"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "नेटवर्क विन्यास सेटिंग्स संचित करना।"
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "विन्यास त्रुटि"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"
{!s}
 के उपयोग हेतु कोई रुट माउंट पॉइंट प्रदान नहीं किया गया।"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio को विन्यस्त करना।"
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "
{!s}
 के उपयोग हेतु कोई विभाजन परिभाषित नहीं हैं।"
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs माउंट संबंधी त्रुटि"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs के साथ initramfs बनाना।"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd सेवाएँ विन्यस्त करना"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "लक्ष्य पर mkinitfs निष्पादन विफल"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "सेवा को संशोधित नहीं किया जा सकता"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "त्रुटि कोड  {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot में systemctl {arg!s} कॉल त्रुटि कोड {num!s}।"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "systemd सेवा {name!s} को सक्रिय नहीं किया जा सकता।"
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd लक्ष्य {name!s}सक्रिय करना विफल।"
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "systemd टाइमर {name!s}सक्रिय करना विफल।"
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd लक्ष्य {name!s} निष्क्रिय करना विफल।"
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd यूनिट {name!s} को मास्क नहीं किया जा सकता।"
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"यूनिट {name!s} हेतु अज्ञात systemd कमांड {command!s} व "
-"{suffix!s}।"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt सेवा विन्यस्त करना।"
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -174,76 +187,119 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "लक्षित सिस्टम में \"{}\" स्थान कोई डायरेक्टरी नहीं है"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM विन्यास फ़ाइल राइट नहीं की जा सकती"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd सेवाएँ विन्यस्त करना"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM विन्यास फ़ाइल {!s} मौजूद नहीं है"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "सेवा को संशोधित नहीं किया जा सकता"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM विन्यास फ़ाइल राइट नहीं की जा सकती"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM विन्यास फ़ाइल {!s} मौजूद नहीं है"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM विन्यास फ़ाइल राइट नहीं की जा सकती"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM विन्यास फ़ाइल {!s} मौजूद नहीं है"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM को विन्यस्त नहीं किया जा सकता"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "कोई LightDM लॉगिन स्क्रीन इंस्टॉल नहीं है।"
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM विन्यास फ़ाइल राइट नहीं की जा सकती"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM विन्यास फ़ाइल {!s} मौजूद नहीं है"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "चयनित डिस्प्ले प्रबंधक मॉड्यूल हेतु कोई डिस्प्ले प्रबंधक नहीं मिला।"
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot में systemctl {arg!s} कॉल त्रुटि कोड {num!s}।"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "systemd सेवा {name!s} को सक्रिय नहीं किया जा सकता।"
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd लक्ष्य {name!s}सक्रिय करना विफल।"
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "systemd टाइमर {name!s}सक्रिय करना विफल।"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd लक्ष्य {name!s} निष्क्रिय करना विफल।"
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd यूनिट {name!s} को मास्क नहीं किया जा सकता।"
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"globalstorage व displaymanager.conf में डिस्प्ले प्रबंधक सूची रिक्त या "
-"अपरिभाषित है।"
+"यूनिट {name!s} हेतु अज्ञात systemd कमांड {command!s} व "
+"{suffix!s}।"
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "डिस्प्ले प्रबंधक विन्यास अधूरा था"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "डमी पाइथन प्रक्रिया ।"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio को विन्यस्त करना।"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "डमी पाइथन प्रक्रिया की चरण संख्या {}"
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "बूट लोडर इंस्टॉल करना।"
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "grub इंस्टॉल करना विफल, सर्वत्र संचयन में कोई विभाजन परिभाषित नहीं है"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "बूट लोडर इंस्टॉल त्रुटि"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
-"
{!s}
 के उपयोग हेतु कोई रुट माउंट पॉइंट प्रदान नहीं किया गया।"
+"बूट लोडर इंस्टॉल करना विफल। इंस्टॉल कमांड 
{!s}
 हेतु त्रुटि कोड "
+"{!s} प्राप्त।"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "डाटा इंस्टॉल करना।"
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "स्थानिकी को विन्यस्त करना।"
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "विभाजन माउंट करना।"
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "zfs डेटासेट माउंट करते समय आंतरिक त्रुटि"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "zpool आयात विफल"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "zpool अनलॉक करना विफल"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "zfs माउंट पॉइंट निर्धारण विफल"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs माउंट संबंधी त्रुटि"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth थीम विन्यस्त करना "
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab पर राइट करना।"
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"कोई 
{!s}
 विन्यास प्रदान नहीं किया गया 
{!s}
 के उपयोग "
+"हेतु।"
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -291,99 +347,6 @@ msgid ""
 "exist."
 msgstr "सेवा {name!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth थीम विन्यस्त करना "
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "पैकेज इंस्टॉल करना।"
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "पैकेज (%(count)d / %(total)d) संसाधित किए जा रहे हैं"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "एक पैकेज इंस्टॉल किया जा रहा है।"
-msgstr[1] "%(num)d पैकेज इंस्टॉल किए जा रहे हैं।"
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "एक पैकेज हटाया जा रहा है।"
-msgstr[1] "%(num)d पैकेज हटाए जा रहे हैं।"
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "पैकेज प्रबंधक त्रुटि"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"पैकेज प्रबंधक द्वारा अपडेट तैयार करना विफल। कमांड 
{!s}
 हेतु "
-"त्रुटि कोड {!s} प्राप्त।"
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"पैकेज प्रबंधक द्वारा सिस्टम अपडेट करना विफल। कमांड 
{!s}
 हेतु "
-"त्रुटि कोड {!s} प्राप्त।"
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"पैकेज प्रबंधक द्वारा इंस्टॉल हो रखें सिस्टम पर परिवर्तन करना विफल। कमांड "
-"
{!s}
 हेतु त्रुटि कोड {!s} प्राप्त।"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "बूट लोडर इंस्टॉल करना।"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "grub इंस्टॉल करना विफल, सर्वत्र संचयन में कोई विभाजन परिभाषित नहीं है"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "बूट लोडर इंस्टॉल त्रुटि"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"बूट लोडर इंस्टॉल करना विफल। इंस्टॉल कमांड 
{!s}
 हेतु त्रुटि कोड "
-"{!s} प्राप्त।"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "हार्डवेयर घड़ी सेट करना।"
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs के साथ initramfs बनाना।"
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "लक्ष्य पर mkinitfs निष्पादन विफल"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "त्रुटि कोड  {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "dracut के साथ initramfs बनाना।"
@@ -392,37 +355,74 @@ msgstr "dracut के साथ initramfs बनाना।"
 msgid "Failed to run dracut on the target"
 msgstr "लक्ष्य पर dracut निष्पादन विफल"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB विन्यस्त करना।"
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM विन्यास फ़ाइल राइट नहीं की जा सकती"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM विन्यास फ़ाइल {!s} मौजूद नहीं है"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM विन्यास फ़ाइल राइट नहीं की जा सकती"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM विन्यास फ़ाइल {!s} मौजूद नहीं है"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM विन्यास फ़ाइल राइट नहीं की जा सकती"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM विन्यास फ़ाइल {!s} मौजूद नहीं है"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM को विन्यस्त नहीं किया जा सकता"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "कोई LightDM लॉगिन स्क्रीन इंस्टॉल नहीं है।"
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM विन्यास फ़ाइल राइट नहीं की जा सकती"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM विन्यास फ़ाइल {!s} मौजूद नहीं है"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "चयनित डिस्प्ले प्रबंधक मॉड्यूल हेतु कोई डिस्प्ले प्रबंधक नहीं मिला।"
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"globalstorage व displaymanager.conf में डिस्प्ले प्रबंधक सूची रिक्त या "
+"अपरिभाषित है।"
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "डिस्प्ले प्रबंधक विन्यास अधूरा था"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "initramfs को विन्यस्त करना। "
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt सेवा विन्यस्त करना।"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "हार्डवेयर घड़ी सेट करना।"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab पर राइट करना।"
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"कोई 
{!s}
 विन्यास प्रदान नहीं किया गया 
{!s}
 के उपयोग "
-"हेतु।"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "डमी पाइथन प्रक्रिया ।"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "डमी पाइथन प्रक्रिया की चरण संख्या {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "स्थानिकी को विन्यस्त करना।"
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "नेटवर्क विन्यास सेटिंग्स संचित करना।"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "डाटा इंस्टॉल करना।"
diff --git a/lang/python/hr/LC_MESSAGES/python.po b/lang/python/hr/LC_MESSAGES/python.po
index 1f838268f..4aefea56d 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Lovro Kudelić , 2022\n"
 "Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n"
@@ -21,94 +21,107 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurirajte GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instaliraj pakete."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montiranje particija."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Obrađujem pakete (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Interna pogreška pri postavljanju zfs skupova podataka"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instaliram paket."
+msgstr[1] "Instaliram %(num)d pakete."
+msgstr[2] "Instaliram %(num)d pakete."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Nije uspio uvoz zpool-a"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Uklanjam paket."
+msgstr[1] "Uklanjam %(num)d pakete."
+msgstr[2] "Uklanjam %(num)d pakete."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Otključavanje zpool-a nije uspjelo"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Pogreška upravitelja paketa"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Nije uspjelo postavljanje ZFS točke montiranja"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Upravitelj paketa nije mogao pripremiti ažuriranja. Naredba 
{!s}
 "
+"je vratila kôd pogreške {!s}."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Upravitelj paketa nije mogao ažurirati sustav. Naredba 
{!s}
 je "
+"vratila kod pogreške {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Upravitelj paketa nije mogao izvršiti promjene na instaliranom sustavu. "
+"Naredba 
{!s}
 je vratila kôd pogreške {!s}."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Spremanje mrežne konfiguracije."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Greška konfiguracije"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"Nijedna root točka montiranja nije definirana za 
{!s}
 korištenje."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriranje mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nema definiranih particija za 
{!s}
 korištenje."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "ZFS greška montiranja"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Stvaranje initramfs s mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguriraj systemd servise"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Pokretanje mkinitfs na ciljanom sustavu nije uspjelo"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Ne mogu modificirati servis"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Izlazni kod bio je {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} poziv u chroot-u vratio je kod pogreške "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Ne mogu omogućiti systemd servis {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Ne mogu omogućiti systemd cilj {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "Nije moguće omogućiti systemd timer {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Ne mogu onemogućiti systemd cilj {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Ne mogu maskirati systemd jedinicu {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Nepoznata systemd naredba {command!s} i {suffix!s}"
-" za jedinicu {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfiguriranje servisa OpenRC dmcrypt."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -176,76 +189,121 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Odredište \"{}\" u ciljnom sustavu nije direktorij"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Ne mogu zapisati KDM konfiguracijsku datoteku"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguriraj systemd servise"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM konfiguracijska datoteka {!s} ne postoji"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Ne mogu modificirati servis"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Ne mogu zapisati LXDM konfiguracijsku datoteku"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM konfiguracijska datoteka {!s} ne postoji"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Ne moku zapisati LightDM konfiguracijsku datoteku"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM konfiguracijska datoteka {!s} ne postoji"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Ne mogu konfigurirati LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nije instaliran LightDM pozdravnik."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Ne mogu zapisati SLIM konfiguracijsku datoteku"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM konfiguracijska datoteka {!s} ne postoji"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Nisu odabrani upravitelji zaslona za modul displaymanager."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Popis upravitelja zaslona je prazan ili nedefiniran u oba globalstorage i "
-"displaymanager.conf."
+"systemctl {arg!s} poziv u chroot-u vratio je kod pogreške "
+"{num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Konfiguracija upravitelja zaslona nije bila potpuna"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Ne mogu omogućiti systemd servis {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfiguriranje mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Ne mogu omogućiti systemd cilj {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "Nije moguće omogućiti systemd timer {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Ne mogu onemogućiti systemd cilj {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Ne mogu maskirati systemd jedinicu {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Nijedna root točka montiranja nije definirana za 
{!s}
 korištenje."
+"Nepoznata systemd naredba {command!s} i {suffix!s}"
+" za jedinicu {name!s}."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instaliranje podataka."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testni python posao."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testni python korak {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instaliram bootloader."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Instalacija gruba nije uspjela, nema definiranih particija u globalnoj "
+"pohrani"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Greška prilikom instalacije bootloadera"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Bootloader nije mogao biti instaliran. Instalacijska naredba 
{!s}
"
+" je vratila kod pogreške {!s}."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Konfiguriranje lokalizacije."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montiranje particija."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Interna pogreška pri postavljanju zfs skupova podataka"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Nije uspio uvoz zpool-a"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Otključavanje zpool-a nije uspjelo"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Nije uspjelo postavljanje ZFS točke montiranja"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "ZFS greška montiranja"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurirajte Plymouth temu"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Zapisujem fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr "Nije dana konfiguracija 
{!s}
 za 
{!s}
 upotrebu."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -297,103 +355,6 @@ msgid ""
 msgstr ""
 "Putanja servisa  {name!s} je {path!s}, međutim ona ne postoji."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurirajte Plymouth temu"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instaliraj pakete."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Obrađujem pakete (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instaliram paket."
-msgstr[1] "Instaliram %(num)d pakete."
-msgstr[2] "Instaliram %(num)d pakete."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Uklanjam paket."
-msgstr[1] "Uklanjam %(num)d pakete."
-msgstr[2] "Uklanjam %(num)d pakete."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Pogreška upravitelja paketa"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Upravitelj paketa nije mogao pripremiti ažuriranja. Naredba 
{!s}
 "
-"je vratila kôd pogreške {!s}."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Upravitelj paketa nije mogao ažurirati sustav. Naredba 
{!s}
 je "
-"vratila kod pogreške {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Upravitelj paketa nije mogao izvršiti promjene na instaliranom sustavu. "
-"Naredba 
{!s}
 je vratila kôd pogreške {!s}."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instaliram bootloader."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Instalacija gruba nije uspjela, nema definiranih particija u globalnoj "
-"pohrani"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Greška prilikom instalacije bootloadera"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Bootloader nije mogao biti instaliran. Instalacijska naredba 
{!s}
"
-" je vratila kod pogreške {!s}."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Postavljanje hardverskog sata."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Stvaranje initramfs s mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Pokretanje mkinitfs na ciljanom sustavu nije uspjelo"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Izlazni kod bio je {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Stvaranje initramfs s dracut."
@@ -402,35 +363,74 @@ msgstr "Stvaranje initramfs s dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Nije uspjelo pokretanje dracuta na ciljanom sustavu"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurirajte GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Ne mogu zapisati KDM konfiguracijsku datoteku"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM konfiguracijska datoteka {!s} ne postoji"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Ne mogu zapisati LXDM konfiguracijsku datoteku"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM konfiguracijska datoteka {!s} ne postoji"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Ne moku zapisati LightDM konfiguracijsku datoteku"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM konfiguracijska datoteka {!s} ne postoji"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Ne mogu konfigurirati LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nije instaliran LightDM pozdravnik."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Ne mogu zapisati SLIM konfiguracijsku datoteku"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM konfiguracijska datoteka {!s} ne postoji"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Nisu odabrani upravitelji zaslona za modul displaymanager."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Popis upravitelja zaslona je prazan ili nedefiniran u oba globalstorage i "
+"displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Konfiguracija upravitelja zaslona nije bila potpuna"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Konfiguriranje initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfiguriranje servisa OpenRC dmcrypt."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Postavljanje hardverskog sata."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisujem fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr "Nije dana konfiguracija 
{!s}
 za 
{!s}
 upotrebu."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testni python posao."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testni python korak {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Konfiguriranje lokalizacije."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Spremanje mrežne konfiguracije."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instaliranje podataka."
diff --git a/lang/python/hu/LC_MESSAGES/python.po b/lang/python/hu/LC_MESSAGES/python.po
index 946f540fe..cfb414382 100644
--- a/lang/python/hu/LC_MESSAGES/python.po
+++ b/lang/python/hu/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Lajos Pasztor , 2019\n"
 "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n"
@@ -24,94 +24,98 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB konfigurálása."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Csomagok telepítése."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Partíciók csatolása."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Csomagok feldolgozása (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Egy csomag telepítése."
+msgstr[1] "%(num)d csomag telepítése."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Egy csomag eltávolítása."
+msgstr[1] "%(num)d csomag eltávolítása."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Hálózati konfiguráció mentése."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Konfigurációs hiba"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Nincs root csatolási pont megadva a 
{!s}
 használatához."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio konfigurálása."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nincsenek partíciók meghatározva a 
{!s}
 használatához."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd szolgáltatások beállítása"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "a szolgáltatást nem lehet módosítani"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} hívás a chroot-ban hibakódot okozott {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-"Nem sikerült a systemd szolgáltatást engedélyezni: {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nem sikerült a systemd célt engedélyezni: {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nem sikerült a systemd cél {name!s} letiltása."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "A kilépési kód {} volt."
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nem maszkolható systemd egység: {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Ismeretlen systemd parancsok {command!s} és "
-"{suffix!s} a {name!s} egységhez. "
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt szolgáltatás konfigurálása."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -177,73 +181,117 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Az elérés \"{}\" nem létező könyvtár a cél rendszerben"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "A KDM konfigurációs fájl nem írható"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd szolgáltatások beállítása"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "A(z) {!s} KDM konfigurációs fájl nem létezik"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "a szolgáltatást nem lehet módosítani"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Az LXDM konfigurációs fájl nem írható"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "A(z) {!s} LXDM konfigurációs fájl nem létezik"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "A LightDM konfigurációs fájl nem írható"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "A(z) {!s} LightDM konfigurációs fájl nem létezik"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "A LightDM nem állítható be"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nincs LightDM üdvözlő telepítve."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "A SLIM konfigurációs fájl nem írható"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "A(z) {!s} SLIM konfigurációs fájl nem létezik"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Nincs kijelzőkezelő kiválasztva a kijelzőkezelő modulhoz."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} hívás a chroot-ban hibakódot okozott {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+"Nem sikerült a systemd szolgáltatást engedélyezni: {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nem sikerült a systemd célt engedélyezni: {name!s}."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "A kijelzőkezelő konfigurációja hiányos volt"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nem sikerült a systemd cél {name!s} letiltása."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio konfigurálása."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nem maszkolható systemd egység: {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Nincs root csatolási pont megadva a 
{!s}
 használatához."
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Ismeretlen systemd parancsok {command!s} és "
+"{suffix!s} a {name!s} egységhez. "
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Adatok telepítése."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Hamis Python feladat."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Hamis {}. Python lépés"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Rendszerbetöltő telepítése."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "nyelvi értékek konfigurálása."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Partíciók csatolása."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth téma beállítása"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab írása."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -294,91 +342,6 @@ msgid ""
 msgstr ""
 "A szolgáltatás {name!s} elérési útja {path!s}, nem létezik."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth téma beállítása"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Csomagok telepítése."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Csomagok feldolgozása (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Egy csomag telepítése."
-msgstr[1] "%(num)d csomag telepítése."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Egy csomag eltávolítása."
-msgstr[1] "%(num)d csomag eltávolítása."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Rendszerbetöltő telepítése."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Rendszeridő beállítása."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "A kilépési kód {} volt."
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "initramfs létrehozása ezzel: dracut."
@@ -387,35 +350,72 @@ msgstr "initramfs létrehozása ezzel: dracut."
 msgid "Failed to run dracut on the target"
 msgstr "dracut futtatása nem sikerült a célon."
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB konfigurálása."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "A KDM konfigurációs fájl nem írható"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "A(z) {!s} KDM konfigurációs fájl nem létezik"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Az LXDM konfigurációs fájl nem írható"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "A(z) {!s} LXDM konfigurációs fájl nem létezik"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "A LightDM konfigurációs fájl nem írható"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "A(z) {!s} LightDM konfigurációs fájl nem létezik"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "A LightDM nem állítható be"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nincs LightDM üdvözlő telepítve."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "A SLIM konfigurációs fájl nem írható"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "A(z) {!s} SLIM konfigurációs fájl nem létezik"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Nincs kijelzőkezelő kiválasztva a kijelzőkezelő modulhoz."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "A kijelzőkezelő konfigurációja hiányos volt"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "initramfs konfigurálása."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt szolgáltatás konfigurálása."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Rendszeridő beállítása."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab írása."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Hamis Python feladat."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Hamis {}. Python lépés"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "nyelvi értékek konfigurálása."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Hálózati konfiguráció mentése."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Adatok telepítése."
diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po
index 9fa6f010e..c431120ba 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Drajat Hasan , 2021\n"
 "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n"
@@ -23,89 +23,95 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instal paket-paket."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Paket pemrosesan (%(count)d/%(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Menginstal paket %(num)d"
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "mencopot %(num)d paket"
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Kesalahan Konfigurasi"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -172,72 +178,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Gak bisa menulis file konfigurasi KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "File {!s} config KDM belum ada"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Gak bisa menulis file konfigurasi LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "File {!s} config LXDM enggak ada"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Gak bisa menulis file konfigurasi LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "File {!s} config LightDM belum ada"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Gak bisa mengkonfigurasi LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Tiada LightDM greeter yang terinstal."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Gak bisa menulis file konfigurasi SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "File {!s} config SLIM belum ada"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Tiada display manager yang dipilih untuk modul displaymanager."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Konfigurasi display manager belum rampung"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tugas dumi python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Langkah {} dumi python"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -283,89 +329,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instal paket-paket."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Paket pemrosesan (%(count)d/%(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Menginstal paket %(num)d"
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "mencopot %(num)d paket"
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -374,35 +337,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Gak bisa menulis file konfigurasi KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "File {!s} config KDM belum ada"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Gak bisa menulis file konfigurasi LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "File {!s} config LXDM enggak ada"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Gak bisa menulis file konfigurasi LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "File {!s} config LightDM belum ada"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Gak bisa mengkonfigurasi LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Tiada LightDM greeter yang terinstal."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Gak bisa menulis file konfigurasi SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "File {!s} config SLIM belum ada"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Tiada display manager yang dipilih untuk modul displaymanager."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Konfigurasi display manager belum rampung"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tugas dumi python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Langkah {} dumi python"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/ie/LC_MESSAGES/python.po b/lang/python/ie/LC_MESSAGES/python.po
index bdcd278fd..49eb3b925 100644
--- a/lang/python/ie/LC_MESSAGES/python.po
+++ b/lang/python/ie/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Caarmi, 2020\n"
 "Language-Team: Interlingue (https://www.transifex.com/calamares/teams/20061/ie/)\n"
@@ -21,91 +21,97 @@ msgstr ""
 "Language: ie\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurante GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Installante paccages."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montente partitiones."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Errore de configuration"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurante mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Null partition es definit por usa de 
{!s}
."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurante servicios de systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Invocation de systemctl {arg!s} in chroot retrodat li code "
-"{num!s}."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Li code de termination esset {}"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Ne successat activar li servicio de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -172,73 +178,115 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Ne successat scrir li file de configuration de KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurante servicios de systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "File del configuration de KDM {!s} ne existe"
-
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Ne successat scrir li file de configuration de LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "File del configuration de LXDM {!s} ne existe"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Ne successat scrir li file de configuration de LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "File del configuration de LightDM {!s} ne existe"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "File del configuration de SLIM {!s} ne existe"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Invocation de systemctl {arg!s} in chroot retrodat li code "
+"{num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Ne successat activar li servicio de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurante mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installante li data."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installante li bootloader."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Configurante locales."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montente partitiones."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurante li tema de Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Scrition de fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -285,91 +333,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurante li tema de Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Installante paccages."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installante li bootloader."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Li code de termination esset {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -378,35 +341,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurante GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Ne successat scrir li file de configuration de KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "File del configuration de KDM {!s} ne existe"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Ne successat scrir li file de configuration de LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "File del configuration de LXDM {!s} ne existe"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Ne successat scrir li file de configuration de LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "File del configuration de LightDM {!s} ne existe"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "File del configuration de SLIM {!s} ne existe"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Configurante initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Scrition de fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Configurante locales."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installante li data."
diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po
index 1e1d7ca9b..77254f6f7 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kristján Magnússon, 2017\n"
 "Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n"
@@ -21,89 +21,97 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Setja upp pakka."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Vinnslupakkar (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Setja upp einn pakka."
+msgstr[1] "Setur upp %(num)d pakka."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Fjarlægi einn pakka."
+msgstr[1] "Fjarlægi %(num)d pakka."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -170,72 +178,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -281,91 +329,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Setja upp pakka."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Vinnslupakkar (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Setja upp einn pakka."
-msgstr[1] "Setur upp %(num)d pakka."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Fjarlægi einn pakka."
-msgstr[1] "Fjarlægi %(num)d pakka."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -374,35 +337,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po
index 641e06bd0..7f113f9ab 100644
--- a/lang/python/it_IT/LC_MESSAGES/python.po
+++ b/lang/python/it_IT/LC_MESSAGES/python.po
@@ -6,114 +6,119 @@
 # Translators:
 # Pierfrancesco Passerini , 2019
 # Pietro F. Fontana, 2020
-# Saverio , 2020
 # Giuseppe Pignataro , 2021
 # Vincenzo Reale , 2022
+# Saverio , 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Vincenzo Reale , 2022\n"
+"Last-Translator: Saverio , 2022\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Installa pacchetti."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montaggio partizioni."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Elaborazione dei pacchetti (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installando un pacchetto."
+msgstr[1] "Installazione di %(num)d pacchetti."
+msgstr[2] "Installazione di %(num)d pacchetti."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Rimuovendo un pacchetto."
+msgstr[1] "Rimozione di %(num)d pacchetti."
+msgstr[2] "Rimozione di %(num)d pacchetti."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Errore del gestore dei pacchetti"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Importazione zpool non riuscita"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Sblocco zpool non riuscito"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Salvataggio della configurazione di rete."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Errore di Configurazione"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Nessun punto di mount root è dato in l'uso per 
{!s}
"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurazione di mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nessuna partizione definita per l'uso con 
{!s}
."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "errore di mount zfs"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Sto creando initramfs con mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura servizi  systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Impossibile eseguire mkinitfs sulla destinazione"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Impossibile modificare il servizio"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Il codice di uscita era {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La chiamata systemctl {arg!s} in chroot ha restituito il codice"
-" di errore {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Impossibile abilitare il servizio systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Impossibile abilitare la destinazione systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-"Impossibile disabilitare la destinazione systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Impossibile mascherare l'unità systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Comandi systemd sconosciuti {command!s} "
-"e{suffix!s} per l'unità {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurazione del servizio OpenRC dmcrypt."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -179,76 +184,120 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "La destinazione del sistema \"{}\" non è una directory"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Impossibile scrivere il file di configurazione di KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura servizi  systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Il file di configurazione di KDM {!s} non esiste"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Impossibile modificare il servizio"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Impossibile scrivere il file di configurazione di LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Il file di configurazione di LXDM {!s} non esiste"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Impossibile scrivere il file di configurazione di LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Il file di configurazione di LightDM {!s} non esiste"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Impossibile configurare LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nessun LightDM greeter installato."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Impossibile scrivere il file di configurazione di SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Il file di configurazione di SLIM {!s} non esiste"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-"Non è stato selezionato alcun display manager per il modulo displaymanager"
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"L'elenco dei display manager è vuota o non definita sia in globalstorage che"
-" in displaymanager.conf."
+"La chiamata systemctl {arg!s} in chroot ha restituito il codice"
+" di errore {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "La configurazione del display manager è incompleta"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Impossibile abilitare il servizio systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurazione di mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Impossibile abilitare la destinazione systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Nessun punto di mount root è dato in l'uso per 
{!s}
"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installazione dei dati."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"Impossibile disabilitare la destinazione systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impossibile mascherare l'unità systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Comandi systemd sconosciuti {command!s} "
+"e{suffix!s} per l'unità {name!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Job python fittizio."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Python step {} fittizio"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installa il bootloader."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Installazione di grub non riuscita, nessuna partizione definita "
+"nell'archiviazione globale"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Errore di installazione del boot loader"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Configurazione della localizzazione."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montaggio partizioni."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Importazione zpool non riuscita"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Sblocco zpool non riuscito"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "errore di mount zfs"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura il tema Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Scrittura di fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -299,93 +348,6 @@ msgid ""
 msgstr ""
 "Il percorso del servizio {name!s} è {path!s}, ma non esiste."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura il tema Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Installa pacchetti."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Elaborazione dei pacchetti (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installando un pacchetto."
-msgstr[1] "Installazione di %(num)d pacchetti."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Rimuovendo un pacchetto."
-msgstr[1] "Rimozione di %(num)d pacchetti."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Errore del gestore dei pacchetti"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installa il bootloader."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Installazione di grub non riuscita, nessuna partizione definita "
-"nell'archiviazione globale"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Errore di installazione del boot loader"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Impostazione del clock hardware."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Sto creando initramfs con mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Impossibile eseguire mkinitfs sulla destinazione"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Il codice di uscita era {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Creazione di initramfs con dracut."
@@ -394,35 +356,75 @@ msgstr "Creazione di initramfs con dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Impossibile eseguire dracut sulla destinazione"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Impossibile scrivere il file di configurazione di KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Il file di configurazione di KDM {!s} non esiste"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Impossibile scrivere il file di configurazione di LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Il file di configurazione di LXDM {!s} non esiste"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Impossibile scrivere il file di configurazione di LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Il file di configurazione di LightDM {!s} non esiste"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Impossibile configurare LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nessun LightDM greeter installato."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Impossibile scrivere il file di configurazione di SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Il file di configurazione di SLIM {!s} non esiste"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+"Non è stato selezionato alcun display manager per il modulo displaymanager"
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"L'elenco dei display manager è vuota o non definita sia in globalstorage che"
+" in displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "La configurazione del display manager è incompleta"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Configurazione di initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurazione del servizio OpenRC dmcrypt."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Impostazione del clock hardware."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Scrittura di fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Job python fittizio."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Python step {} fittizio"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Configurazione della localizzazione."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Salvataggio della configurazione di rete."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installazione dei dati."
diff --git a/lang/python/ja-Hira/LC_MESSAGES/python.po b/lang/python/ja-Hira/LC_MESSAGES/python.po
index cfe352952..38cbed4f5 100644
--- a/lang/python/ja-Hira/LC_MESSAGES/python.po
+++ b/lang/python/ja-Hira/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Japanese (Hiragana) (https://www.transifex.com/calamares/teams/20061/ja-Hira/)\n"
 "MIME-Version: 1.0\n"
@@ -17,89 +17,95 @@ msgstr ""
 "Language: ja-Hira\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +172,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,89 +323,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -368,35 +331,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po
index 3a87aa743..0f2aef676 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: UTUMI Hirosi , 2022\n"
 "Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n"
@@ -23,93 +23,100 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUBを設定にします。"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "パッケージのインストール"
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "パーティションのマウント。"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "パッケージを処理しています (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "zfs データセットのマウントで内部エラーが発生"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] " %(num)d パッケージをインストールしています。"
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "zpool のインポートに失敗しました"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] " %(num)d パッケージを削除しています。"
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "zpool のロック解除に失敗しました。"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "パッケージマネージャーのエラー"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "zfs マウントポイントの設定に失敗しました"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"パッケージマネージャーはアップデートを準備できませんでした。コマンド 
{!s}
 はエラーコード {!s} を返しました。"
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"パッケージマネージャーはシステムをアップデートできませんでした。 コマンド 
{!s}
 はエラーコード {!s} を返しました。"
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"パッケージマネージャーはインストールされているシステムに変更を加えられませんでした。コマンド 
{!s}
 はエラーコード {!s} "
+"を返しました。"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "ネットワーク設定を保存しています。"
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "コンフィグレーションエラー"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr " 
{!s}
 を使用するのにルートマウントポイントが与えられていません。"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpioを設定しています。"
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "
{!s}
 に使用するパーティションが定義されていません。"
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs のマウントでエラー"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfsを使用してinitramfsを作成します。"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemdサービスを設定"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "ターゲットでmkinitfsを実行できませんでした"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "サービスが変更できません"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "停止コードは {} でした"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"chroot で systemctl {arg!s} を呼び出すと、エラーコード {num!s} が返されました。"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name!s}というsystemdサービスが可能にすることができません"
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd でターゲット {name!s}が開始できません。"
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "systemd タイマー {name!s} を有効にできません。"
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd でターゲット {name!s}が停止できません。"
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd ユニット {name!s} をマスクできません。"
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"ユニット {name!s} に対する未知の systemd コマンド {command!s} と "
-"{suffix!s}。"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcryptサービスを設定しています。"
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -175,73 +182,117 @@ msgstr "unsquashfs が見つかりませんでした。squashfs-tools パッケ
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "ターゲットシステムの宛先 \"{}\" はディレクトリではありません"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDMの設定ファイルに書き込みができません"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemdサービスを設定"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM 設定ファイル {!s} が存在しません"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "サービスが変更できません"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDMの設定ファイルに書き込みができません"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM 設定ファイル {!s} が存在しません"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDMの設定ファイルに書き込みができません"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM 設定ファイル {!s} が存在しません"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDMの設定ができません"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM greeter がインストールされていません。"
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIMの設定ファイルに書き込みができません"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM 設定ファイル {!s} が存在しません"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "ディスプレイマネージャが選択されていません。"
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
-msgstr "globalstorage と displaymanager.conf の両方で、displaymanagers リストが空か未定義です。"
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"chroot で systemctl {arg!s} を呼び出すと、エラーコード {num!s} が返されました。"
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "ディスプレイマネージャの設定が不完全です"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name!s}というsystemdサービスが可能にすることができません"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpioを設定しています。"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd でターゲット {name!s}が開始できません。"
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr " 
{!s}
 を使用するのにルートマウントポイントが与えられていません。"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "systemd タイマー {name!s} を有効にできません。"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "データのインストール。"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd でターゲット {name!s}が停止できません。"
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd ユニット {name!s} をマスクできません。"
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"ユニット {name!s} に対する未知の systemd コマンド {command!s} と "
+"{suffix!s}。"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "ブートローダーをインストール"
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "grub のインストールに失敗しました。グローバルストレージにパーティションが定義されていません"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "ブートローダーのインストールエラー"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"ブートローダーをインストールできませんでした。インストールコマンド 
{!s}
 がエラーコード {!s} を返しました。"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "ロケールを設定しています。"
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "パーティションのマウント。"
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "zfs データセットのマウントで内部エラーが発生"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "zpool のインポートに失敗しました"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "zpool のロック解除に失敗しました。"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "zfs マウントポイントの設定に失敗しました"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs のマウントでエラー"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouthテーマを設定"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstabを書き込んでいます。"
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr "
{!s}
 が使用する 
{!s}
 設定が指定されていません。"
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -287,94 +338,6 @@ msgid ""
 "exist."
 msgstr "サービス {name!s} のパスが {path!s} です。これは存在しません。"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouthテーマを設定"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "パッケージのインストール"
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "パッケージを処理しています (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] " %(num)d パッケージをインストールしています。"
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] " %(num)d パッケージを削除しています。"
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "パッケージマネージャーのエラー"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"パッケージマネージャーはアップデートを準備できませんでした。コマンド 
{!s}
 はエラーコード {!s} を返しました。"
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"パッケージマネージャーはシステムをアップデートできませんでした。 コマンド 
{!s}
 はエラーコード {!s} を返しました。"
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"パッケージマネージャーはインストールされているシステムに変更を加えられませんでした。コマンド 
{!s}
 はエラーコード {!s} "
-"を返しました。"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "ブートローダーをインストール"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "grub のインストールに失敗しました。グローバルストレージにパーティションが定義されていません"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "ブートローダーのインストールエラー"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"ブートローダーをインストールできませんでした。インストールコマンド 
{!s}
 がエラーコード {!s} を返しました。"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "ハードウェアクロックの設定"
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfsを使用してinitramfsを作成します。"
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "ターゲットでmkinitfsを実行できませんでした"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "停止コードは {} でした"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "dracutとinitramfsを作成しています。"
@@ -383,35 +346,72 @@ msgstr "dracutとinitramfsを作成しています。"
 msgid "Failed to run dracut on the target"
 msgstr "ターゲット上で dracut の実行に失敗"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUBを設定にします。"
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDMの設定ファイルに書き込みができません"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM 設定ファイル {!s} が存在しません"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDMの設定ファイルに書き込みができません"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM 設定ファイル {!s} が存在しません"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDMの設定ファイルに書き込みができません"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM 設定ファイル {!s} が存在しません"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDMの設定ができません"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM greeter がインストールされていません。"
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIMの設定ファイルに書き込みができません"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM 設定ファイル {!s} が存在しません"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "ディスプレイマネージャが選択されていません。"
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr "globalstorage と displaymanager.conf の両方で、displaymanagers リストが空か未定義です。"
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "ディスプレイマネージャの設定が不完全です"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "initramfsを設定しています。"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcryptサービスを設定しています。"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "ハードウェアクロックの設定"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstabを書き込んでいます。"
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr "
{!s}
 が使用する 
{!s}
 設定が指定されていません。"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "ロケールを設定しています。"
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "ネットワーク設定を保存しています。"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "データのインストール。"
diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po
index fc68ff872..a7435ec50 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\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"
@@ -17,89 +17,97 @@ msgstr ""
 "Language: kk\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +174,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,91 +325,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -370,35 +333,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/kn/LC_MESSAGES/python.po b/lang/python/kn/LC_MESSAGES/python.po
index a41b0311c..89c354676 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\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"
@@ -17,89 +17,97 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +174,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,91 +325,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -370,35 +333,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po
index d2eff90ca..d752526c5 100644
--- a/lang/python/ko/LC_MESSAGES/python.po
+++ b/lang/python/ko/LC_MESSAGES/python.po
@@ -5,16 +5,16 @@
 # 
 # Translators:
 # Ji-Hyeon Gim , 2018
-# JungHee Lee , 2022
+# Junghee Lee , 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: JungHee Lee , 2022\n"
+"Last-Translator: Junghee Lee , 2022\n"
 "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,92 +22,97 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB 구성"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "패키지를 설치합니다."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "파티션 마운트 중."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "패키지 처리중 (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "zfs 데이터세트를 마운트하는 중 내부 오류"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "%(num)d개의 패키지들을 설치하는 중입니다."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "zpool을 가져오지 못했습니다"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "zpool의 잠금을 해제하지 못했습니다"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "패키지 관리자 오류"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "zfs 마운트위치를 지정하지 못했습니다"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr "패키지 관리자가 업데이트를 준비할 수 없습니다. 
{!s}
 명령에서  {!s} 오류 코드를 반환했습니다."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr "패키지 관리자가 시스템을 업데이트할 수 없습니다. 
{!s}
 명령에서  {!s} 오류 코드를 반환했습니다."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"패키지 관리자가 설치된 시스템을 변경할 수 없습니다. 
{!s}
 명령에서  {!s} 오류 코드를 반환했습니다."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "네트워크 구성 저장 중."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "구성 오류"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "
{!s}
에서 사용할 루트 마운트 지점이 제공되지 않음."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio 구성 중."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "사용할 
{!s}
에 대해 정의된 파티션이 없음."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs 마운트하는 중 오류"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs로 initramfs 생성 중."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd 서비스 구성"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "대상에서 mkinitfs를 실행하지 못했습니다"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "서비스를 수정할 수 없음"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "종료 코드 {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot에서 systemctl {arg!s} 호출에서오류 코드 {num}를 반환 했습니다."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name! s} 시스템 서비스를 활성화 할 수 없습니다."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd 대상 {name! s}를 활성화 할 수 없습니다."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "시스템 타이머 {name!s}를 활성화할 수 없습니다."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd 대상 {name! s}를 비활성화 할 수 없습니다."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "시스템 유닛 {name! s}를 마스크할 수 없습니다."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"유닛 {name! s}에 대해 알 수 없는 시스템 명령 {command! s} 및 {suffix! "
-"s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt 서비스 구성 중."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -173,75 +178,115 @@ msgstr "unsquashfs를 찾지 못했습니다. squashfs-tools 패키지가 설치
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "대상 시스템의 \"{}\" 목적지가 디렉토리가 아닙니다."
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM 구성 파일을 쓸 수 없습니다."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd 서비스 구성"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM 구성 파일 {! s}가 없습니다"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "서비스를 수정할 수 없음"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LMLDM 구성 파일을 쓸 수 없습니다."
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM 구성 파일 {!s}이 없습니다."
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM 구성 파일을 쓸 수 없습니다."
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM 구성 파일 {!s}가 없습니다."
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM을 구성할 수 없습니다."
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM greeter가 설치되지 않았습니다."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM 구성 파일을 쓸 수 없음"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM 구성 파일 {!s}가 없음"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "displaymanager 모듈에 대해 선택된 디스플레이 관리자가 없습니다."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot에서 systemctl {arg!s} 호출에서오류 코드 {num}를 반환 했습니다."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name! s} 시스템 서비스를 활성화 할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd 대상 {name! s}를 활성화 할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "시스템 타이머 {name!s}를 활성화할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd 대상 {name! s}를 비활성화 할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "시스템 유닛 {name! s}를 마스크할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"displaymanagers 목록이 비어 있거나 globalstorage 및 displaymanager.conf 모두에서 정의되지 "
-"않았습니다."
+"유닛 {name! s}에 대해 알 수 없는 시스템 명령 {command! s} 및 {suffix! "
+"s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "디스플레이 관리자 구성이 완료되지 않았습니다."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "더미 파이썬 작업."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio 구성 중."
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "더미 파이썬 단계 {}"
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "
{!s}
에서 사용할 루트 마운트 지점이 제공되지 않음."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "부트로더 설치."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "데이터 설치중."
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "grub을 설치하지 못했습니다. 파티션 없음이 전역 저장소에 정의되었습니다"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "부트로더 설치 오류"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr "부트로더를 설치할 수 없습니다. 
{!s}
 설치 명령에서  {!s} 오류 코드를 반환했습니다."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "로컬 구성 중."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "파티션 마운트 중."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "zfs 데이터세트를 마운트하는 중 내부 오류"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "zpool을 가져오지 못했습니다"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "zpool의 잠금을 해제하지 못했습니다"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "zfs 마운트위치를 지정하지 못했습니다"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs 마운트하는 중 오류"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "플리머스 테마 구성"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab 쓰기."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr "
{!s}
 구성 없음은 
{!s}
을(를) 사용할 수 있도록 제공됩니다."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -288,90 +333,6 @@ msgid ""
 "exist."
 msgstr "{name!s} 서비스에 대한 경로는 {path!s}이고, 존재하지 않습니다."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "플리머스 테마 구성"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "패키지를 설치합니다."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "패키지 처리중 (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "%(num)d개의 패키지들을 설치하는 중입니다."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "패키지 관리자 오류"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr "패키지 관리자가 업데이트를 준비할 수 없습니다. 
{!s}
 명령에서  {!s} 오류 코드를 반환했습니다."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr "패키지 관리자가 시스템을 업데이트할 수 없습니다. 
{!s}
 명령에서  {!s} 오류 코드를 반환했습니다."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"패키지 관리자가 설치된 시스템을 변경할 수 없습니다. 
{!s}
 명령에서  {!s} 오류 코드를 반환했습니다."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "부트로더 설치."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "grub을 설치하지 못했습니다. 파티션 없음이 전역 저장소에 정의되었습니다"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "부트로더 설치 오류"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr "부트로더를 설치할 수 없습니다. 
{!s}
 설치 명령에서  {!s} 오류 코드를 반환했습니다."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "하드웨어 클럭 설정 중."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs로 initramfs 생성 중."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "대상에서 mkinitfs를 실행하지 못했습니다"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "종료 코드 {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "dracut을 사용하여 initramfs 만들기."
@@ -380,35 +341,74 @@ msgstr "dracut을 사용하여 initramfs 만들기."
 msgid "Failed to run dracut on the target"
 msgstr "대상에서 dracut을 실행하지 못함"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB 구성"
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM 구성 파일을 쓸 수 없습니다."
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM 구성 파일 {! s}가 없습니다"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LMLDM 구성 파일을 쓸 수 없습니다."
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM 구성 파일 {!s}이 없습니다."
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM 구성 파일을 쓸 수 없습니다."
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM 구성 파일 {!s}가 없습니다."
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM을 구성할 수 없습니다."
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM greeter가 설치되지 않았습니다."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM 구성 파일을 쓸 수 없음"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM 구성 파일 {!s}가 없음"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "displaymanager 모듈에 대해 선택된 디스플레이 관리자가 없습니다."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"displaymanagers 목록이 비어 있거나 globalstorage 및 displaymanager.conf 모두에서 정의되지 "
+"않았습니다."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "디스플레이 관리자 구성이 완료되지 않았습니다."
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "initramfs 구성 중."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt 서비스 구성 중."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "하드웨어 클럭 설정 중."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab 쓰기."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr "
{!s}
 구성 없음은 
{!s}
을(를) 사용할 수 있도록 제공됩니다."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "더미 파이썬 작업."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "더미 파이썬 단계 {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "로컬 구성 중."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "네트워크 구성 저장 중."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "데이터 설치중."
diff --git a/lang/python/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po
index 302e2cd54..faf2073eb 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\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"
@@ -17,89 +17,95 @@ msgstr ""
 "Language: lo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +172,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,89 +323,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -368,35 +331,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po
index e7d540cc7..22976c79c 100644
--- a/lang/python/lt/LC_MESSAGES/python.po
+++ b/lang/python/lt/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Moo, 2022\n"
 "Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n"
@@ -22,94 +22,110 @@ msgstr ""
 "Language: lt\n"
 "Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigūruoti GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Įdiegti paketus."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Prijungiami skaidiniai."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Apdorojami paketai (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Vidinė klaida prijungiant zfs duomenų rinkinius"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Įdiegiamas %(num)d paketas."
+msgstr[1] "Įdiegiami %(num)d paketai."
+msgstr[2] "Įdiegiama %(num)d paketų."
+msgstr[3] "Įdiegiama %(num)d paketų."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Nepavyko importuoti zpool"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Šalinamas %(num)d paketas."
+msgstr[1] "Šalinami %(num)d paketai."
+msgstr[2] "Šalinama %(num)d paketų."
+msgstr[3] "Šalinama %(num)d paketų."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Nepavyko atrakinti zpool"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Paketų tvarkytuvės klaida"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Nepavyko nustatyti zfs prijungimo taško"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Paketų tvarkytuvei nepavyko paruošti atnaujinimų. Komanda 
{!s}
 "
+"grąžino klaidos kodą {!s}."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Paketų tvarkytuvei nepavyko atnaujinti sistemos. Komanda 
{!s}
 "
+"grąžino klaidos kodą {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Paketų tvarkytuvei nepavyko atlikti pakeitimų įdiegtoje sistemoje. Komanda "
+"
{!s}
 grąžino klaidos kodą {!s}."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Įrašoma tinklo konfigūracija."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Konfigūracijos klaida"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"Nėra nurodyta jokių šaknies prijungimo taškų, skirtų 
{!s}
 "
+"naudojimui."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigūruojama mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nėra apibrėžta jokių skaidinių, skirtų 
{!s}
 naudojimui."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs prijungimo klaida"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Kuriama initramfs naudojant mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigūruoti systemd tarnybas"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Nepavyko paskirties vietoje paleisti mkinitfs"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nepavyksta modifikuoti tarnybos"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Išėjimo kodas buvo {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
-" {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nepavyksta įjungti systemd tarnybos {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nepavyksta įjungti systemd paskirties {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "Nepavyksta įjungti systemd laikmačio {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nepavyksta išjungti systemd paskirties {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nepavyksta maskuoti systemd įtaiso {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Nežinomos systemd komandos {command!s} ir "
-"{suffix!s} įtaisui {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -177,77 +193,123 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Paskirties vieta „{}“, esanti paskirties sistemoje, nėra katalogas"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Nepavyksta įrašyti KDM konfigūracijos failą"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigūruoti systemd tarnybas"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM konfigūracijos failo {!s} nėra"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Nepavyksta modifikuoti tarnybos"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Nepavyksta įrašyti LXDM konfigūracijos failą"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM konfigūracijos failo {!s} nėra"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Nepavyksta įrašyti LightDM konfigūracijos failą"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM konfigūracijos failo {!s} nėra"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Nepavyksta konfigūruoti LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Neįdiegtas joks LightDM pasisveikinimas."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Nepavyksta įrašyti SLIM konfigūracijos failą"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM konfigūracijos failo {!s} nėra"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Displaymanagers moduliui nėra pasirinkta jokių ekranų tvarkytuvių."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Displaymanagers sąrašas yra tuščias arba neapibrėžtas tiek globalstorage, "
-"tiek ir displaymanager.conf faile."
+"systemctl {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
+" {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Ekranų tvarkytuvės konfigūracija yra nepilna"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nepavyksta įjungti systemd tarnybos {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigūruojama mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nepavyksta įjungti systemd paskirties {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "Nepavyksta įjungti systemd laikmačio {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nepavyksta išjungti systemd paskirties {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nepavyksta maskuoti systemd įtaiso {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Nėra nurodyta jokių šaknies prijungimo taškų, skirtų 
{!s}
 "
-"naudojimui."
+"Nežinomos systemd komandos {command!s} ir "
+"{suffix!s} įtaisui {name!s}."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Įdiegiami duomenys."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Fiktyvi python užduotis."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Fiktyvus python žingsnis {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Įdiegti operacinės sistemos paleidyklę."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Nepavyko įdiegti grub paleidyklės, visuotinėje saugykloje nėra apibrėžta "
+"jokių skaidinių"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Operacinės sistemos paleidyklės diegimo klaida"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Nepavyko įdiegti operacinės sistemos paleidyklės. Diegimo komanda "
+"
{!s}
 grąžino klaidos kodą {!s}."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Konfigūruojamos lokalės."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Prijungiami skaidiniai."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Vidinė klaida prijungiant zfs duomenų rinkinius"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Nepavyko importuoti zpool"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Nepavyko atrakinti zpool"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Nepavyko nustatyti zfs prijungimo taško"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs prijungimo klaida"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigūruoti Plymouth temą"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Rašoma fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"Nenurodyta jokia 
{!s}
 konfigūracija, kurią 
{!s}
 galėtų"
+" naudoti."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -299,105 +361,6 @@ msgid ""
 msgstr ""
 "Tarnybos {name!s} kelias yra {path!s}, kurio savo ruožtu nėra."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigūruoti Plymouth temą"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Įdiegti paketus."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Apdorojami paketai (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Įdiegiamas %(num)d paketas."
-msgstr[1] "Įdiegiami %(num)d paketai."
-msgstr[2] "Įdiegiama %(num)d paketų."
-msgstr[3] "Įdiegiama %(num)d paketų."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Šalinamas %(num)d paketas."
-msgstr[1] "Šalinami %(num)d paketai."
-msgstr[2] "Šalinama %(num)d paketų."
-msgstr[3] "Šalinama %(num)d paketų."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Paketų tvarkytuvės klaida"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Paketų tvarkytuvei nepavyko paruošti atnaujinimų. Komanda 
{!s}
 "
-"grąžino klaidos kodą {!s}."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Paketų tvarkytuvei nepavyko atnaujinti sistemos. Komanda 
{!s}
 "
-"grąžino klaidos kodą {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Paketų tvarkytuvei nepavyko atlikti pakeitimų įdiegtoje sistemoje. Komanda "
-"
{!s}
 grąžino klaidos kodą {!s}."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Įdiegti operacinės sistemos paleidyklę."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Nepavyko įdiegti grub paleidyklės, visuotinėje saugykloje nėra apibrėžta "
-"jokių skaidinių"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Operacinės sistemos paleidyklės diegimo klaida"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Nepavyko įdiegti operacinės sistemos paleidyklės. Diegimo komanda "
-"
{!s}
 grąžino klaidos kodą {!s}."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nustatomas aparatinės įrangos laikrodis."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Kuriama initramfs naudojant mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Nepavyko paskirties vietoje paleisti mkinitfs"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Išėjimo kodas buvo {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Sukuriama initramfs naudojant dracut."
@@ -406,37 +369,74 @@ msgstr "Sukuriama initramfs naudojant dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Nepavyko paskirties vietoje paleisti dracut"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigūruoti GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Nepavyksta įrašyti KDM konfigūracijos failą"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM konfigūracijos failo {!s} nėra"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Nepavyksta įrašyti LXDM konfigūracijos failą"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM konfigūracijos failo {!s} nėra"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Nepavyksta įrašyti LightDM konfigūracijos failą"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM konfigūracijos failo {!s} nėra"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Nepavyksta konfigūruoti LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Neįdiegtas joks LightDM pasisveikinimas."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Nepavyksta įrašyti SLIM konfigūracijos failą"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM konfigūracijos failo {!s} nėra"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Displaymanagers moduliui nėra pasirinkta jokių ekranų tvarkytuvių."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Displaymanagers sąrašas yra tuščias arba neapibrėžtas tiek globalstorage, "
+"tiek ir displaymanager.conf faile."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Ekranų tvarkytuvės konfigūracija yra nepilna"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Konfigūruojama initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nustatomas aparatinės įrangos laikrodis."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Rašoma fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"Nenurodyta jokia 
{!s}
 konfigūracija, kurią 
{!s}
 galėtų"
-" naudoti."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Fiktyvi python užduotis."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Fiktyvus python žingsnis {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Konfigūruojamos lokalės."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Įrašoma tinklo konfigūracija."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Įdiegiami duomenys."
diff --git a/lang/python/lv/LC_MESSAGES/python.po b/lang/python/lv/LC_MESSAGES/python.po
index 81500cb95..7f34d28a9 100644
--- a/lang/python/lv/LC_MESSAGES/python.po
+++ b/lang/python/lv/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Latvian (https://www.transifex.com/calamares/teams/20061/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,89 +17,99 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +176,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,93 +327,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -372,35 +335,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po
index deff3793f..428d17b55 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Martin Ristovski , 2018\n"
 "Language-Team: Macedonian (https://www.transifex.com/calamares/teams/20061/mk/)\n"
@@ -21,89 +21,97 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -170,72 +178,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM конфигурациониот фајл не може да се создаде"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM конфигурациониот фајл {!s} не постои"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM конфигурациониот фајл не може да се создаде"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM конфигурациониот фајл {!s} не постои"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM конфигурациониот фајл не може да се создаде"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM конфигурациониот фајл {!s} не постои"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Не може да се подеси LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Нема инсталирано LightDM поздравувач"
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM конфигурациониот фајл не може да се создаде"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM конфигурациониот фајл {!s} не постои"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Немате избрано дисплеј менаџер за displaymanager модулот."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -281,91 +329,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -374,35 +337,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM конфигурациониот фајл не може да се создаде"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM конфигурациониот фајл {!s} не постои"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM конфигурациониот фајл не може да се создаде"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM конфигурациониот фајл {!s} не постои"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM конфигурациониот фајл не може да се создаде"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM конфигурациониот фајл {!s} не постои"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Не може да се подеси LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Нема инсталирано LightDM поздравувач"
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM конфигурациониот фајл не може да се создаде"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM конфигурациониот фајл {!s} не постои"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Немате избрано дисплеј менаџер за displaymanager модулот."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/ml/LC_MESSAGES/python.po b/lang/python/ml/LC_MESSAGES/python.po
index d786f8104..0044044f7 100644
--- a/lang/python/ml/LC_MESSAGES/python.po
+++ b/lang/python/ml/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Balasankar C , 2019\n"
 "Language-Team: Malayalam (https://www.transifex.com/calamares/teams/20061/ml/)\n"
@@ -22,89 +22,97 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "ക്രമീകരണത്തിൽ പിഴവ്"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -171,72 +179,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -282,91 +330,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -375,35 +338,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po
index 8c67b60d3..e87b45c06 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\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"
@@ -17,89 +17,97 @@ msgstr ""
 "Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +174,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,91 +325,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -370,35 +333,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/nb/LC_MESSAGES/python.po b/lang/python/nb/LC_MESSAGES/python.po
index c3eb39308..d9c72f36f 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 865ac004d9acf2568b2e4b389e0007c7_fba755c <3516cc82d94f87187da1e036e5f09e42_616112>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/calamares/teams/20061/nb/)\n"
@@ -21,89 +21,97 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Installer pakker."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -170,72 +178,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -281,91 +329,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Installer pakker."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -374,35 +337,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/ne_NP/LC_MESSAGES/python.po b/lang/python/ne_NP/LC_MESSAGES/python.po
index e30f07ad5..4889f1aaa 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\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"
@@ -17,89 +17,97 @@ msgstr ""
 "Language: ne_NP\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +174,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,91 +325,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -370,35 +333,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/nl/LC_MESSAGES/python.po b/lang/python/nl/LC_MESSAGES/python.po
index 58c874dbf..1c2df21db 100644
--- a/lang/python/nl/LC_MESSAGES/python.po
+++ b/lang/python/nl/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Adriaan de Groot , 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n"
@@ -22,95 +22,99 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB instellen."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Pakketten installeren."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Partities mounten."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Pakketten verwerken (%(count)d/ %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Pakket installeren."
+msgstr[1] "%(num)d pakketten installeren."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Pakket verwijderen."
+msgstr[1] "%(num)d pakketten verwijderen."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Netwerk-configuratie opslaan."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Configuratiefout"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"Geen hoofd mount punt is gegeven voor 
{!s}
 om te gebruiken. "
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Instellen van mkinitcpio"
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Geen partities gedefinieerd voor 
{!s}
 om te gebruiken."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Een initramfs wordt aangemaakt met mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configureer systemd services "
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Uitvoeren van mkinitfs in het doelsysteem is mislukt"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "De service kan niet worden gewijzigd"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "De afsluitcode was {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} aanroeping in chroot resulteerde in foutcode "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-"De systemd service {name!s} kon niet worden ingeschakeld."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Het systemd doel {name!s} kon niet worden ingeschakeld."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "De systemd service {name!s} kon niet worden uitgeschakeld."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "De systemd unit {name!s} kon niet worden gemaskerd."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Onbekende systemd opdrachten {command!s} en "
-"{suffix!s} voor unit {name!s}. "
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configureren van OpenRC dmcrypt service."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -178,76 +182,118 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "De bestemming \"{}\" in het doelsysteem is niet een map"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Schrijven naar het KDM-configuratiebestand is mislukt "
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configureer systemd services "
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM-configuratiebestand {!s} bestaat niet."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "De service kan niet worden gewijzigd"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Schrijven naar het LXDM-configuratiebestand is mislukt"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Het KDM-configuratiebestand {!s} bestaat niet"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Schrijven naar het LightDM-configuratiebestand is mislukt"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Het LightDM-configuratiebestand {!s} bestaat niet"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Kon LightDM niet configureren"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Geen LightDM begroeter geïnstalleerd"
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Schrijven naar het SLIM-configuratiebestand is mislukt"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Het SLIM-configuratiebestand {!s} bestaat niet"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Geen display managers geselecteerd voor de displaymanager module."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"De lijst van display-managers is leeg, zowel in de configuratie "
-"displaymanager.conf als de globale opslag."
+"systemctl {arg!s} aanroeping in chroot resulteerde in foutcode "
+"{num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Display manager configuratie was incompleet"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Instellen van mkinitcpio"
-
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
-"Geen hoofd mount punt is gegeven voor 
{!s}
 om te gebruiken. "
+"De systemd service {name!s} kon niet worden ingeschakeld."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Data aan het installeren."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Het systemd doel {name!s} kon niet worden ingeschakeld."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "De systemd service {name!s} kon niet worden uitgeschakeld."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "De systemd unit {name!s} kon niet worden gemaskerd."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Onbekende systemd opdrachten {command!s} en "
+"{suffix!s} voor unit {name!s}. "
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Voorbeeld Python-taak"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Voorbeeld Python-stap {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installeer bootloader"
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Taal en locatie instellen."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Partities mounten."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth thema instellen"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab schrijven."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -298,91 +344,6 @@ msgid ""
 msgstr ""
 "Het pad voor service {level!s} is {path!s}, welke niet bestaat"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth thema instellen"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Pakketten installeren."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Pakketten verwerken (%(count)d/ %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Pakket installeren."
-msgstr[1] "%(num)d pakketten installeren."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Pakket verwijderen."
-msgstr[1] "%(num)d pakketten verwijderen."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installeer bootloader"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Instellen van hardwareklok"
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Een initramfs wordt aangemaakt met mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Uitvoeren van mkinitfs in het doelsysteem is mislukt"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "De afsluitcode was {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "initramfs aanmaken met dracut."
@@ -391,35 +352,74 @@ msgstr "initramfs aanmaken met dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Uitvoeren van dracut op het doel is mislukt"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB instellen."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Schrijven naar het KDM-configuratiebestand is mislukt "
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM-configuratiebestand {!s} bestaat niet."
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Schrijven naar het LXDM-configuratiebestand is mislukt"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Het KDM-configuratiebestand {!s} bestaat niet"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Schrijven naar het LightDM-configuratiebestand is mislukt"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Het LightDM-configuratiebestand {!s} bestaat niet"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Kon LightDM niet configureren"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Geen LightDM begroeter geïnstalleerd"
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Schrijven naar het SLIM-configuratiebestand is mislukt"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Het SLIM-configuratiebestand {!s} bestaat niet"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Geen display managers geselecteerd voor de displaymanager module."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"De lijst van display-managers is leeg, zowel in de configuratie "
+"displaymanager.conf als de globale opslag."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Display manager configuratie was incompleet"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Instellen van initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configureren van OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Instellen van hardwareklok"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab schrijven."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Voorbeeld Python-taak"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Voorbeeld Python-stap {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Taal en locatie instellen."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Netwerk-configuratie opslaan."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Data aan het installeren."
diff --git a/lang/python/oc/LC_MESSAGES/python.po b/lang/python/oc/LC_MESSAGES/python.po
index d5e4eab06..54cdd1cd6 100644
--- a/lang/python/oc/LC_MESSAGES/python.po
+++ b/lang/python/oc/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Quentin PAGÈS, 2022\n"
 "Language-Team: Occitan (post 1500) (https://www.transifex.com/calamares/teams/20061/oc/)\n"
@@ -21,89 +21,97 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Error de configuracion"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -170,72 +178,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -281,91 +329,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -374,35 +337,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po
index 3cc4ee0a8..32e616f4f 100644
--- a/lang/python/pl/LC_MESSAGES/python.po
+++ b/lang/python/pl/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Jacob B. , 2021\n"
 "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n"
@@ -24,93 +24,103 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfiguracja GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Zainstaluj pakiety."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montowanie partycji."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Przetwarzanie pakietów (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalowanie jednego pakietu."
+msgstr[1] "Instalowanie %(num)d pakietów."
+msgstr[2] "Instalowanie %(num)d pakietów."
+msgstr[3] "Instalowanie%(num)d pakietów."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Usuwanie jednego pakietu."
+msgstr[1] "Usuwanie %(num)d pakietów."
+msgstr[2] "Usuwanie %(num)d pakietów."
+msgstr[3] "Usuwanie %(num)d pakietów."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Zapisywanie konfiguracji sieci."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Błąd konfiguracji"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"Nie znaleziono głównego punktu montowania dla 
{!s}
 do użycia."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurowanie mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nie ma zdefiniowanych partycji dla 
{!s}
 do użytku."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Tworzenie initramfs z mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguracja usług systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Nie udało się włączyć mkinitfs."
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nie można zmodyfikować usług"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Kod wyjściowy to {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Wezwanie systemctl {arg!s} w chroot zwróciło kod błędu {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nie można włączyć usługi systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nie można włączyć celu w systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nie można wyłączyć celu w systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nie można zamaskować jednostki systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Nieznana komenda systemd {command!s} oraz "
-"{suffix!s} dla jednostki {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurowanie usługi OpenRC dmcrypt."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -178,76 +188,116 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Miejsce docelowe \"{}\" w docelowym systemie nie jest katalogiem"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Nie można zapisać pliku konfiguracji KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguracja usług systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Plik konfiguracyjny KDM {!s} nie istnieje"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Nie można zmodyfikować usług"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Nie można zapisać pliku konfiguracji LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Plik konfiguracji LXDM {!s} nie istnieje"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Nie można zapisać pliku konfiguracji LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Plik konfiguracji LightDM {!s} nie istnieje"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Nie można skonfigurować LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nie zainstalowano ekranu powitalnego LightDM."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Nie można zapisać pliku konfiguracji SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Plik konfiguracji SLIM {!s} nie istnieje"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Brak wybranych menedżerów wyświetlania dla modułu displaymanager."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Lista displaymanagers jest pusta lub niezdefiniowana w globalstorage oraz "
-"displaymanager.conf."
+"Wezwanie systemctl {arg!s} w chroot zwróciło kod błędu {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Konfiguracja menedżera wyświetlania była niekompletna"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nie można włączyć usługi systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurowanie mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nie można włączyć celu w systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
-"Nie znaleziono głównego punktu montowania dla 
{!s}
 do użycia."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalowanie danych."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nie można wyłączyć celu w systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nie można zamaskować jednostki systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Nieznana komenda systemd {command!s} oraz "
+"{suffix!s} dla jednostki {name!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Zadanie fikcyjne Python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Krok fikcyjny Python {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalacja programu rozruchowego."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Konfigurowanie ustawień lokalnych."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montowanie partycji."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguracja motywu Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Zapisywanie fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -299,95 +349,6 @@ msgid ""
 "exist."
 msgstr "Ścieżka do usługi {name!s} to {path!s},  nie istnieje."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfiguracja motywu Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Zainstaluj pakiety."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Przetwarzanie pakietów (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalowanie jednego pakietu."
-msgstr[1] "Instalowanie %(num)d pakietów."
-msgstr[2] "Instalowanie %(num)d pakietów."
-msgstr[3] "Instalowanie%(num)d pakietów."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Usuwanie jednego pakietu."
-msgstr[1] "Usuwanie %(num)d pakietów."
-msgstr[2] "Usuwanie %(num)d pakietów."
-msgstr[3] "Usuwanie %(num)d pakietów."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalacja programu rozruchowego."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ustawianie zegara systemowego."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Tworzenie initramfs z mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Nie udało się włączyć mkinitfs."
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Kod wyjściowy to {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Tworzenie initramfs z dracut."
@@ -396,35 +357,74 @@ msgstr "Tworzenie initramfs z dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Nie udało się włączyć dracut."
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfiguracja GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Nie można zapisać pliku konfiguracji KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Plik konfiguracyjny KDM {!s} nie istnieje"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Nie można zapisać pliku konfiguracji LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Plik konfiguracji LXDM {!s} nie istnieje"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Nie można zapisać pliku konfiguracji LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Plik konfiguracji LightDM {!s} nie istnieje"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Nie można skonfigurować LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nie zainstalowano ekranu powitalnego LightDM."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Nie można zapisać pliku konfiguracji SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Plik konfiguracji SLIM {!s} nie istnieje"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Brak wybranych menedżerów wyświetlania dla modułu displaymanager."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Lista displaymanagers jest pusta lub niezdefiniowana w globalstorage oraz "
+"displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Konfiguracja menedżera wyświetlania była niekompletna"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Konfigurowanie initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurowanie usługi OpenRC dmcrypt."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ustawianie zegara systemowego."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisywanie fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Zadanie fikcyjne Python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Krok fikcyjny Python {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Konfigurowanie ustawień lokalnych."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Zapisywanie konfiguracji sieci."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalowanie danych."
diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po
index 6f255d14c..fdf84133a 100644
--- a/lang/python/pt_BR/LC_MESSAGES/python.po
+++ b/lang/python/pt_BR/LC_MESSAGES/python.po
@@ -4,112 +4,125 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# André Marcelo Alvarenga , 2020
 # Guilherme Marçal Silva, 2022
+# André Marcelo Alvarenga , 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Guilherme Marçal Silva, 2022\n"
+"Last-Translator: André Marcelo Alvarenga , 2022\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurar GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalar pacotes."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montando partições."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Processando pacotes (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Erro interno ao montar datasets zfs"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando um pacote."
+msgstr[1] "Instalando %(num)d pacotes."
+msgstr[2] "Instalando %(num)d pacotes."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Falha ao importar zpool"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removendo um pacote."
+msgstr[1] "Removendo %(num)d pacotes."
+msgstr[2] "Removendo %(num)d pacotes."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Falha ao desbloquear zpool"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Erro do Gerenciador de Pacotes"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Falha ao definir o ponto de montagem zfs"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"O gerenciador de pacotes não pôde preparar as atualizações. O comando "
+"
{!s}
 retornou o código de erro {!s}."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"O gerenciador de pacotes não pôde atualizar o sistema. O comando "
+"
{!s}
 retornou o código de erro {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"O gerenciador de pacotes não pôde fazer mudanças no sistema instalado. O "
+"comando 
{!s}
 retornou o código de erro {!s}."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Salvando configuração de rede."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Erro de Configuração."
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"Nenhum ponto de montagem para o root fornecido para uso por 
{!s}
."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Sem partições definidas para uso por 
{!s}
."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "erro de montagem zfs"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Criando initramfs com mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar serviços do systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Falha ao executar mkinitfs no alvo"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Não é possível modificar o serviço"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "O código de saída foi {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"A chamada systemctl {arg!s} no chroot retornou o código de erro"
-" {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Não é possível habilitar o serviço {name!s} do systemd."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Não é possível habilitar o alvo {name!s} do systemd."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "Não foi possível ativar o cronômetro systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Não é possível desabilitar o alvo {name!s} do systemd."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Não é possível mascarar a unidade {name!s} do systemd."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Comandos desconhecidos do systemd {command!s} e "
-"{suffix!s} para a unidade {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando serviço dmcrypt do OpenRC."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -177,77 +190,122 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "A destinação \"{}\" no sistema de destino não é um diretório"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Não foi possível gravar o arquivo de configuração do KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar serviços do systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "O arquivo de configuração {!s} do KDM não existe"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Não é possível modificar o serviço"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Não foi possível gravar o arquivo de configuração do LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "O arquivo de configuração {!s} do LXDM não existe"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Não foi possível gravar o arquivo de configuração do LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "O arquivo de configuração {!s} do LightDM não existe"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Não é possível configurar o LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Não há nenhuma tela de login do LightDM instalada."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Não foi possível gravar o arquivo de configuração do SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "O arquivo de configuração {!s} do SLIM não existe"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-"Nenhum gerenciador de exibição selecionado para o módulo do displaymanager."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"A lista de displaymanagers está vazia ou indefinida em ambos globalstorage e"
-" displaymanager.conf."
+"A chamada systemctl {arg!s} no chroot retornou o código de erro"
+" {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "A configuração do gerenciador de exibição está incompleta"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Não é possível habilitar o serviço {name!s} do systemd."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Não é possível habilitar o alvo {name!s} do systemd."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "Não foi possível ativar o cronômetro systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Não é possível desabilitar o alvo {name!s} do systemd."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Não é possível mascarar a unidade {name!s} do systemd."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Nenhum ponto de montagem para o root fornecido para uso por 
{!s}
."
+"Comandos desconhecidos do systemd {command!s} e "
+"{suffix!s} para a unidade {name!s}."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando os dados."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa modelo python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Etapa modelo python {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar carregador de inicialização."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Falha ao instalar o grub, não há partições definidas no armazenamento global"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Erro de instalação do carregador de inicialização"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"O carregador de inicialização não pôde ser instalado. O comando de "
+"instalação 
{!s}
 retornou o código de erro {!s}."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Configurando locais."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montando partições."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Erro interno ao montar datasets zfs"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Falha ao importar zpool"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Falha ao desbloquear zpool"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Falha ao definir o ponto de montagem zfs"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "erro de montagem zfs"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Escrevendo fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"Nenhuma configuração 
{!s}
 é dada para que 
{!s}
 possa "
+"utilizar."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -301,100 +359,6 @@ msgid ""
 msgstr ""
 "O caminho para o serviço {name!s} é {path!s}, que não existe."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema do Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalar pacotes."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processando pacotes (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando um pacote."
-msgstr[1] "Instalando %(num)d pacotes."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removendo um pacote."
-msgstr[1] "Removendo %(num)d pacotes."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Erro do Gerenciador de Pacotes"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"O gerenciador de pacotes não pôde preparar as atualizações. O comando "
-"
{!s}
 retornou o código de erro {!s}."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"O gerenciador de pacotes não pôde atualizar o sistema. O comando "
-"
{!s}
 retornou o código de erro {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"O gerenciador de pacotes não pôde fazer mudanças no sistema instalado. O "
-"comando 
{!s}
 retornou o código de erro {!s}."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar carregador de inicialização."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Falha ao instalar o grub, não há partições definidas no armazenamento global"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Erro de instalação do carregador de inicialização"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"O carregador de inicialização não pôde ser instalado. O comando de "
-"instalação 
{!s}
 retornou o código de erro {!s}."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando relógio de hardware."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Criando initramfs com mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Falha ao executar mkinitfs no alvo"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "O código de saída foi {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Criando initramfs com dracut."
@@ -403,37 +367,75 @@ msgstr "Criando initramfs com dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Erro ao executar dracut no alvo"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Não foi possível gravar o arquivo de configuração do KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "O arquivo de configuração {!s} do KDM não existe"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Não foi possível gravar o arquivo de configuração do LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "O arquivo de configuração {!s} do LXDM não existe"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Não foi possível gravar o arquivo de configuração do LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "O arquivo de configuração {!s} do LightDM não existe"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Não é possível configurar o LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Não há nenhuma tela de login do LightDM instalada."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Não foi possível gravar o arquivo de configuração do SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "O arquivo de configuração {!s} do SLIM não existe"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+"Nenhum gerenciador de exibição selecionado para o módulo do displaymanager."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"A lista de displaymanagers está vazia ou indefinida em ambos globalstorage e"
+" displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "A configuração do gerenciador de exibição está incompleta"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Configurando initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando serviço dmcrypt do OpenRC."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando relógio de hardware."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escrevendo fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"Nenhuma configuração 
{!s}
 é dada para que 
{!s}
 possa "
-"utilizar."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa modelo python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Etapa modelo python {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Configurando locais."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Salvando configuração de rede."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalando os dados."
diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po
index d8ea3bbb8..92a0037dd 100644
--- a/lang/python/pt_PT/LC_MESSAGES/python.po
+++ b/lang/python/pt_PT/LC_MESSAGES/python.po
@@ -5,112 +5,124 @@
 # 
 # Translators:
 # Nuno Amorim , 2018
-# Ricardo Simões , 2020
 # Hugo Carvalho , 2022
+# Ricardo Simões , 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Hugo Carvalho , 2022\n"
+"Last-Translator: Ricardo Simões , 2022\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurar o GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalar pacotes."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "A montar partições."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "A processar pacotes (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Erro interno ao montar os conjuntos de dados zfs"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "A instalar um pacote."
+msgstr[1] "A instalar %(num)d pacotes."
+msgstr[2] "A instalar %(num)d pacotes."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Falha ao importar zpool"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "A remover um pacote."
+msgstr[1] "A remover %(num)d pacotes."
+msgstr[2] "A remover %(num)d pacotes."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Falha ao desbloquear zpool"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Erro do gestor de pacotes"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Falha ao definir o ponto de montagem zfs"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"O gestor de pacotes não conseguiu preparar atualizações. O comando "
+"
{!s}
 apresentou o código de erro {!s}."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"O gestor de pacotes não conseguiu atualizar o sistema. O comando "
+"
{!s}
 apresentou o código de erro {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"O gestor de pacotes não pôde fazer alterações ao sistema instalado. O "
+"comando 
{!s}
devolveu o código de erro {!s}."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "A guardar a configuração de rede."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Erro de configuração"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Nenhum ponto de montagem root é fornecido para 
{!s}
 usar."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "A configurar o mkintcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nenhuma partição está definida para 
{!s}
 usar."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "erro de montagem zfs"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "A criar o initramfs com o mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar serviços systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Falha ao executar o mkintfs no destino"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Não é possível modificar serviço"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "O código de saída foi {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chamar pelo chroot retornou com código de "
-"erro {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Não é possível ativar o serviço systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Não é possível ativar o destino do systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "Não é possível ativar o temporizador systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Não é possível desativar o destino do systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Não é possível mascarar a unidade do systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Comandos do systemd desconhecidos {command!s} e "
-"{suffix!s} por unidade {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "A configurar o serviço OpenRC dmcrypt."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -180,76 +192,122 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "O destino \"{}\" no sistema de destino não é um diretório"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Não é possível gravar o ficheiro de configuração KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar serviços systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "O ficheiro de configuração do KDM {!s} não existe"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Não é possível modificar serviço"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Não é possível gravar o ficheiro de configuração LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "O ficheiro de configuração do LXDM {!s} não existe"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Não é possível gravar o ficheiro de configuração LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "O ficheiro de configuração do LightDM {!s} não existe"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Não é possível configurar o LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nenhum ecrã de boas-vindas LightDM instalado."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Não é possível gravar o ficheiro de configuração SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "O ficheiro de configuração do SLIM {!s} não existe"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-"Nenhum gestor de exibição selecionado para o módulo de gestor de exibição."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"A lista de gestores de visualização está vazia ou indefinida tanto no "
-"globalstorage como no displaymanager.conf."
+"systemctl {arg!s} chamar pelo chroot retornou com código de "
+"erro {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "A configuração do gestor de exibição estava incompleta"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Não é possível ativar o serviço systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "A configurar o mkintcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Não é possível ativar o destino do systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Nenhum ponto de montagem root é fornecido para 
{!s}
 usar."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "Não é possível ativar o temporizador systemd {name!s}."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "A instalar dados."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Não é possível desativar o destino do systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Não é possível mascarar a unidade do systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Comandos do systemd desconhecidos {command!s} e "
+"{suffix!s} por unidade {name!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa Dummy python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Passo Dummy python {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar o carregador de arranque."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Falha ao instalar o grub, sem partições definidas no armazenamento global"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Erro de instalação do carregador de arranque"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Não foi possível instalar o carregador de arranque. O comando de instalação "
+"
{!s}
 apresentou o código de erro {!s}."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "A configurar a localização."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "A montar partições."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Erro interno ao montar os conjuntos de dados zfs"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Falha ao importar zpool"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Falha ao desbloquear zpool"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Falha ao definir o ponto de montagem zfs"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "erro de montagem zfs"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "A escrever o fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"Não é dada nenhuma configuração 
{!s}
 para 
{!s}
 "
+"utilizar."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -303,100 +361,6 @@ msgid ""
 msgstr ""
 "O caminho para o serviço {name!s} é {path!s}, que não existe."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema do Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalar pacotes."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "A processar pacotes (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "A instalar um pacote."
-msgstr[1] "A instalar %(num)d pacotes."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "A remover um pacote."
-msgstr[1] "A remover %(num)d pacotes."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Erro do gestor de pacotes"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"O gestor de pacotes não conseguiu preparar atualizações. O comando "
-"
{!s}
 apresentou o código de erro {!s}."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"O gestor de pacotes não conseguiu atualizar o sistema. O comando "
-"
{!s}
 apresentou o código de erro {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"O gestor de pacotes não pôde fazer alterações ao sistema instalado. O "
-"comando 
{!s}
devolveu o código de erro {!s}."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar o carregador de arranque."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Falha ao instalar o grub, sem partições definidas no armazenamento global"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Erro de instalação do carregador de arranque"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Não foi possível instalar o carregador de arranque. O comando de instalação "
-"
{!s}
 apresentou o código de erro {!s}."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "A definir o relógio do hardware."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "A criar o initramfs com o mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Falha ao executar o mkintfs no destino"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "O código de saída foi {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Criando o initramfs com o dracut."
@@ -405,37 +369,75 @@ msgstr "Criando o initramfs com o dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Falha ao executar o dracut no destino"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar o GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Não é possível gravar o ficheiro de configuração KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "O ficheiro de configuração do KDM {!s} não existe"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Não é possível gravar o ficheiro de configuração LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "O ficheiro de configuração do LXDM {!s} não existe"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Não é possível gravar o ficheiro de configuração LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "O ficheiro de configuração do LightDM {!s} não existe"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Não é possível configurar o LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nenhum ecrã de boas-vindas LightDM instalado."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Não é possível gravar o ficheiro de configuração SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "O ficheiro de configuração do SLIM {!s} não existe"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+"Nenhum gestor de exibição selecionado para o módulo de gestor de exibição."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"A lista de gestores de visualização está vazia ou indefinida tanto no "
+"globalstorage como no displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "A configuração do gestor de exibição estava incompleta"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "A configurar o initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "A configurar o serviço OpenRC dmcrypt."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "A definir o relógio do hardware."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "A escrever o fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"Não é dada nenhuma configuração 
{!s}
 para 
{!s}
 "
-"utilizar."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa Dummy python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Passo Dummy python {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "A configurar a localização."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "A guardar a configuração de rede."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "A instalar dados."
diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po
index 2df9052d9..65b77c595 100644
--- a/lang/python/ro/LC_MESSAGES/python.po
+++ b/lang/python/ro/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Chele Ion , 2021\n"
 "Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n"
@@ -23,89 +23,99 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalează pachetele."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Se procesează pachetele (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalează un pachet."
+msgstr[1] "Se instalează %(num)d pachete."
+msgstr[2] "Se instalează %(num)d din pachete."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Se elimină un pachet."
+msgstr[1] "Se elimină %(num)d pachet."
+msgstr[2] "Se elimină %(num)d de pachete."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Eroare de configurare"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Nu este definită o partiţie rădăcină pentru 1{!s}1 ."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nu sunt partiţii  definite ca  1{!s}1 ."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -172,72 +182,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Nu este definită o partiţie rădăcină pentru 1{!s}1 ."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Job python fictiv."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -283,93 +333,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalează pachetele."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Se procesează pachetele (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalează un pachet."
-msgstr[1] "Se instalează %(num)d pachete."
-msgstr[2] "Se instalează %(num)d din pachete."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Se elimină un pachet."
-msgstr[1] "Se elimină %(num)d pachet."
-msgstr[2] "Se elimină %(num)d de pachete."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -378,35 +341,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Configurare initramfs"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Job python fictiv."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po
index 1cbe0c995..10fdbe702 100644
--- a/lang/python/ru/LC_MESSAGES/python.po
+++ b/lang/python/ru/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: ZIzA, 2020\n"
 "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n"
@@ -22,91 +22,102 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Настройте GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Установить пакеты."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Монтирование разделов."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Обработка пакетов (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Установка одного пакета."
+msgstr[1] "Установка %(num)d пакетов."
+msgstr[2] "Установка %(num)d пакетов."
+msgstr[3] "Установка %(num)d пакетов."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Удаление одного пакета."
+msgstr[1] "Удаление %(num)d пакетов."
+msgstr[2] "Удаление %(num)d пакетов."
+msgstr[3] "Удаление %(num)d пакетов."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Сохранение настроек сети."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Ошибка конфигурации"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Не определены разделы для использования 
{!S}
."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Настройка systemd сервисов"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Не могу изменить сервис"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Вызов systemctl {arg!s} в chroot вернул код ошибки {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Код выхода {}"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Настройка службы OpenRC dmcrypt."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -172,73 +183,114 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr ""
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Настройка systemd сервисов"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr ""
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Не могу изменить сервис"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Вызов systemctl {arg!s} в chroot вернул код ошибки {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Установка данных."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Установить загрузчик."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Настройка языка."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Монтирование разделов."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Настроить тему Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Запись fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -283,95 +335,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Настроить тему Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Установить пакеты."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Обработка пакетов (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Установка одного пакета."
-msgstr[1] "Установка %(num)d пакетов."
-msgstr[2] "Установка %(num)d пакетов."
-msgstr[3] "Установка %(num)d пакетов."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Удаление одного пакета."
-msgstr[1] "Удаление %(num)d пакетов."
-msgstr[2] "Удаление %(num)d пакетов."
-msgstr[3] "Удаление %(num)d пакетов."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Установить загрузчик."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Установка аппаратных часов."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Код выхода {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Создание initramfs с помощью dracut."
@@ -380,35 +343,72 @@ msgstr "Создание initramfs с помощью dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Не удалось запустить dracut на цели"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Настройте GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Настройка initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Настройка службы OpenRC dmcrypt."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Установка аппаратных часов."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Запись fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Настройка языка."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Сохранение настроек сети."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Установка данных."
diff --git a/lang/python/si/LC_MESSAGES/python.po b/lang/python/si/LC_MESSAGES/python.po
index 3582bcc8e..844eef117 100644
--- a/lang/python/si/LC_MESSAGES/python.po
+++ b/lang/python/si/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Sandaruwan Samaraweera, 2022\n"
 "Language-Team: Sinhala (https://www.transifex.com/calamares/teams/20061/si/)\n"
@@ -22,93 +22,104 @@ msgstr ""
 "Language: si\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB වින්‍යාස කරන්න."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "ඇසුරුම් ස්ථාපනය කරන්න."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "කොටස් සවි කිරීම."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "පැකේජ සැකසීම (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "zfs දත්ත කට්ටල සවිකිරීමේ අභ්‍යන්තර දෝෂයකි"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "ඇසුරුමක් ස්ථාපනය වෙමින්."
+msgstr[1] "ඇසුරුම් %(num)d ක් ස්ථාපනය වෙමින්."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "zpool ආයාත කිරීමට අසමත් විය"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "ඇසුරුමක් ඉවත් වෙමින්."
+msgstr[1] "ඇසුරුම් %(num)d ක් ඉවත් වෙමින්."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "zpool අගුලු හැරීමට අසමත් විය"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "පැකේජ කළමනාකරු දෝෂයකි"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "zfs සවිකිරීමේ ලක්ෂ්‍යය සැකසීමට අසමත් විය"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"පැකේජ කළමනාකරුට යාවත්කාලීන සකස් කිරීමට නොහැකි විය. විධානය 
{!s}
 "
+"දෝෂ කේතය {!s} ලබා දුන්නේය."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"පැකේජ කළමනාකරුට පද්ධතිය යාවත්කාලීන කළ නොහැකි විය. විධානය 
{!s}
 දෝෂ"
+" කේතය {!s} ලබා දුන්නේය."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"පැකේජ කළමනාකරුට ස්ථාපිත පද්ධතියට වෙනස්කම් සිදු කළ නොහැක. විධානය "
+"
{!s}
 දෝෂ කේතය {!s} ලබා දුන්නේය."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "ජාල වින්‍යාසය සුරැකෙමින්."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "වින්‍යාස දෝෂය"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "{!s} සඳහා භාවිතා කිරීමට root mount point ලබා දී නොමැත."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio වින්‍යාස කරමින්."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "{!s} සඳහා භාවිතා කිරීමට කිසිදු කොටස් නිර්වචනය කර නොමැත."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs සවිකිරීමේ දෝෂයකි"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs සමඟ initramfs නිර්මාණය කිරීම."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd සේවා වින්‍යාස කරන්න"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "ඉලක්කය මත mkinitfs ධාවනය කිරීමට අසමත් විය"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "සේවාව වෙනස් කළ නොහැක"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "පිටවීමේ කේතය වූයේ {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chroot වෙත ඇමතුමක් ලබා දුන් දෝෂ කේතය {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "systemd සේවාව {name!s} සබල කළ නොහැක."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd ඉලක්කය {name!s} සබල කළ නොහැක."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "systemd ටයිමරය {name!s} සබල කළ නොහැක."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd ඉලක්කය {name!s} අක්‍රිය කළ නොහැක."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd ඒකකය {name!s} වසන් කළ නොහැක."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"{name!s} ඒකකය සඳහා නොදන්නා systemd විධාන {command!s} සහ "
-"{suffix!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt සේවාව වින්‍යාස කරමින්."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -176,75 +187,120 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "ඉලක්ක පද්ධතියේ \"{}\" ගමනාන්තය නාමාවලියක් නොවේ"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM වින්‍යාස ගොනුව ලිවිය නොහැක"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd සේවා වින්‍යාස කරන්න"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM වින්‍යාස ගොනුව {!s} නොපවතී"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "සේවාව වෙනස් කළ නොහැක"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM වින්‍යාස ගොනුව ලිවිය නොහැක"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM වින්‍යාස ගොනුව {!s} නොපවතී"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM වින්‍යාස ගොනුව ලිවිය නොහැක"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM වින්‍යාස ගොනුව {!s} නොපවතී"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM වින්‍යාස කළ නොහැක"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM ග්‍රීටර් ස්ථාපනය කර නැත."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM වින්‍යාස ගොනුව ලිවිය නොහැක"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM වින්‍යාස ගොනුව {!s} නොපවතී"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "සංදර්ශක කළමනාකරු මොඩියුලය සඳහා සංදර්ශක කළමනාකරුවන් තෝරාගෙන නොමැත."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"ගෝලීය ගබඩාව සහ displaymanager.conf යන දෙකෙහිම සංදර්ශක කළමනාකරු ලැයිස්තුව "
-"හිස් හෝ අර්ථ දක්වා නොමැත."
+"systemctl {arg!s} chroot වෙත ඇමතුමක් ලබා දුන් දෝෂ කේතය {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "සංදර්ශක කළමනාකරු වින්‍යාසය අසම්පූර්ණ විය"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "systemd සේවාව {name!s} සබල කළ නොහැක."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio වින්‍යාස කරමින්."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd ඉලක්කය {name!s} සබල කළ නොහැක."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "{!s} සඳහා භාවිතා කිරීමට root mount point ලබා දී නොමැත."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "systemd ටයිමරය {name!s} සබල කළ නොහැක."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "දත්ත ස්ථාපනය වෙමින්."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd ඉලක්කය {name!s} අක්‍රිය කළ නොහැක."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd ඒකකය {name!s} වසන් කළ නොහැක."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"{name!s} ඒකකය සඳහා නොදන්නා systemd විධාන {command!s} සහ "
+"{suffix!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "ඩමි python වැඩසටහන."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "ව්‍යාජ python පියවර {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "bootloader ස්ථාපනය කරන්න."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Grub ස්ථාපනය කිරීමට අපොහොසත් විය, ගෝලීය ආචයනය තුළ කොටස් අර්ථ දක්වා නොමැත"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Bootloader ස්ථාපනය කිරීමේ දෝෂයකි"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"ඇරඹුම් කාරකය ස්ථාපනය කල නොහැක. ස්ථාපන විධානය 
{!s}
 දෝෂ කේතය {!s} "
+"ලබා දුන්නේය."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "ස්ථාන වින්‍යාස කිරීම."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "කොටස් සවි කිරීම."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "zfs දත්ත කට්ටල සවිකිරීමේ අභ්‍යන්තර දෝෂයකි"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "zpool ආයාත කිරීමට අසමත් විය"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "zpool අගුලු හැරීමට අසමත් විය"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "zfs සවිකිරීමේ ලක්ෂ්‍යය සැකසීමට අසමත් විය"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs සවිකිරීමේ දෝෂයකි"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth තේමාව වින්‍යාස කරන්න"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab ලියමින්."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"භාවිතා කිරීමට 
{!s}
 සඳහා 
{!s}
 වින්‍යාසයක් ලබා දී නොමැත."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -292,100 +348,6 @@ msgid ""
 "exist."
 msgstr "සේවාව සඳහා {name!s} මාර්ගය {path!s}, එය නොපවතී."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth තේමාව වින්‍යාස කරන්න"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "ඇසුරුම් ස්ථාපනය කරන්න."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "පැකේජ සැකසීම (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "ඇසුරුමක් ස්ථාපනය වෙමින්."
-msgstr[1] "ඇසුරුම් %(num)d ක් ස්ථාපනය වෙමින්."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "ඇසුරුමක් ඉවත් වෙමින්."
-msgstr[1] "ඇසුරුම් %(num)d ක් ඉවත් වෙමින්."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "පැකේජ කළමනාකරු දෝෂයකි"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"පැකේජ කළමනාකරුට යාවත්කාලීන සකස් කිරීමට නොහැකි විය. විධානය 
{!s}
 "
-"දෝෂ කේතය {!s} ලබා දුන්නේය."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"පැකේජ කළමනාකරුට පද්ධතිය යාවත්කාලීන කළ නොහැකි විය. විධානය 
{!s}
 දෝෂ"
-" කේතය {!s} ලබා දුන්නේය."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"පැකේජ කළමනාකරුට ස්ථාපිත පද්ධතියට වෙනස්කම් සිදු කළ නොහැක. විධානය "
-"
{!s}
 දෝෂ කේතය {!s} ලබා දුන්නේය."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "bootloader ස්ථාපනය කරන්න."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Grub ස්ථාපනය කිරීමට අපොහොසත් විය, ගෝලීය ආචයනය තුළ කොටස් අර්ථ දක්වා නොමැත"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Bootloader ස්ථාපනය කිරීමේ දෝෂයකි"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"ඇරඹුම් කාරකය ස්ථාපනය කල නොහැක. ස්ථාපන විධානය 
{!s}
 දෝෂ කේතය {!s} "
-"ලබා දුන්නේය."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "දෘඩාංග ඔරලෝසුව සැකසෙමින්."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs සමඟ initramfs නිර්මාණය කිරීම."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "ඉලක්කය මත mkinitfs ධාවනය කිරීමට අසමත් විය"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "පිටවීමේ කේතය වූයේ {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "dracut සමඟ initramfs නිර්මාණය කිරීම."
@@ -394,36 +356,74 @@ msgstr "dracut සමඟ initramfs නිර්මාණය කිරීම."
 msgid "Failed to run dracut on the target"
 msgstr "ඉලක්කය මත ඩ්‍රැකට් ධාවනය කිරීමට අපොහොසත් විය"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB වින්‍යාස කරන්න."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM වින්‍යාස ගොනුව ලිවිය නොහැක"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM වින්‍යාස ගොනුව {!s} නොපවතී"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM වින්‍යාස ගොනුව ලිවිය නොහැක"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM වින්‍යාස ගොනුව {!s} නොපවතී"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM වින්‍යාස ගොනුව ලිවිය නොහැක"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM වින්‍යාස ගොනුව {!s} නොපවතී"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM වින්‍යාස කළ නොහැක"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM ග්‍රීටර් ස්ථාපනය කර නැත."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM වින්‍යාස ගොනුව ලිවිය නොහැක"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM වින්‍යාස ගොනුව {!s} නොපවතී"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "සංදර්ශක කළමනාකරු මොඩියුලය සඳහා සංදර්ශක කළමනාකරුවන් තෝරාගෙන නොමැත."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"ගෝලීය ගබඩාව සහ displaymanager.conf යන දෙකෙහිම සංදර්ශක කළමනාකරු ලැයිස්තුව "
+"හිස් හෝ අර්ථ දක්වා නොමැත."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "සංදර්ශක කළමනාකරු වින්‍යාසය අසම්පූර්ණ විය"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "initramfs වින්‍යාස කිරීම."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt සේවාව වින්‍යාස කරමින්."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "දෘඩාංග ඔරලෝසුව සැකසෙමින්."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab ලියමින්."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"භාවිතා කිරීමට 
{!s}
 සඳහා 
{!s}
 වින්‍යාසයක් ලබා දී නොමැත."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "ඩමි python වැඩසටහන."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "ව්‍යාජ python පියවර {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "ස්ථාන වින්‍යාස කිරීම."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "ජාල වින්‍යාසය සුරැකෙමින්."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "දත්ත ස්ථාපනය වෙමින්."
diff --git a/lang/python/sk/LC_MESSAGES/python.po b/lang/python/sk/LC_MESSAGES/python.po
index d65b5d050..b5747608f 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Dušan Kazik , 2020\n"
 "Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n"
@@ -21,94 +21,102 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurácia zavádzača GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Inštalácia balíkov."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Pripájanie oddielov."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Spracovávajú sa balíky (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Inštaluje sa jeden balík."
+msgstr[1] "Inštalujú sa %(num)d balíky."
+msgstr[2] "Inštaluje sa %(num)d balíkov."
+msgstr[3] "Inštaluje sa %(num)d balíkov."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Odstraňuje sa jeden balík."
+msgstr[1] "Odstraňujú sa %(num)d balíky."
+msgstr[2] "Odstraňuje sa %(num)d balíkov."
+msgstr[3] "Odstraňuje sa %(num)d balíkov."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Ukladanie sieťovej konfigurácie."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Chyba konfigurácie"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Nie je zadaný žiadny bod pripojenia na použitie pre 
{!s}
."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurácia mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nie sú určené žiadne oddiely na použitie pre 
{!s}
."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurácia služieb systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nedá sa upraviť služba"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Volanie systemctl {arg!s} in prostredí chroot vrátilo chybový "
-"kód {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nedá sa povoliť služba systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nedá sa povoliť cieľ systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nedá sa zakázať cieľ systému systemd {name!s}."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Kód skončenia bol {}"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nedá sa zamaskovať jednotka systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
-"Neznáme príkazy systému systemd {command!s} a "
-"{suffix!s} pre jednotku {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -174,73 +182,117 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Cieľ \"{}\" v cieľovom systéme nie je adresárom"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Nedá sa zapísať konfiguračný súbor správcu KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurácia služieb systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Konfiguračný súbor správcu KDM {!s} neexistuje"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Nedá sa upraviť služba"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Nedá sa zapísať konfiguračný súbor správcu LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Konfiguračný súbor správcu LXDM {!s} neexistuje"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Nedá sa zapísať konfiguračný súbor správcu LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Konfiguračný súbor správcu LightDM {!s} neexistuje"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Nedá s nakonfigurovať správca LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nie je nainštalovaný žiadny vítací nástroj LightDM."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Nedá sa zapísať konfiguračný súbor správcu SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Konfiguračný súbor správcu SLIM {!s} neexistuje"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Neboli vybraní žiadni správcovia zobrazenia pre modul displaymanager."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Volanie systemctl {arg!s} in prostredí chroot vrátilo chybový "
+"kód {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nedá sa povoliť služba systému systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nedá sa povoliť cieľ systému systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Konfigurácia správcu zobrazenia nebola úplná"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nedá sa zakázať cieľ systému systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurácia mkinitcpio."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nedá sa zamaskovať jednotka systému systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Nie je zadaný žiadny bod pripojenia na použitie pre 
{!s}
."
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Neznáme príkazy systému systemd {command!s} a "
+"{suffix!s} pre jednotku {name!s}."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Inštalácia údajov."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Fiktívna úloha jazyka python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Fiktívny krok {} jazyka python"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Inštalácia zavádzača."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Konfigurácia miestnych nastavení."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Pripájanie oddielov."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurácia motívu služby Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Zapisovanie fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -285,95 +337,6 @@ msgid ""
 "exist."
 msgstr "Cesta k službe {name!s} je {path!s}, ale neexistuje."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurácia motívu služby Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Inštalácia balíkov."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Spracovávajú sa balíky (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Inštaluje sa jeden balík."
-msgstr[1] "Inštalujú sa %(num)d balíky."
-msgstr[2] "Inštaluje sa %(num)d balíkov."
-msgstr[3] "Inštaluje sa %(num)d balíkov."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Odstraňuje sa jeden balík."
-msgstr[1] "Odstraňujú sa %(num)d balíky."
-msgstr[2] "Odstraňuje sa %(num)d balíkov."
-msgstr[3] "Odstraňuje sa %(num)d balíkov."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Inštalácia zavádzača."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nastavovanie hardvérových hodín."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Kód skončenia bol {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Vytváranie initramfs pomocou nástroja dracut."
@@ -382,35 +345,72 @@ msgstr "Vytváranie initramfs pomocou nástroja dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Zlyhalo spustenie nástroja dracut v cieli"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurácia zavádzača GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Nedá sa zapísať konfiguračný súbor správcu KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Konfiguračný súbor správcu KDM {!s} neexistuje"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Nedá sa zapísať konfiguračný súbor správcu LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Konfiguračný súbor správcu LXDM {!s} neexistuje"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Nedá sa zapísať konfiguračný súbor správcu LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Konfiguračný súbor správcu LightDM {!s} neexistuje"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Nedá s nakonfigurovať správca LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nie je nainštalovaný žiadny vítací nástroj LightDM."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Nedá sa zapísať konfiguračný súbor správcu SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Konfiguračný súbor správcu SLIM {!s} neexistuje"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Neboli vybraní žiadni správcovia zobrazenia pre modul displaymanager."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Konfigurácia správcu zobrazenia nebola úplná"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Konfigurácia initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr ""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nastavovanie hardvérových hodín."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisovanie fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Fiktívna úloha jazyka python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Fiktívny krok {} jazyka python"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Konfigurácia miestnych nastavení."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Ukladanie sieťovej konfigurácie."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Inštalácia údajov."
diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po
index 137c6a7c2..8e3792933 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\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"
@@ -17,89 +17,101 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +178,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,95 +329,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -374,35 +337,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po
index d1ee7ec51..3be6c94f9 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Besnik Bleta , 2022\n"
 "Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n"
@@ -21,94 +21,105 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Formësoni GRUB-in."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalo paketa."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Po montohen pjesë."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Po përpunohen paketat (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Gabim i brendshëm gjatë montimit të grupeve zfs të të dhënave"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Po instalohet një paketë."
+msgstr[1] "Po instalohen %(num)d paketa."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "S’u arrit të importohej zpool"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Po hiqet një paketë."
+msgstr[1] "Po hiqen %(num)d paketa."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "S’u arrit të shkyçej zpool"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Gabim Përgjegjësi Paketash"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "S’u arrit të caktohej pikë montimi zfs"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’përgatiti dot përditësime. Urdhri 
{!s}
 u"
+" përgjigj me kod gabimi {!s}."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’përditësoi dot sistemin. Urdhri 
{!s}
 u "
+"përgjigj me kod gabimi {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’bëri dot ndryshime te sistemi i instaluar. Urdhri "
+"
{!s}
 u përgjigj me kod gabimi {!s}."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Po ruhet formësimi i rrjetit."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Gabim Formësimi"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"S’është dhënë pikë montimi rrënjë për 
{!s}
 për t’u përdorur."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Po formësohet mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "S’ka pjesë të përkufizuara për 
{!s}
 për t’u përdorur."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "Gabim montimi zfs"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Po krijohet initramfs me mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Formësoni shërbime systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "S’u arrit të xhirohej mkinitfs te objektivi"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "S’modifikohet dot shërbimi"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Kodi i daljes qe {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Thirrja systemctl {arg!s} në chroot u përgjigj me kod gabimi "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "S’aktivizohet dot shërbimi systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "S’aktivizohet dot objektivi systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "S’aktivizohet dot kohëmatës systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "S’çaktivizohet dot objektivi systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "S’maskohet dot njësia systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Urdhra të panjohur systemd {command!s} dhe "
-"{suffix!s} për njësi {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Po formësohet shërbim OpenRC dmcrypt."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -177,76 +188,121 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Destinacioni \"{}\" te sistemi i synuar s’është drejtori"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "S’shkruhet dot kartelë formësimi KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Formësoni shërbime systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "S’ekziston kartelë formësimi KDM {!s}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "S’modifikohet dot shërbimi"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "S’shkruhet dot kartelë formësimi LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "S’ekziston kartelë formësimi LXDM {!s}"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "S’shkruhet dot kartelë formësimi LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "S’ekziston kartelë formësimi LightDM {!s}"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "S’formësohet dot LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "S’ka të instaluar përshëndetës LightDM."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "S’shkruhet dot kartelë formësimi SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "S’ekziston kartelë formësimi SLIM {!s}"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "S’janë përzgjedhur përgjegjës ekrani për modulin displaymanager."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Lista “displaymanagers” është e zbrazët ose e papërkufizuar për të dy "
-"rastet, për “globalstorage” dhe për “displaymanager.conf”."
+"Thirrja systemctl {arg!s} në chroot u përgjigj me kod gabimi "
+"{num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Formësimi i përgjegjësit të ekranit s’qe i plotë"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "S’aktivizohet dot shërbimi systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Po formësohet mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "S’aktivizohet dot objektivi systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "S’aktivizohet dot kohëmatës systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "S’çaktivizohet dot objektivi systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "S’maskohet dot njësia systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"S’është dhënë pikë montimi rrënjë për 
{!s}
 për t’u përdorur."
+"Urdhra të panjohur systemd {command!s} dhe "
+"{suffix!s} për njësi {name!s}."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Po instalohen të dhëna."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Akt python dummy."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Hap python {} dummy"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalo ngarkues nisjesh."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"S'u arrit të instalohej grub, te depozita globale s’ka të përkufizuara pjesë"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Gabim instalimi Ngarkuesi Nisësi"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Ngarkuesi i nisësit s’u instalua dot. Urdhri i instalimit 
{!s}
 u "
+"përgjigj me kod gabimi {!s}."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Po formësohen vendoret."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Po montohen pjesë."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Gabim i brendshëm gjatë montimit të grupeve zfs të të dhënave"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "S’u arrit të importohej zpool"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "S’u arrit të shkyçej zpool"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "S’u arrit të caktohej pikë montimi zfs"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "Gabim montimi zfs"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Formësoni temën Plimuth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Po shkruhet fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"S’është dhënë formësim 
{!s}
 për t’u përdorur nga 
{!s}
."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -299,100 +355,6 @@ msgstr ""
 "Shtegu për shërbimin {name!s} është {path!s}, i cili nuk "
 "ekziston."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Formësoni temën Plimuth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalo paketa."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Po përpunohen paketat (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Po instalohet një paketë."
-msgstr[1] "Po instalohen %(num)d paketa."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Po hiqet një paketë."
-msgstr[1] "Po hiqen %(num)d paketa."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Gabim Përgjegjësi Paketash"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Përgjegjësi i paketave s’përgatiti dot përditësime. Urdhri 
{!s}
 u"
-" përgjigj me kod gabimi {!s}."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Përgjegjësi i paketave s’përditësoi dot sistemin. Urdhri 
{!s}
 u "
-"përgjigj me kod gabimi {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Përgjegjësi i paketave s’bëri dot ndryshime te sistemi i instaluar. Urdhri "
-"
{!s}
 u përgjigj me kod gabimi {!s}."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalo ngarkues nisjesh."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"S'u arrit të instalohej grub, te depozita globale s’ka të përkufizuara pjesë"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Gabim instalimi Ngarkuesi Nisësi"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Ngarkuesi i nisësit s’u instalua dot. Urdhri i instalimit 
{!s}
 u "
-"përgjigj me kod gabimi {!s}."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Po caktohet ora hardware."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Po krijohet initramfs me mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "S’u arrit të xhirohej mkinitfs te objektivi"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Kodi i daljes qe {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Po krijohet initramfs me dracut."
@@ -401,36 +363,74 @@ msgstr "Po krijohet initramfs me dracut."
 msgid "Failed to run dracut on the target"
 msgstr "S’u arrit të xhirohej dracut mbi objektivin"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Formësoni GRUB-in."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "S’shkruhet dot kartelë formësimi KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "S’ekziston kartelë formësimi KDM {!s}"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "S’shkruhet dot kartelë formësimi LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "S’ekziston kartelë formësimi LXDM {!s}"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "S’shkruhet dot kartelë formësimi LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "S’ekziston kartelë formësimi LightDM {!s}"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "S’formësohet dot LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "S’ka të instaluar përshëndetës LightDM."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "S’shkruhet dot kartelë formësimi SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "S’ekziston kartelë formësimi SLIM {!s}"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "S’janë përzgjedhur përgjegjës ekrani për modulin displaymanager."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Lista “displaymanagers” është e zbrazët ose e papërkufizuar për të dy "
+"rastet, për “globalstorage” dhe për “displaymanager.conf”."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Formësimi i përgjegjësit të ekranit s’qe i plotë"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Po formësohet initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Po formësohet shërbim OpenRC dmcrypt."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Po caktohet ora hardware."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Po shkruhet fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"S’është dhënë formësim 
{!s}
 për t’u përdorur nga 
{!s}
."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Akt python dummy."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Hap python {} dummy"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Po formësohen vendoret."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Po ruhet formësimi i rrjetit."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Po instalohen të dhëna."
diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po
index a2ba8f651..606b71e62 100644
--- a/lang/python/sr/LC_MESSAGES/python.po
+++ b/lang/python/sr/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Slobodan Simić , 2020\n"
 "Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n"
@@ -21,89 +21,99 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Подеси ГРУБ"
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Монтирање партиција."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Упис поставе мреже."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Грешка поставе"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Подеси „systemd“ сервисе"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Не могу да мењам сервис"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -170,73 +180,113 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr ""
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Подеси „systemd“ сервисе"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr ""
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Не могу да мењам сервис"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Инсталирање података."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Подешавање локалитета."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Монтирање партиција."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Уписивање fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -281,93 +331,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -376,35 +339,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Подеси ГРУБ"
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Уписивање fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Подешавање локалитета."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Упис поставе мреже."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Инсталирање података."
diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po
index c9b4d0e53..804c3269f 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\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"
@@ -17,89 +17,99 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +176,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,93 +327,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -372,35 +335,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po
index a84f39922..560440a62 100644
--- a/lang/python/sv/LC_MESSAGES/python.po
+++ b/lang/python/sv/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Luna Jernberg , 2022\n"
 "Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n"
@@ -23,94 +23,105 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurera GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Installera paket."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Monterar partitioner."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Bearbetar paket (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Internt fel vid montering av zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installerar ett paket."
+msgstr[1] "Installerar %(num)d paket."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Misslyckades att importera zpool"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Tar bort ett paket."
+msgstr[1] "Tar bort %(num)d paket."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Misslyckades att låsa upp zpool"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Pakethanterare fel"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Misslyckades att ställa in zfs monteringspunkt "
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Pakethanteraren kunde inte förbereda uppdateringar kommandot 
{!s}
"
+" returnerade felkod {!s}."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Pakethanteraren kunde inte uppdatera systemet. kommandot 
{!s}
 "
+"returnerade felkod {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Pakethanteraren kunde inte göra ändringar till det installerade systemet. "
+"kommandot 
{!s}
 returnerade felkod {!s}."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Sparar nätverkskonfiguration."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Konfigurationsfel"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"Ingen root monteringspunkt är angiven för 
{!s}
 att använda."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerar mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Inga partitioner är definerade för 
{!s}
 att använda."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs monteringsfel"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Skapar initramfs med mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurera systemd tjänster"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Misslyckades att köra mkinitfs på målet "
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Kunde inte modifiera tjänst"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Felkoden var {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Anrop till systemctl {arg!s}i chroot returnerade felkod "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Kunde inte aktivera systemd tjänst {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Kunde inte aktivera systemd målsystem {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "Kunde inte aktivera systemd timer {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Kunde inte inaktivera systemd målsystem {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Kan inte maskera systemd unit {name!s}"
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Okända systemd kommandon {command!s} och {suffix!s} för "
-"enhet {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurerar OpenRC dmcrypt tjänst."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -178,76 +189,123 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Destinationen \"{}\" på målsystemet är inte en katalog"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Misslyckades med att skriva KDM konfigurationsfil"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurera systemd tjänster"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM konfigurationsfil {!s} existerar inte"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Kunde inte modifiera tjänst"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Misslyckades med att skriva LXDM konfigurationsfil"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM konfigurationsfil {!s} existerar inte"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Misslyckades med att skriva LightDM konfigurationsfil"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM konfigurationsfil {!s} existerar inte"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Kunde inte konfigurera LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Ingen LightDM greeter installerad."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Misslyckades med att SLIM konfigurationsfil"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM konfigurationsfil {!s} existerar inte"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Ingen skärmhanterare vald för displaymanager modulen."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Skärmhanterar listan är tom eller odefinierad i både globalstorage och "
-"displaymanager.conf."
+"Anrop till systemctl {arg!s}i chroot returnerade felkod "
+"{num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Konfiguration för displayhanteraren var inkomplett"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Kunde inte aktivera systemd tjänst {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurerar mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Kunde inte aktivera systemd målsystem {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "Kunde inte aktivera systemd timer {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Kunde inte inaktivera systemd målsystem {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Kan inte maskera systemd unit {name!s}"
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Ingen root monteringspunkt är angiven för 
{!s}
 att använda."
+"Okända systemd kommandon {command!s} och {suffix!s} för "
+"enhet {name!s}."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installerar data."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Exempel python jobb"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Exempel python steg {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installera starthanterare."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Det gick inte att installera grub, inga partitioner definierade i global "
+"lagring"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Starthanterare installationsfel"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Starthanterare kunde inte installeras. Installationskommandot "
+"
{!s}
returnerade felkod {!s}."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Konfigurerar språkinställningar"
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Monterar partitioner."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Internt fel vid montering av zfs datasets"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Misslyckades att importera zpool"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Misslyckades att låsa upp zpool"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Misslyckades att ställa in zfs monteringspunkt "
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs monteringsfel"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurera Plymouth tema"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Skriver fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"Ingen 
{!s}
 konfiguration är angiven för 
{!s}
 att "
+"använda. "
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -299,101 +357,6 @@ msgid ""
 msgstr ""
 "Sökvägen för tjänst {name!s} är {path!s}, som inte existerar."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurera Plymouth tema"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Installera paket."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Bearbetar paket (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installerar ett paket."
-msgstr[1] "Installerar %(num)d paket."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Tar bort ett paket."
-msgstr[1] "Tar bort %(num)d paket."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Pakethanterare fel"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Pakethanteraren kunde inte förbereda uppdateringar kommandot 
{!s}
"
-" returnerade felkod {!s}."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Pakethanteraren kunde inte uppdatera systemet. kommandot 
{!s}
 "
-"returnerade felkod {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Pakethanteraren kunde inte göra ändringar till det installerade systemet. "
-"kommandot 
{!s}
 returnerade felkod {!s}."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installera starthanterare."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Det gick inte att installera grub, inga partitioner definierade i global "
-"lagring"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Starthanterare installationsfel"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Starthanterare kunde inte installeras. Installationskommandot "
-"
{!s}
returnerade felkod {!s}."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ställer hårdvaruklockan."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Skapar initramfs med mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Misslyckades att köra mkinitfs på målet "
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Felkoden var {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Skapar initramfs med dracut."
@@ -402,37 +365,74 @@ msgstr "Skapar initramfs med dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Misslyckades att köra dracut på målet "
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurera GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Misslyckades med att skriva KDM konfigurationsfil"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM konfigurationsfil {!s} existerar inte"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Misslyckades med att skriva LXDM konfigurationsfil"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM konfigurationsfil {!s} existerar inte"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Misslyckades med att skriva LightDM konfigurationsfil"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM konfigurationsfil {!s} existerar inte"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Kunde inte konfigurera LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Ingen LightDM greeter installerad."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Misslyckades med att SLIM konfigurationsfil"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM konfigurationsfil {!s} existerar inte"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Ingen skärmhanterare vald för displaymanager modulen."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Skärmhanterar listan är tom eller odefinierad i både globalstorage och "
+"displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Konfiguration för displayhanteraren var inkomplett"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Konfigurerar initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerar OpenRC dmcrypt tjänst."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ställer hårdvaruklockan."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Skriver fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"Ingen 
{!s}
 konfiguration är angiven för 
{!s}
 att "
-"använda. "
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Exempel python jobb"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Exempel python steg {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Konfigurerar språkinställningar"
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Sparar nätverkskonfiguration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installerar data."
diff --git a/lang/python/ta_IN/LC_MESSAGES/python.po b/lang/python/ta_IN/LC_MESSAGES/python.po
index 6c1dc8338..c66526df3 100644
--- a/lang/python/ta_IN/LC_MESSAGES/python.po
+++ b/lang/python/ta_IN/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Tamil (India) (https://www.transifex.com/calamares/teams/20061/ta_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,89 +17,97 @@ msgstr ""
 "Language: ta_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +174,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,91 +325,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -370,35 +333,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/te/LC_MESSAGES/python.po b/lang/python/te/LC_MESSAGES/python.po
index 5c4331c87..2586f68c1 100644
--- a/lang/python/te/LC_MESSAGES/python.po
+++ b/lang/python/te/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Telugu (https://www.transifex.com/calamares/teams/20061/te/)\n"
 "MIME-Version: 1.0\n"
@@ -17,89 +17,97 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +174,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,91 +325,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -370,35 +333,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/tg/LC_MESSAGES/python.po b/lang/python/tg/LC_MESSAGES/python.po
index ac9141a2b..9d979414c 100644
--- a/lang/python/tg/LC_MESSAGES/python.po
+++ b/lang/python/tg/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Victor Ibragimov , 2020\n"
 "Language-Team: Tajik (https://www.transifex.com/calamares/teams/20061/tg/)\n"
@@ -21,94 +21,98 @@ msgstr ""
 "Language: tg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Танзимоти GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Насбкунии қуттиҳо."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Васлкунии қисмҳои диск."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Коргузории қуттиҳо (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Насбкунии як баста."
+msgstr[1] "Насбкунии %(num)d баста."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Тозакунии як баста"
+msgstr[1] "Тозакунии %(num)d баста."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Нигоҳдории танзимоти шабака."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Хатои танзимкунӣ"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Нуқтаи васли реша (root) барои истифодаи 
{!s}
 дода нашуд."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Танзимкунии mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Ягон қисми диск барои истифодаи 
{!s}
 муайян карда нашуд."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Эҷодкунии initramfs бо mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Танзимоти хидматҳои systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "mkinitfs дар низоми интихобшуда иҷро нашуд"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Хидмат тағйир дода намешавад"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Рамзи барориш: {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Дархости systemctl {arg!s} дар chroot рамзи хатои {num!s}-ро ба"
-" вуҷуд овард."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Хидмати systemd-и {name!s} фаъол карда намешавад."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Интихоби systemd-и {name!s} фаъол карда намешавад."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Интихоби systemd-и {name!s} ғайрифаъол карда намешавад."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Воҳиди systemd-и {name!s} пинҳон карда намешавад."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Фармонҳои systemd-и номаълум {command!s} ва "
-"{suffix!s} барои воҳиди {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Танзимкунии хидмати OpenRC dmcrypt."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -174,75 +178,117 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Ҷойи таъиноти \"{}\" дар низоми интихобшуда феҳрист намебошад"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Файли танзимии KDM сабт карда намешавад"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Танзимоти хидматҳои systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Файли танзимии KDM {!s} вуҷуд надорад"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Хидмат тағйир дода намешавад"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Файли танзимии LXDM сабт карда намешавад"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Файли танзимии LXDM {!s} вуҷуд надорад"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Файли танзимии LightDM сабт карда намешавад"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Файли танзимии LightDM {!s} вуҷуд надорад"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM танзим карда намешавад"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Хушомади LightDM насб нашудааст."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Файли танзимии SLIM сабт карда намешавад"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Файли танзимии SLIM {!s} вуҷуд надорад"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Ягон мудири намоиш барои модули displaymanager интихоб нашудааст."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Рӯйхати displaymanagers ҳам дар globalstorage ва ҳам дар displaymanager.conf"
-" холӣ ё номаълум аст."
+"Дархости systemctl {arg!s} дар chroot рамзи хатои {num!s}-ро ба"
+" вуҷуд овард."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Раванди танзимкунии мудири намоиш ба анҷом нарасид"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Хидмати systemd-и {name!s} фаъол карда намешавад."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Танзимкунии mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Интихоби systemd-и {name!s} фаъол карда намешавад."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Нуқтаи васли реша (root) барои истифодаи 
{!s}
 дода нашуд."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Насбкунии иттилоот."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Интихоби systemd-и {name!s} ғайрифаъол карда намешавад."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Воҳиди systemd-и {name!s} пинҳон карда намешавад."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Фармонҳои systemd-и номаълум {command!s} ва "
+"{suffix!s} барои воҳиди {name!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Вазифаи амсилаи python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Қадами амсилаи python {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Насбкунии боркунандаи роҳандозӣ."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Танзимкунии маҳаллигардониҳо."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Васлкунии қисмҳои диск."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Танзимоти мавзӯи Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Сабткунии fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -295,91 +341,6 @@ msgstr ""
 "Масир барои хидмати {name!s} аз {path!s} иборат аст, аммо он "
 "вуҷуд надорад."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Танзимоти мавзӯи Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Насбкунии қуттиҳо."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Коргузории қуттиҳо (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Насбкунии як баста."
-msgstr[1] "Насбкунии %(num)d баста."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Тозакунии як баста"
-msgstr[1] "Тозакунии %(num)d баста."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Насбкунии боркунандаи роҳандозӣ."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Танзимкунии соати сахтафзор."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Эҷодкунии initramfs бо mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "mkinitfs дар низоми интихобшуда иҷро нашуд"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Рамзи барориш: {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Эҷодкунии initramfs бо dracut."
@@ -388,35 +349,74 @@ msgstr "Эҷодкунии initramfs бо dracut."
 msgid "Failed to run dracut on the target"
 msgstr "dracut дар низоми интихобшуда иҷро нашуд"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Танзимоти GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Файли танзимии KDM сабт карда намешавад"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Файли танзимии KDM {!s} вуҷуд надорад"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Файли танзимии LXDM сабт карда намешавад"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Файли танзимии LXDM {!s} вуҷуд надорад"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Файли танзимии LightDM сабт карда намешавад"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Файли танзимии LightDM {!s} вуҷуд надорад"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM танзим карда намешавад"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Хушомади LightDM насб нашудааст."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Файли танзимии SLIM сабт карда намешавад"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Файли танзимии SLIM {!s} вуҷуд надорад"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Ягон мудири намоиш барои модули displaymanager интихоб нашудааст."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Рӯйхати displaymanagers ҳам дар globalstorage ва ҳам дар displaymanager.conf"
+" холӣ ё номаълум аст."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Раванди танзимкунии мудири намоиш ба анҷом нарасид"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Танзимкунии initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Танзимкунии хидмати OpenRC dmcrypt."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Танзимкунии соати сахтафзор."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Сабткунии fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Вазифаи амсилаи python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Қадами амсилаи python {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Танзимкунии маҳаллигардониҳо."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Нигоҳдории танзимоти шабака."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Насбкунии иттилоот."
diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po
index 6f20497fe..bb7f4bc58 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\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"
@@ -17,89 +17,95 @@ msgstr ""
 "Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +172,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,89 +323,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -368,35 +331,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po
index 1eeea5904..e6d7191fb 100644
--- a/lang/python/tr_TR/LC_MESSAGES/python.po
+++ b/lang/python/tr_TR/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Demiray Muhterem , 2022\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n"
@@ -22,94 +22,104 @@ msgstr ""
 "Language: tr_TR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB'u yapılandır."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Paketleri yükle"
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Disk bölümlemeleri bağlanıyor."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Paketler işleniyor (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Dahili bağlama hatası zfs veri kümeleri"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "%(num)d paket yükleniyor"
+msgstr[1] "%(num)d paket yükleniyor"
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "zpool içe aktarılamadı"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "%(num)d paket kaldırılıyor."
+msgstr[1] "%(num)d paket kaldırılıyor."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "zpool kilidi açılamadı"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Paket Yöneticisi hatası"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "zfs bağlama noktası ayarlanamadı"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Paket yöneticisi güncellemeleri hazırlayamadı. 
{!s}
 komutu {!s} "
+"hata kodunu döndürdü."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Paket yöneticisi sistemi güncelleyemedi. 
{!s}
 komutu {!s} hata "
+"kodunu döndürdü."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Paket yöneticisi kurulu sistemde değişiklik yapamadı. 
{!s}
 komutu"
+" {!s} hata kodunu döndürdü."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Ağ yapılandırması kaydediliyor."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Yapılandırma Hatası"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "
{!s}
 kullanması için kök bağlama noktası verilmedi."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Mkinitcpio yapılandırılıyor."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "
{!s}
 kullanması için hiçbir bölüm tanımlanmadı."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs bağlama hatası"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Mkinitfs ile initramfs oluşturuluyor."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd hizmetlerini yapılandır"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hedefte mkinitfs çalıştırılamadı"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Hizmet değiştirilemiyor"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıkış kodu {} idi"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chroot çağrısında hata kodu döndürüldü "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Systemd hizmeti etkinleştirilemiyor {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Systemd hedefi etkinleştirilemiyor {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "{name!s} sistem zamanlayıcısı etkinleştirilemiyor."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Systemd hedefi devre dışı bırakılamıyor {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Systemd birimi maskeleyemiyor {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Bilinmeyen sistem komutları {command!s} ve "
-"{suffix!s}  {name!s} birimi için."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt hizmeti yapılandırılıyor."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -176,75 +186,121 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Hedef sistemdeki \"{}\" hedefi bir dizin değil"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM yapılandırma dosyası yazılamıyor"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd hizmetlerini yapılandır"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM yapılandırma dosyası {!s} mevcut değil"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Hizmet değiştirilemiyor"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM yapılandırma dosyası yazılamıyor"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM yapılandırma dosyası {!s} mevcut değil"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM yapılandırma dosyası yazılamıyor"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM yapılandırma dosyası {!s} mevcut değil"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM yapılandırılamıyor"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM karşılama yüklü değil."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM yapılandırma dosyası yazılamıyor"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM yapılandırma dosyası {!s} mevcut değil"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Ekran yöneticisi modülü için ekran yöneticisi seçilmedi."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Displaymanagers listesi hem globalstorage hem de displaymanager.conf'ta boş "
-"veya tanımsız."
+"systemctl {arg!s} chroot çağrısında hata kodu döndürüldü "
+"{num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Ekran yöneticisi yapılandırma işi tamamlanamadı"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Systemd hizmeti etkinleştirilemiyor {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Mkinitcpio yapılandırılıyor."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Systemd hedefi etkinleştirilemiyor {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "
{!s}
 kullanması için kök bağlama noktası verilmedi."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "{name!s} sistem zamanlayıcısı etkinleştirilemiyor."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Veri yükleniyor."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Systemd hedefi devre dışı bırakılamıyor {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Systemd birimi maskeleyemiyor {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Bilinmeyen sistem komutları {command!s} ve "
+"{suffix!s}  {name!s} birimi için."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükleyici kuruluyor"
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "Grub yüklenemedi, genel depolamada tanımlı bölüm yok"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Önyükleyici yükleme hatası"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Önyükleyici yüklenemedi. Kurulum komutu 
{!s}
, {!s} hata kodunu "
+"döndürdü."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Sistem yerelleri yapılandırılıyor."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Disk bölümlemeleri bağlanıyor."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Dahili bağlama hatası zfs veri kümeleri"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "zpool içe aktarılamadı"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "zpool kilidi açılamadı"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "zfs bağlama noktası ayarlanamadı"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs bağlama hatası"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth temasını yapılandır"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Fstab dosyasına yazılıyor."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"
{!s}
'nin kullanması için 
{!s}
 yapılandırması "
+"verilmemiştir."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -293,99 +349,6 @@ msgid ""
 "exist."
 msgstr "{name!s} hizmetinin yolu {path!s}, ki mevcut değil."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth temasını yapılandır"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Paketleri yükle"
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Paketler işleniyor (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "%(num)d paket yükleniyor"
-msgstr[1] "%(num)d paket yükleniyor"
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "%(num)d paket kaldırılıyor."
-msgstr[1] "%(num)d paket kaldırılıyor."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Paket Yöneticisi hatası"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Paket yöneticisi güncellemeleri hazırlayamadı. 
{!s}
 komutu {!s} "
-"hata kodunu döndürdü."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Paket yöneticisi sistemi güncelleyemedi. 
{!s}
 komutu {!s} hata "
-"kodunu döndürdü."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Paket yöneticisi kurulu sistemde değişiklik yapamadı. 
{!s}
 komutu"
-" {!s} hata kodunu döndürdü."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükleyici kuruluyor"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "Grub yüklenemedi, genel depolamada tanımlı bölüm yok"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Önyükleyici yükleme hatası"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Önyükleyici yüklenemedi. Kurulum komutu 
{!s}
, {!s} hata kodunu "
-"döndürdü."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Donanım saati ayarlanıyor."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Mkinitfs ile initramfs oluşturuluyor."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hedefte mkinitfs çalıştırılamadı"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıkış kodu {} idi"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Dracut ile initramfs oluşturuluyor."
@@ -394,37 +357,74 @@ msgstr "Dracut ile initramfs oluşturuluyor."
 msgid "Failed to run dracut on the target"
 msgstr "Hedef üzerinde dracut çalıştırılamadı"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB'u yapılandır."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM yapılandırma dosyası yazılamıyor"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM yapılandırma dosyası {!s} mevcut değil"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM yapılandırma dosyası yazılamıyor"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM yapılandırma dosyası {!s} mevcut değil"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM yapılandırma dosyası yazılamıyor"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM yapılandırma dosyası {!s} mevcut değil"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM yapılandırılamıyor"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM karşılama yüklü değil."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM yapılandırma dosyası yazılamıyor"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM yapılandırma dosyası {!s} mevcut değil"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Ekran yöneticisi modülü için ekran yöneticisi seçilmedi."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Displaymanagers listesi hem globalstorage hem de displaymanager.conf'ta boş "
+"veya tanımsız."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Ekran yöneticisi yapılandırma işi tamamlanamadı"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Initramfs yapılandırılıyor."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt hizmeti yapılandırılıyor."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Donanım saati ayarlanıyor."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Fstab dosyasına yazılıyor."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"
{!s}
'nin kullanması için 
{!s}
 yapılandırması "
-"verilmemiştir."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Sistem yerelleri yapılandırılıyor."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Ağ yapılandırması kaydediliyor."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Veri yükleniyor."
diff --git a/lang/python/uk/LC_MESSAGES/python.po b/lang/python/uk/LC_MESSAGES/python.po
index 73a7aae47..a42d98710 100644
--- a/lang/python/uk/LC_MESSAGES/python.po
+++ b/lang/python/uk/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Yuri Chornoivan , 2022\n"
 "Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n"
@@ -23,94 +23,109 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Налаштовування GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Встановити пакети."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Монтування розділів."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Обробляємо пакунки (%(count)d з %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Внутрішня помилка під час монтування наборів даних zfs"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Встановлюємо %(num)d пакунок."
+msgstr[1] "Встановлюємо %(num)d пакунки."
+msgstr[2] "Встановлюємо %(num)d пакунків."
+msgstr[3] "Встановлюємо один пакунок."
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Не вдалося імпортувати zpool"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Вилучаємо %(num)d пакунок."
+msgstr[1] "Вилучаємо %(num)d пакунки."
+msgstr[2] "Вилучаємо %(num)d пакунків."
+msgstr[3] "Вилучаємо один пакунок."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Не вдалося розблокувати zpool"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Помилка засобу керування пакунками"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Не вдалося встановити точку монтування zfs"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Засобу керування пакунками не вдалося приготувати оновлення. Програмою "
+"
{!s}
 повернуто код помилки {!s}."
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Засобу керування пакунками не вдалося оновити систему. Програмою "
+"
{!s}
 повернуто код помилки {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Засобу керування пакунками не вдалося внести зміну до встановленої системи. "
+"Програмою 
{!s}
 повернуто код помилки {!s}."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Зберігаємо налаштування мережі."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Помилка налаштовування"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"Не вказано кореневої точки монтування для використання у 
{!s}
."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Налаштовуємо mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Не визначено розділів для використання 
{!s}
."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "Помилка монтування zfs"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Створення initramfs за допомогою mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Налаштуйте служби systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Не вдалося виконати mkinitfs над призначенням"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Не вдалося змінити службу"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Код виходу — {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Внаслідок виклику systemctl {arg!s} у chroot було повернуто "
-"повідомлення з кодом помилки {num! s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Не вдалося ввімкнути службу systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Не вдалося ввімкнути завдання systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "Не вдалося ввімкнути таймер systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Не вдалося вимкнути завдання systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Не вдалося замаскувати вузол systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Невідомі команди systemd {command!s} та {suffix!s}"
-" для пристрою {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Налаштовуємо службу dmcrypt OpenRC."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -179,76 +194,122 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Призначення «{}» у цільовій системі не є каталогом"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Не вдалося записати файл налаштувань KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Налаштуйте служби systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Файла налаштувань KDM {!s} не існує"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Не вдалося змінити службу"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Не вдалося виконати запис до файла налаштувань LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Файла налаштувань LXDM {!s} не існує"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Не вдалося виконати запис до файла налаштувань LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Файла налаштувань LightDM {!s} не існує"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Не вдалося налаштувати LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Засіб входу до системи LightDM не встановлено."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Не вдалося виконати запис до файла налаштувань SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Файла налаштувань SLIM {!s} не існує"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "Не вибрано засобу керування дисплеєм для модуля displaymanager."
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Список засобів керування дисплеєм є порожнім або невизначеним у "
-"bothglobalstorage та displaymanager.conf."
+"Внаслідок виклику systemctl {arg!s} у chroot було повернуто "
+"повідомлення з кодом помилки {num! s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Налаштування засобу керування дисплеєм є неповними"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Не вдалося ввімкнути службу systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Налаштовуємо mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Не вдалося ввімкнути завдання systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "Не вдалося ввімкнути таймер systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Не вдалося вимкнути завдання systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Не вдалося замаскувати вузол systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Не вказано кореневої точки монтування для використання у 
{!s}
."
+"Невідомі команди systemd {command!s} та {suffix!s}"
+" для пристрою {name!s}."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Встановлюємо дані."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Фіктивне завдання python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Фіктивний крок python {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Встановити завантажувач."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Не вдалося встановити grub — на загальному сховищі даних не визначено "
+"розділів"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Помилка встановлення завантажувача"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Не вдалося встановити завантажувач. Програмою для встановлення "
+"
{!s}
 повернуто код помилки {!s}."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Налаштовуємо локалі."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Монтування розділів."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Внутрішня помилка під час монтування наборів даних zfs"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Не вдалося імпортувати zpool"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Не вдалося розблокувати zpool"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Не вдалося встановити точку монтування zfs"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "Помилка монтування zfs"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Налаштувати тему Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Записуємо fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"Не надано налаштувань 
{!s}
 для використання у 
{!s}
."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -301,105 +362,6 @@ msgstr ""
 "Шляхом до служби {name!s} вказано {path!s}. Такого шляху не "
 "існує."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Налаштувати тему Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Встановити пакети."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Обробляємо пакунки (%(count)d з %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Встановлюємо %(num)d пакунок."
-msgstr[1] "Встановлюємо %(num)d пакунки."
-msgstr[2] "Встановлюємо %(num)d пакунків."
-msgstr[3] "Встановлюємо один пакунок."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Вилучаємо %(num)d пакунок."
-msgstr[1] "Вилучаємо %(num)d пакунки."
-msgstr[2] "Вилучаємо %(num)d пакунків."
-msgstr[3] "Вилучаємо один пакунок."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Помилка засобу керування пакунками"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Засобу керування пакунками не вдалося приготувати оновлення. Програмою "
-"
{!s}
 повернуто код помилки {!s}."
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Засобу керування пакунками не вдалося оновити систему. Програмою "
-"
{!s}
 повернуто код помилки {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Засобу керування пакунками не вдалося внести зміну до встановленої системи. "
-"Програмою 
{!s}
 повернуто код помилки {!s}."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Встановити завантажувач."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Не вдалося встановити grub — на загальному сховищі даних не визначено "
-"розділів"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Помилка встановлення завантажувача"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Не вдалося встановити завантажувач. Програмою для встановлення "
-"
{!s}
 повернуто код помилки {!s}."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Встановлюємо значення для апаратного годинника."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Створення initramfs за допомогою mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Не вдалося виконати mkinitfs над призначенням"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Код виходу — {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Створюємо initramfs за допомогою dracut."
@@ -408,36 +370,74 @@ msgstr "Створюємо initramfs за допомогою dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Не вдалося виконати dracut над призначенням"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Налаштовування GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Не вдалося записати файл налаштувань KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Файла налаштувань KDM {!s} не існує"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Не вдалося виконати запис до файла налаштувань LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Файла налаштувань LXDM {!s} не існує"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Не вдалося виконати запис до файла налаштувань LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Файла налаштувань LightDM {!s} не існує"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Не вдалося налаштувати LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Засіб входу до системи LightDM не встановлено."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Не вдалося виконати запис до файла налаштувань SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Файла налаштувань SLIM {!s} не існує"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Не вибрано засобу керування дисплеєм для модуля displaymanager."
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Список засобів керування дисплеєм є порожнім або невизначеним у "
+"bothglobalstorage та displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Налаштування засобу керування дисплеєм є неповними"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Налаштовуємо initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Налаштовуємо службу dmcrypt OpenRC."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Встановлюємо значення для апаратного годинника."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Записуємо fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"Не надано налаштувань 
{!s}
 для використання у 
{!s}
."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Фіктивне завдання python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Фіктивний крок python {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Налаштовуємо локалі."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Зберігаємо налаштування мережі."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Встановлюємо дані."
diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po
index 1f273d45c..c9c16f8ac 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: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\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"
@@ -17,89 +17,97 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +174,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,91 +325,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -370,35 +333,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po
index fe2b4dfb6..78dcbfd22 100644
--- a/lang/python/vi/LC_MESSAGES/python.po
+++ b/lang/python/vi/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: th1nhhdk , 2021\n"
 "Language-Team: Vietnamese (https://www.transifex.com/calamares/teams/20061/vi/)\n"
@@ -22,93 +22,96 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Cấu hình GRUB"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Đang cài đặt các gói ứng dụng."
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Đang gắn kết các phân vùng."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Đang xử lý gói (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Đang cài đặt %(num)d gói ứng dụng."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Đang gỡ bỏ %(num)d gói ứng dụng."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Đang lưu cấu hình mạng."
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "Lỗi cấu hình"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Không có điểm kết nối gốc cho 
{!s}
 để dùng."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Đang cấu hình mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Không có phân vùng nào được định nghĩa cho 
{!s}
 để dùng."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Đang tạo initramfs bằng mkinitfs."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Cấu hình các dịch vụ systemd"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Chạy mkinitfs thất bại ở hệ thống đích"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Không thể sửa đổi dịch vụ"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Mã lỗi trả về là {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} trong môi trường chroot trả về lỗi {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Không thể bật dịch vụ systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Không thể bật nhóm dịch vụ systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Không thể tắt nhóm dịch vụ systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Không thể đánh dấu đơn vị systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Không nhận ra lệnh systemd {command!s} và "
-"{suffix!s} cho đơn vị {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Đang cấu hình dịch vụ OpenRC dmcrypt."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -174,76 +177,118 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Hệ thống đích \"{}\" không phải là một thư mục"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Không thể ghi vào tập tin cấu hình KDM"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Cấu hình các dịch vụ systemd"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Tập tin cấu hình KDM {!s} không tồn tại"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Không thể sửa đổi dịch vụ"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Không thể ghi vào tập tin cấu hình LXDM"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Tập tin cấu hình LXDM {!s} không tồn tại"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Không thể ghi vào tập tin cấu hình LightDM"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Tập tin cấu hình LightDM {!s} không tồn tại"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Không thể cấu hình LXDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Màn hình chào mừng LightDM không được cài đặt."
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Không thể ghi vào tập tin cấu hình SLIM"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Tập tin cấu hình SLIM {!s} không tồn tại"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-"Không có trình quản lý hiển thị nào được chọn cho mô-đun quản lý hiển thị"
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Danh sách quản lý hiện thị trống hoặc không được định nghĩa cả trong "
-"globalstorage và displaymanager.conf."
+"systemctl {arg!s} trong môi trường chroot trả về lỗi {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "Cầu hình quản lý hiện thị không hoàn tất"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Không thể bật dịch vụ systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Đang cấu hình mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Không thể bật nhóm dịch vụ systemd {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Không có điểm kết nối gốc cho 
{!s}
 để dùng."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Đang cài đặt dữ liệu."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Không thể tắt nhóm dịch vụ systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Không thể đánh dấu đơn vị systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Không nhận ra lệnh systemd {command!s} và "
+"{suffix!s} cho đơn vị {name!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Ví dụ công việc python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Ví dụ python bước {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Đang cài đặt bộ khởi động."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Lỗi cài đặt trình khởi động(bootloader)"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Trình khởi động(bootloader) không thể được cài đặt. Lệnh cài đặt "
+"
{!s}
đã trả mã lỗi {!s}."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Đang cấu hình ngôn ngữ."
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Đang gắn kết các phân vùng."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Cấu hình giao diện Plymouth"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Đang viết vào fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -296,91 +341,6 @@ msgstr ""
 "Đường dẫn cho dịch vụ {name!s} là {path!s}, nhưng không tồn "
 "tại."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Cấu hình giao diện Plymouth"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Đang cài đặt các gói ứng dụng."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Đang xử lý gói (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Đang cài đặt %(num)d gói ứng dụng."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Đang gỡ bỏ %(num)d gói ứng dụng."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Đang cài đặt bộ khởi động."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Lỗi cài đặt trình khởi động(bootloader)"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Trình khởi động(bootloader) không thể được cài đặt. Lệnh cài đặt "
-"
{!s}
đã trả mã lỗi {!s}."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Đang thiết lập đồng hồ máy tính."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Đang tạo initramfs bằng mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Chạy mkinitfs thất bại ở hệ thống đích"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Mã lỗi trả về là {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "Đang tạo initramfs bằng dracut."
@@ -389,35 +349,75 @@ msgstr "Đang tạo initramfs bằng dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Chạy dracut thất bại ở hệ thống đích"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Cấu hình GRUB"
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Không thể ghi vào tập tin cấu hình KDM"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Tập tin cấu hình KDM {!s} không tồn tại"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Không thể ghi vào tập tin cấu hình LXDM"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Tập tin cấu hình LXDM {!s} không tồn tại"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Không thể ghi vào tập tin cấu hình LightDM"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Tập tin cấu hình LightDM {!s} không tồn tại"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Không thể cấu hình LXDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Màn hình chào mừng LightDM không được cài đặt."
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Không thể ghi vào tập tin cấu hình SLIM"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Tập tin cấu hình SLIM {!s} không tồn tại"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+"Không có trình quản lý hiển thị nào được chọn cho mô-đun quản lý hiển thị"
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Danh sách quản lý hiện thị trống hoặc không được định nghĩa cả trong "
+"globalstorage và displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Cầu hình quản lý hiện thị không hoàn tất"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Đang cấu hình initramfs."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Đang cấu hình dịch vụ OpenRC dmcrypt."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Đang thiết lập đồng hồ máy tính."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Đang viết vào fstab."
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Ví dụ công việc python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Ví dụ python bước {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Đang cấu hình ngôn ngữ."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Đang lưu cấu hình mạng."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Đang cài đặt dữ liệu."
diff --git a/lang/python/zh/LC_MESSAGES/python.po b/lang/python/zh/LC_MESSAGES/python.po
index 049870036..5294ee686 100644
--- a/lang/python/zh/LC_MESSAGES/python.po
+++ b/lang/python/zh/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Chinese (https://www.transifex.com/calamares/teams/20061/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -17,89 +17,95 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +172,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,89 +323,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -368,35 +331,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po
index eb39baf6f..cbed0f87b 100644
--- a/lang/python/zh_CN/LC_MESSAGES/python.po
+++ b/lang/python/zh_CN/LC_MESSAGES/python.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 玉堂白鹤 , 2022\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n"
@@ -26,92 +26,96 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "配置 GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "安装软件包。"
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "挂载分区。"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "软件包处理中（%(count)d/%(total)d）"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "装载 zfs 数据集时出现内部错误"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "安装%(num)d软件包。"
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "导入 zpool 失败"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "移除%(num)d软件包。"
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "解锁 zpool 失败"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "软件包管理器错误"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "设置 zfs 挂载点失败"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr "软件包管理器无法准备更新。命令
{!s}
返回错误代码{!s}。"
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr "软件包管理器无法更新系统。命令
{!s}
返回错误代码{!s}。"
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr "软件包管理器无法对已安装的系统进行更改。命令
{!s}
返回错误代码{!s}。"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "正在保存网络配置。"
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "配置错误"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr " 未设置 
{!s}
 要使用的根挂载点。"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "配置 mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "没有分配分区给 
{!s}
。"
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs 挂载出错"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "正在用 mkinitfs 创建initramfs。"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "配置 systemd 服务"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "无法在目标中运行 mkinitfs"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "无法修改服务"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "退出码是 {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot 中的 systemctl {arg!s} 命令返回错误 {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "无法启用 systemd 服务 {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "无法启用 systemd 目标 {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "无法启用 systemd 计时器 {name!s}。"
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "无法禁用 systemd 目标 {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "无法屏蔽 systemd 单元 {name!s}."
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"未知的 systemd 命令 {command!s} 和 {name!s}  单元前缀 "
-"{suffix!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "配置 OpenRC dmcrypt 服务。"
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -177,73 +181,115 @@ msgstr "寻找 unsquashfs 失败，请确定您已安装 squashfs-tools 软体
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "目标系统中的 \"{}\" 不是一个目录"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "无法写入 KDM 配置文件"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "配置 systemd 服务"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM 配置文件 {!s} 不存在"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "无法修改服务"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "无法写入 LXDM 配置文件"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM 配置文件 {!s} 不存在"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "无法写入 LightDM 配置文件"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM 配置文件 {!s} 不存在"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "无法配置 LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "未安装 LightDM 欢迎程序。"
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "无法写入 SLIM 配置文件"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM 配置文件 {!s} 不存在"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "显示管理器模块中未选择显示管理器。"
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
-msgstr "globalstorage 和 displaymanager.conf 配置文件中都没有配置显示管理器。"
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot 中的 systemctl {arg!s} 命令返回错误 {num!s}."
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "显示管理器配置不完全"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "无法启用 systemd 服务 {name!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "配置 mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "无法启用 systemd 目标 {name!s}."
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr " 未设置 
{!s}
 要使用的根挂载点。"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "无法启用 systemd 计时器 {name!s}。"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "安装数据."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "无法禁用 systemd 目标 {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "无法屏蔽 systemd 单元 {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"未知的 systemd 命令 {command!s} 和 {name!s}  单元前缀 "
+"{suffix!s}."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "占位 Python 任务。"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "占位 Python 步骤 {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安装启动加载器。"
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "无法安装 grub，全局存储中未定义分区"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "启动加载器安装出错"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr "无法安装启动加载器。安装命令
{!s}
返回错误代码 {!s}。"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "正在进行本地化配置。"
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "挂载分区。"
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "装载 zfs 数据集时出现内部错误"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "导入 zpool 失败"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "解锁 zpool 失败"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "设置 zfs 挂载点失败"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs 挂载出错"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "配置 Plymouth 主题"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "正在写入 fstab。"
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr "无 
{!s}
 配置可供 
{!s}
 使用。"
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -288,89 +334,6 @@ msgid ""
 "exist."
 msgstr "服务 {name!s} 的路径 {path!s} 不存在。"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "配置 Plymouth 主题"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "安装软件包。"
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "软件包处理中（%(count)d/%(total)d）"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "安装%(num)d软件包。"
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "移除%(num)d软件包。"
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "软件包管理器错误"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr "软件包管理器无法准备更新。命令
{!s}
返回错误代码{!s}。"
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr "软件包管理器无法更新系统。命令
{!s}
返回错误代码{!s}。"
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr "软件包管理器无法对已安装的系统进行更改。命令
{!s}
返回错误代码{!s}。"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "安装启动加载器。"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "无法安装 grub，全局存储中未定义分区"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "启动加载器安装出错"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr "无法安装启动加载器。安装命令
{!s}
返回错误代码 {!s}。"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "设置硬件时钟。"
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "正在用 mkinitfs 创建initramfs。"
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "无法在目标中运行 mkinitfs"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "退出码是 {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "用 dracut 创建 initramfs."
@@ -379,35 +342,72 @@ msgstr "用 dracut 创建 initramfs."
 msgid "Failed to run dracut on the target"
 msgstr "无法在目标中运行 dracut "
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "配置 GRUB."
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "无法写入 KDM 配置文件"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM 配置文件 {!s} 不存在"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "无法写入 LXDM 配置文件"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM 配置文件 {!s} 不存在"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "无法写入 LightDM 配置文件"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM 配置文件 {!s} 不存在"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "无法配置 LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "未安装 LightDM 欢迎程序。"
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "无法写入 SLIM 配置文件"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM 配置文件 {!s} 不存在"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "显示管理器模块中未选择显示管理器。"
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr "globalstorage 和 displaymanager.conf 配置文件中都没有配置显示管理器。"
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "显示管理器配置不完全"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "正在配置初始内存文件系统。"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "配置 OpenRC dmcrypt 服务。"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "设置硬件时钟。"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "正在写入 fstab。"
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr "无 
{!s}
 配置可供 
{!s}
 使用。"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "占位 Python 任务。"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "占位 Python 步骤 {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "正在进行本地化配置。"
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "正在保存网络配置。"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "安装数据."
diff --git a/lang/python/zh_HK/LC_MESSAGES/python.po b/lang/python/zh_HK/LC_MESSAGES/python.po
index a989067cf..2a37dd296 100644
--- a/lang/python/zh_HK/LC_MESSAGES/python.po
+++ b/lang/python/zh_HK/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Chinese (Hong Kong) (https://www.transifex.com/calamares/teams/20061/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,89 +17,95 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -166,72 +172,112 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -277,89 +323,6 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr ""
@@ -368,35 +331,72 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po
index 974c77226..5f536f8a1 100644
--- a/lang/python/zh_TW/LC_MESSAGES/python.po
+++ b/lang/python/zh_TW/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 11:03+0200\n"
+"POT-Creation-Date: 2022-05-27 11:18+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 黃柏諺 , 2022\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n"
@@ -22,92 +22,96 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "設定 GRUB。"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "安裝軟體包。"
 
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "正在掛載分割區。"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "正在處理軟體包 (%(count)d / %(total)d)"
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "掛載 zfs 資料集時發生內部錯誤"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "正在安裝 %(num)d 軟體包。"
 
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "匯入 zpool 失敗"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "正在移除 %(num)d 軟體包。"
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "解鎖 zpool 失敗"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "軟體包管理程式錯誤"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "設定 zfs 掛載點失敗"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr "軟體包管理程式無法準備更新。指令 
{!s}
 回傳了錯誤碼 {!s}。"
 
-#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr "軟體包管理程式無法更新系統。指令 
{!s}
 回傳了錯誤碼 {!s}。"
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr "軟體包管理程式無法對已安裝的系統做出變更。指令 
{!s}
 回傳了錯誤碼 {!s}。"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "正在儲存網路設定。"
+
+#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
+#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:367 src/modules/fstab/main.py:394
-#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
+#: src/modules/rawfs/main.py:164
 msgid "Configuration Error"
 msgstr "設定錯誤"
 
-#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
-#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
+#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "沒有給定的根掛載點 
{!s}
 以供使用。"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "正在設定 mkinitcpio。"
+
+#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
+#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "沒有分割區被定義為 
{!s}
 以供使用。"
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs 掛載錯誤"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "正在使用 mkinitfs 建立 initramfs。"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "設定 systemd 服務"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "在目標上執行 mkinitfs 失敗"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "無法修改服務"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "結束碼為 {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "在 chroot 中呼叫的 systemctl {arg!s} 回傳了錯誤代碼 {num!s}。"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "無法啟用 systemd 服務 {name!s}。"
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "無法啟用 systemd 目標 {name!s}。"
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "無法啟用 systemd timer {name!s}。"
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "無法停用 systemd 目標 {name!s}。"
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "無法 mask systemd 單位 {name!s}。"
-
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"未知的 systemd 指令 {command!s} 與 {suffix!s} 給單位 "
-"{name!s}。"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "正在設定 OpenRC dmcrypt 服務。"
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -173,73 +177,115 @@ msgstr "尋找 unsquashfs 失敗，請確定您已安裝 squashfs-tools 軟體
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "目標系統中的目的地 \"{}\" 不是目錄"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "無法寫入 KDM 設定檔"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "設定 systemd 服務"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM 設定檔 {!s} 不存在"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "無法修改服務"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "無法寫入 LXDM 設定檔"
-
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM 設定檔 {!s} 不存在"
-
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "無法寫入 LightDM 設定檔"
-
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM 設定檔 {!s} 不存在"
-
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "無法設定 LightDM"
-
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "未安裝 LightDM greeter。"
-
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "無法寫入 SLIM 設定檔"
-
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM 設定檔 {!s} 不存在"
-
-#: src/modules/displaymanager/main.py:991
-msgid "No display managers selected for the displaymanager module."
-msgstr "未在顯示管理器模組中選取顯示管理器。"
-
-#: src/modules/displaymanager/main.py:992
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
-msgstr "顯示管理器清單為空或在 globalstorage 與 displaymanager.conf 中皆未定義。"
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "在 chroot 中呼叫的 systemctl {arg!s} 回傳了錯誤代碼 {num!s}。"
 
-#: src/modules/displaymanager/main.py:1074
-msgid "Display manager configuration was incomplete"
-msgstr "顯示管理器設定不完整"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr "無法啟用 systemd 服務 {name!s}。"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "正在設定 mkinitcpio。"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "無法啟用 systemd 目標 {name!s}。"
 
-#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:368
-#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "沒有給定的根掛載點 
{!s}
 以供使用。"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "無法啟用 systemd timer {name!s}。"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "正在安裝資料。"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "無法停用 systemd 目標 {name!s}。"
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "無法 mask systemd 單位 {name!s}。"
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"未知的 systemd 指令 {command!s} 與 {suffix!s} 給單位 "
+"{name!s}。"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "假的 python 工作。"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "假的 python step {}"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安裝開機載入程式。"
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "安裝 grub 失敗，全域儲存空間中未定義分割區"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "開機載入程式安裝錯誤"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr "無法安裝開機載入程式。安裝指令 
{!s}
 回傳了錯誤碼 {!s}。"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "正在設定語系。"
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "正在掛載分割區。"
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "掛載 zfs 資料集時發生內部錯誤"
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "匯入 zpool 失敗"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "解鎖 zpool 失敗"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "設定 zfs 掛載點失敗"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs 掛載錯誤"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "設定 Plymouth 主題"
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "正在寫入 fstab。"
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr "無 
{!s}
 設定可供 
{!s}
 使用。"
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -284,89 +330,6 @@ msgid ""
 "exist."
 msgstr "服務 {name!s} 的路徑為 {path!s}，不存在。"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "設定 Plymouth 主題"
-
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "安裝軟體包。"
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "正在處理軟體包 (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "正在安裝 %(num)d 軟體包。"
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "正在移除 %(num)d 軟體包。"
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "軟體包管理程式錯誤"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr "軟體包管理程式無法準備更新。指令 
{!s}
 回傳了錯誤碼 {!s}。"
-
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr "軟體包管理程式無法更新系統。指令 
{!s}
 回傳了錯誤碼 {!s}。"
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr "軟體包管理程式無法對已安裝的系統做出變更。指令 
{!s}
 回傳了錯誤碼 {!s}。"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "安裝開機載入程式。"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "安裝 grub 失敗，全域儲存空間中未定義分割區"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "開機載入程式安裝錯誤"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr "無法安裝開機載入程式。安裝指令 
{!s}
 回傳了錯誤碼 {!s}。"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "正在設定硬體時鐘。"
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "正在使用 mkinitfs 建立 initramfs。"
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "在目標上執行 mkinitfs 失敗"
-
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "結束碼為 {}"
-
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
 msgstr "正在使用 dracut 建立 initramfs。"
@@ -375,35 +338,72 @@ msgstr "正在使用 dracut 建立 initramfs。"
 msgid "Failed to run dracut on the target"
 msgstr "在目標上執行 dracut 失敗"
 
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "設定 GRUB。"
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "無法寫入 KDM 設定檔"
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM 設定檔 {!s} 不存在"
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "無法寫入 LXDM 設定檔"
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM 設定檔 {!s} 不存在"
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "無法寫入 LightDM 設定檔"
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM 設定檔 {!s} 不存在"
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "無法設定 LightDM"
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "未安裝 LightDM greeter。"
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "無法寫入 SLIM 設定檔"
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM 設定檔 {!s} 不存在"
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "未在顯示管理器模組中選取顯示管理器。"
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr "顯示管理器清單為空或在 globalstorage 與 displaymanager.conf 中皆未定義。"
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "顯示管理器設定不完整"
+
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "正在設定 initramfs。"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "正在設定 OpenRC dmcrypt 服務。"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "正在設定硬體時鐘。"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "正在寫入 fstab。"
-
-#: src/modules/fstab/main.py:395
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr "無 
{!s}
 設定可供 
{!s}
 使用。"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "假的 python 工作。"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "假的 python step {}"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "正在設定語系。"
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "正在儲存網路設定。"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "正在安裝資料。"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5ce5349fb..b1a536f91 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,26 +3,26 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-include( CalamaresAddBrandingSubdirectory )
-include( CalamaresAddLibrary )
-include( CalamaresAddModuleSubdirectory )
-include( CalamaresAddPlugin )
-include( CalamaresAddTest )
-include( CalamaresAddTranslations )
+include(CalamaresAddBrandingSubdirectory)
+include(CalamaresAddLibrary)
+include(CalamaresAddModuleSubdirectory)
+include(CalamaresAddPlugin)
+include(CalamaresAddTest)
+include(CalamaresAddTranslations)
 
 # library
-add_subdirectory( libcalamares )
+add_subdirectory(libcalamares)
 
-add_subdirectory( libcalamaresui )
+add_subdirectory(libcalamaresui)
 
 # all things qml
-add_subdirectory( qml/calamares )
+add_subdirectory(qml/calamares)
 
 # application
-add_subdirectory( calamares )
+add_subdirectory(calamares)
 
 # plugins
-add_subdirectory( modules )
+add_subdirectory(modules)
 
 # branding components
-add_subdirectory( branding )
+add_subdirectory(branding)
diff --git a/src/branding/README.md b/src/branding/README.md
index 234b2a9b1..318e2b6d9 100644
--- a/src/branding/README.md
+++ b/src/branding/README.md
@@ -204,3 +204,22 @@ Adding the subdirectory can be done as follows:
    to `.qm` files before being installed. The CMake macro's do this
    automatically. For manual packaging, use `lrelease` to compile
    the files.
+
+## Global Storage keys
+
+The following keys from the `branding.desc` file are copied into
+Global Storage under a *branding* parent key:
+    "productName",
+    "version",
+    "shortVersion",
+    "versionedName",
+    "shortVersionedName",
+    "shortProductName",
+    "bootloaderEntryName",
+    "productUrl",
+    "supportUrl",
+    "knownIssuesUrl",
+    "releaseNotesUrl",
+    "donateUrl"
+
+
diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc
index b8757411f..7365a9e3c 100644
--- a/src/branding/default/branding.desc
+++ b/src/branding/default/branding.desc
@@ -170,20 +170,20 @@ images:
 
 # Colors for text and background components.
 #
-#  - sidebarBackground is the background of the sidebar
-#  - sidebarText is the (foreground) text color
-#  - sidebarTextHighlight sets the background of the selected (current) step.
+#  - SidebarBackground is the background of the sidebar
+#  - SidebarText is the (foreground) text color
+#  - SidebarBackgroundCurrent sets the background of the current step.
 #    Optional, and defaults to the application palette.
-#  - sidebarSelect is the text color of the selected step.
+#  - SidebarTextCurrent is the text color of the current step.
 #
 # These colors can **also** be set through the stylesheet, if the
 # branding component also ships a stylesheet.qss. Then they are
 # the corresponding CSS attributes of #sidebarApp.
 style:
-   sidebarBackground:    "#292F34"
-   sidebarText:          "#FFFFFF"
-   sidebarTextSelect:    "#292F34"
-   sidebarTextHighlight: "#D35400"
+   SidebarBackground:        "#292F34"
+   SidebarText:              "#FFFFFF"
+   SidebarTextCurrent:       "#292F34"
+   SidebarBackgroundCurrent: "#D35400"
 
 ### SLIDESHOW
 #
diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt
index d06a53d83..b132f186a 100644
--- a/src/calamares/CMakeLists.txt
+++ b/src/calamares/CMakeLists.txt
@@ -4,29 +4,16 @@
 #   SPDX-License-Identifier: BSD-2-Clause
 #
 
-set( calamaresSources
+set(calamaresSources
     main.cpp
     CalamaresApplication.cpp
     CalamaresWindow.cpp
-
     DebugWindow.cpp
     VariantModel.cpp
-
     progresstree/ProgressTreeDelegate.cpp
     progresstree/ProgressTreeView.cpp
 )
 
-if( NOT WITH_KF5DBus )
-    set( kdsagSources
-        ${CMAKE_SOURCE_DIR}/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp
-        ${CMAKE_SOURCE_DIR}/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp
-        ${CMAKE_SOURCE_DIR}/3rdparty/kdsingleapplicationguard/kdtoolsglobal.cpp
-        ${CMAKE_SOURCE_DIR}/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp
-    )
-    mark_thirdparty_code( ${kdsagSources} )
-    list( APPEND calamaresSources ${kdsagSources} )
-endif()
-
 include_directories(
     ${CMAKE_SOURCE_DIR}/src/libcalamares
     ${CMAKE_SOURCE_DIR}/src/libcalamaresui
@@ -42,45 +29,30 @@ include_directories(
 # The calamares-i18n.cxx file -- full path in CALAMARES_TRANSLATIONS_SOURCE --
 # is created as a target in the lang/ directory. This is compiled to a
 # library (it's just the result of a QRC compile).
-add_executable( calamares_bin ${calamaresSources} calamares.qrc )
-target_include_directories( calamares_bin PRIVATE ${CMAKE_SOURCE_DIR} )
-set_target_properties(calamares_bin
-    PROPERTIES
-        ENABLE_EXPORTS TRUE
-        RUNTIME_OUTPUT_NAME calamares
-)
+add_executable(calamares_bin ${calamaresSources} calamares.qrc)
+target_include_directories(calamares_bin PRIVATE ${CMAKE_SOURCE_DIR})
+set_target_properties(calamares_bin PROPERTIES ENABLE_EXPORTS TRUE RUNTIME_OUTPUT_NAME calamares)
 calamares_automoc( calamares_bin )
 calamares_autouic( calamares_bin )
 calamares_autorcc( calamares_bin )
 
-if( kdsagSources )
-    set_source_files_properties( ${kdsagSources} PROPERTIES AUTOMOC OFF )
+if(kdsagSources)
+    set_source_files_properties(${kdsagSources} PROPERTIES AUTOMOC OFF)
 endif()
 
-target_link_libraries( calamares_bin
-    PRIVATE
-        calamares
-        calamaresui
-        calamares-i18n
-        Qt5::Core
-        Qt5::Widgets
-        KF5::CoreAddons
+target_link_libraries(
+    calamares_bin
+    PRIVATE calamares calamaresui calamares-i18n Qt5::Core Qt5::Widgets KF5::CoreAddons KF5::DBusAddons
 )
-if( WITH_KF5Crash )
-    target_link_libraries( calamares_bin PRIVATE KF5::Crash )
-    target_compile_definitions( calamares_bin PRIVATE WITH_KF5Crash )
-endif()
-if( WITH_KF5DBus )
-    target_link_libraries( calamares_bin PRIVATE KF5::DBusAddons )
-    target_compile_definitions( calamares_bin PRIVATE WITH_KF5DBus )
+if(BUILD_KF5Crash)
+    target_link_libraries(calamares_bin PRIVATE KF5::Crash)
+    target_compile_definitions(calamares_bin PRIVATE BUILD_KF5Crash)
 endif()
 
-install( TARGETS calamares_bin
-    BUNDLE DESTINATION .
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
+install(TARGETS calamares_bin BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-install( FILES ${CMAKE_SOURCE_DIR}/data/images/squid.svg
+install(
+    FILES ${CMAKE_SOURCE_DIR}/data/images/squid.svg
     RENAME calamares.svg
     DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps
 )
@@ -88,11 +60,11 @@ install( FILES ${CMAKE_SOURCE_DIR}/data/images/squid.svg
 ### TESTS
 #
 #
-if( BUILD_TESTING )
+if(BUILD_TESTING)
     # Don't install, these are just for enable_testing
-    add_executable( loadmodule testmain.cpp )
-    target_link_libraries( loadmodule PRIVATE Qt5::Core Qt5::Widgets calamares calamaresui )
+    add_executable(loadmodule testmain.cpp)
+    target_link_libraries(loadmodule PRIVATE Qt5::Core Qt5::Widgets calamares calamaresui)
 
-    add_executable( test_conf test_conf.cpp )
-    target_link_libraries( test_conf PUBLIC yamlcpp::yamlcpp Qt5::Core )
+    add_executable(test_conf test_conf.cpp)
+    target_link_libraries(test_conf PUBLIC yamlcpp::yamlcpp Qt5::Core)
 endif()
diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp
index 81e7ca97f..c79e17d58 100644
--- a/src/calamares/CalamaresWindow.cpp
+++ b/src/calamares/CalamaresWindow.cpp
@@ -130,14 +130,41 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug,
     tv->setFocusPolicy( Qt::NoFocus );
     sideLayout->addWidget( tv );
 
+    QHBoxLayout* extraButtons = new QHBoxLayout;
+    sideLayout->addLayout( extraButtons );
+
+    const int defaultFontHeight = CalamaresUtils::defaultFontHeight();
+
+    if ( /* About-Calamares Button enabled */ true )
+    {
+        QPushButton* aboutDialog = new QPushButton;
+        aboutDialog->setObjectName( "aboutButton" );
+        aboutDialog->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Information,
+                                                             CalamaresUtils::Original,
+                                                             2 * QSize( defaultFontHeight, defaultFontHeight ) ) );
+        CALAMARES_RETRANSLATE_FOR(
+            aboutDialog,
+            aboutDialog->setText(
+                QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "About" ) );
+            aboutDialog->setToolTip( QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(),
+                                                                  "Show information about Calamares" ) ); );
+        extraButtons->addWidget( aboutDialog );
+        aboutDialog->setFlat( true );
+        aboutDialog->setCheckable( true );
+        QObject::connect( aboutDialog, &QPushButton::clicked, debug, &Calamares::DebugWindowManager::about );
+    }
     if ( debug && debug->enabled() )
     {
         QPushButton* debugWindowBtn = new QPushButton;
         debugWindowBtn->setObjectName( "debugButton" );
+        debugWindowBtn->setIcon( CalamaresUtils::defaultPixmap(
+            CalamaresUtils::Bugs, CalamaresUtils::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) );
         CALAMARES_RETRANSLATE_FOR( debugWindowBtn,
                                    debugWindowBtn->setText( QCoreApplication::translate(
+                                       CalamaresWindow::staticMetaObject.className(), "Debug" ) );
+                                   debugWindowBtn->setToolTip( QCoreApplication::translate(
                                        CalamaresWindow::staticMetaObject.className(), "Show debug information" ) ); );
-        sideLayout->addWidget( debugWindowBtn );
+        extraButtons->addWidget( debugWindowBtn );
         debugWindowBtn->setFlat( true );
         debugWindowBtn->setCheckable( true );
         QObject::connect( debugWindowBtn, &QPushButton::clicked, debug, &Calamares::DebugWindowManager::show );
diff --git a/src/calamares/DebugWindow.cpp b/src/calamares/DebugWindow.cpp
index 8813999a4..feeab833e 100644
--- a/src/calamares/DebugWindow.cpp
+++ b/src/calamares/DebugWindow.cpp
@@ -12,6 +12,8 @@
 #include "ui_DebugWindow.h"
 
 #include "Branding.h"
+#include "CalamaresAbout.h"
+#include "CalamaresVersion.h"
 #include "GlobalStorage.h"
 #include "Job.h"
 #include "JobQueue.h"
@@ -19,17 +21,13 @@
 #include "VariantModel.h"
 #include "modulesystem/Module.h"
 #include "modulesystem/ModuleManager.h"
+#include "utils/CalamaresUtilsGui.h"
 #include "utils/Logger.h"
 #include "utils/Paste.h"
 #include "utils/Retranslator.h"
+#include "widgets/TranslationFix.h"
 
-#ifdef WITH_PYTHONQT
-#include "ViewManager.h"
-#include "viewpages/PythonQtViewStep.h"
-
-#include 
-#endif
-
+#include 
 #include 
 #include 
 #include 
@@ -115,80 +113,10 @@ DebugWindow::DebugWindow()
 
     m_ui->moduleConfigView->setModel( m_module_model.get() );
 
-#ifdef WITH_PYTHONQT
-    QPushButton* pythonConsoleButton = new QPushButton;
-    pythonConsoleButton->setText( "Attach Python console" );
-    m_ui->modulesVerticalLayout->insertWidget( 1, pythonConsoleButton );
-    pythonConsoleButton->hide();
-
-    QObject::connect(
-        pythonConsoleButton,
-        &QPushButton::clicked,
-        this,
-        [ this, moduleConfigModel ]
-        {
-            QString moduleName = m_ui->modulesListView->currentIndex().data().toString();
-            Module* module = ModuleManager::instance()->moduleInstance( moduleName );
-            if ( module->interface() != Module::Interface::PythonQt || module->type() != Module::Type::View )
-                return;
-
-            for ( ViewStep* step : ViewManager::instance()->viewSteps() )
-            {
-                if ( step->moduleInstanceKey() == module->instanceKey() )
-                {
-                    PythonQtViewStep* pqvs = qobject_cast< PythonQtViewStep* >( step );
-                    if ( pqvs )
-                    {
-                        QWidget* consoleWindow = new QWidget;
-
-                        QWidget* console = pqvs->createScriptingConsole();
-                        console->setParent( consoleWindow );
-
-                        QVBoxLayout* layout = new QVBoxLayout;
-                        consoleWindow->setLayout( layout );
-                        layout->addWidget( console );
-
-                        QHBoxLayout* bottomLayout = new QHBoxLayout;
-                        layout->addLayout( bottomLayout );
-
-                        QLabel* bottomLabel = new QLabel( consoleWindow );
-                        bottomLayout->addWidget( bottomLabel );
-                        QString line = QString( "Module: %1
"
-                                                "Python class: %2" )
-                                           .arg( module->instanceKey() )
-                                           .arg( console->property( "classname" ).toString() );
-                        bottomLabel->setText( line );
-
-                        QPushButton* closeButton = new QPushButton( consoleWindow );
-                        closeButton->setText( "&Close" );
-                        QObject::connect(
-                            closeButton, &QPushButton::clicked, [ consoleWindow ] { consoleWindow->close(); } );
-                        bottomLayout->addWidget( closeButton );
-                        bottomLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
-
-                        consoleWindow->setParent( this );
-                        consoleWindow->setWindowFlags( Qt::Window );
-                        consoleWindow->setWindowTitle( "Calamares Python console" );
-                        consoleWindow->setAttribute( Qt::WA_DeleteOnClose, true );
-                        consoleWindow->showNormal();
-                        break;
-                    }
-                }
-            }
-        } );
-
-#endif
-
     connect( m_ui->modulesListView->selectionModel(),
              &QItemSelectionModel::selectionChanged,
              this,
-             [ this
-#ifdef WITH_PYTHONQT
-               ,
-               pythonConsoleButton
-#endif
-    ]
-             {
+             [this] {
                  QString moduleName = m_ui->modulesListView->currentIndex().data().toString();
                  Module* module
                      = ModuleManager::instance()->moduleInstance( ModuleSystem::InstanceKey::fromString( moduleName ) );
@@ -199,10 +127,6 @@ DebugWindow::DebugWindow()
                      m_ui->moduleConfigView->expandAll();
                      m_ui->moduleTypeLabel->setText( module->typeString() );
                      m_ui->moduleInterfaceLabel->setText( module->interfaceString() );
-#ifdef WITH_PYTHONQT
-                     pythonConsoleButton->setVisible( module->interface() == Module::Interface::PythonQt
-                                                      && module->type() == Module::Type::View );
-#endif
                  }
              } );
 
@@ -307,5 +231,28 @@ DebugWindowManager::toggle()
     show( !m_visible );
 }
 
+void
+DebugWindowManager::about()
+{
+    QString title = Calamares::Settings::instance()->isSetupMode()
+        ? QCoreApplication::translate( "WelcomePage", "About %1 setup" )
+        : QCoreApplication::translate( "WelcomePage", "About %1 installer" );
+    QMessageBox mb( QMessageBox::Information,
+                    title.arg( CALAMARES_APPLICATION_NAME ),
+                    Calamares::aboutString().arg( Calamares::Branding::instance()->versionedName() ),
+                    QMessageBox::Ok,
+                    nullptr );
+    Calamares::fixButtonLabels( &mb );
+    mb.setIconPixmap( CalamaresUtils::defaultPixmap(
+        CalamaresUtils::Squid,
+        CalamaresUtils::Original,
+        QSize( CalamaresUtils::defaultFontHeight() * 6, CalamaresUtils::defaultFontHeight() * 6 ) ) );
+    QGridLayout* layout = reinterpret_cast< QGridLayout* >( mb.layout() );
+    if ( layout )
+    {
+        layout->setColumnMinimumWidth( 2, CalamaresUtils::defaultFontHeight() * 24 );
+    }
+    mb.exec();
+}
 
 }  // namespace Calamares
diff --git a/src/calamares/DebugWindow.h b/src/calamares/DebugWindow.h
index 41d92588d..7bc789a89 100644
--- a/src/calamares/DebugWindow.h
+++ b/src/calamares/DebugWindow.h
@@ -49,11 +49,13 @@ private:
     std::unique_ptr< VariantModel > m_module_model;
 };
 
-/** @brief Manager for the (single) DebugWindow
+/** @brief Manager for meta-windows (Debug and About windows)
  *
  * Only one DebugWindow is expected to be around. This class manages
  * (exactly one) DebugWindow and can create and destroy it as needed.
  * It is available to the Calamares panels as object `DebugWindow`.
+ *
+ * The about() method shows a modal pop-up about Calamares.
  */
 class DebugWindowManager : public QObject
 {
@@ -79,6 +81,8 @@ public Q_SLOTS:
     void show( bool visible );
     void toggle();
 
+    void about();
+
 signals:
     void visibleChanged( bool visible );
 
diff --git a/src/calamares/DebugWindow.ui b/src/calamares/DebugWindow.ui
index 1b163d49d..44ecf04ab 100644
--- a/src/calamares/DebugWindow.ui
+++ b/src/calamares/DebugWindow.ui
@@ -5,7 +5,7 @@ SPDX-FileCopyrightText: 2015 Teo Mrnjavac <teo@kde.org>
 SPDX-License-Identifier: GPL-3.0-or-later
  
  Calamares::DebugWindow
- 
+ 
   
    
     0
diff --git a/src/calamares/calamares-sidebar.qml b/src/calamares/calamares-sidebar.qml
index 5c94fb6b2..4780823cd 100644
--- a/src/calamares/calamares-sidebar.qml
+++ b/src/calamares/calamares-sidebar.qml
@@ -46,12 +46,12 @@ Rectangle {
                 Layout.fillWidth: true;
                 height: 35;
                 radius: 6;
-                color: Branding.styleString( index == ViewManager.currentStepIndex ? Branding.SidebarBackgroundSelected : Branding.SidebarBackground );
+                color: Branding.styleString( index == ViewManager.currentStepIndex ? Branding.SidebarBackgroundCurrent : Branding.SidebarBackground );
 
                 Text {
                     anchors.verticalCenter: parent.verticalCenter;
                     anchors.horizontalCenter: parent.horizontalCenter;
-                    color: Branding.styleString( index == ViewManager.currentStepIndex ? Branding.SidebarTextSelected : Branding.SidebarText );
+                    color: Branding.styleString( index == ViewManager.currentStepIndex ? Branding.SidebarTextCurrent : Branding.SidebarText );
                     text: display;
                 }
             }
@@ -62,26 +62,63 @@ Rectangle {
         }
 
         Rectangle {
+            id: metaArea
             Layout.fillWidth: true;
             height: 35
             Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
-            color: Branding.styleString( mouseArea.containsMouse ? Branding.SidebarTextHighlight : Branding.SidebarBackground);
-            visible: debug.enabled
+            color: Branding.styleString( Branding.SidebarBackground );
+            visible: true;
 
-            MouseArea {
-                id: mouseArea
-                anchors.fill: parent;
-                cursorShape: Qt.PointingHandCursor
-                hoverEnabled: true
-                Text {
-                    anchors.verticalCenter: parent.verticalCenter;
-                    x: parent.x + 4;
-                    text: qsTr("Show debug information")
-                    color: Branding.styleString( mouseArea.containsMouse ? Branding.SidebarTextSelect : Branding.SidebarBackground );
-                    font.pointSize : 9
+            Rectangle {
+                id: aboutArea
+                height: 35
+                width: parent.width / 2;
+                anchors.left: parent.left
+                color: Branding.styleString( Branding.SidebarBackgroundCurrent );
+                visible: true;
+
+                MouseArea {
+                    id: mouseAreaAbout
+                    anchors.fill: parent;
+                    cursorShape: Qt.PointingHandCursor
+                    hoverEnabled: true
+                    Text {
+                        anchors.verticalCenter: parent.verticalCenter;
+                        anchors.horizontalCenter: parent.horizontalCenter;
+                        x: parent.x + 4;
+                        text: qsTr("About")
+                        color: Branding.styleString( Branding.SidebarTextCurrent );
+                        font.pointSize : 9
+                    }
+
+                    onClicked: debug.about()
                 }
+            }
 
-                onClicked: debug.toggle()
+            Rectangle {
+                id: debugArea
+                height: 35
+                width: parent.width / 2;
+                anchors.right: parent.right
+                color: Branding.styleString( Branding.SidebarBackgroundCurrent );
+                visible: debug.enabled
+
+                MouseArea {
+                    id: mouseAreaDebug
+                    anchors.fill: parent;
+                    cursorShape: Qt.PointingHandCursor
+                    hoverEnabled: true
+                    Text {
+                        anchors.verticalCenter: parent.verticalCenter;
+                        anchors.horizontalCenter: parent.horizontalCenter;
+                        x: parent.x + 4;
+                        text: qsTr("Debug")
+                        color: Branding.styleString( Branding.SidebarTextCurrent );
+                        font.pointSize : 9
+                    }
+
+                    onClicked: debug.toggle()
+                }
             }
         }
     }
diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp
index de709156f..fcc946485 100644
--- a/src/calamares/main.cpp
+++ b/src/calamares/main.cpp
@@ -16,15 +16,9 @@
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 
-#ifndef WITH_KF5DBus
-#include "3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h"
-#endif
-
 #include 
-#ifdef WITH_KF5DBus
 #include 
-#endif
-#ifdef WITH_KF5Crash
+#ifdef BUILD_KF5Crash
 #include 
 #endif
 
@@ -123,37 +117,16 @@ main( int argc, char* argv[] )
     KAboutData::setApplicationData( aboutData );
     a.setApplicationDisplayName( QString() );  // To avoid putting an extra "Calamares/" into the log-file
 
-#ifdef WITH_KF5Crash
+#ifdef BUILD_KF5Crash
     KCrash::initialize();
     // KCrash::setCrashHandler();
     KCrash::setDrKonqiEnabled( true );
     KCrash::setFlags( KCrash::SaferDialog | KCrash::AlwaysDirectly );
-    // TODO: umount anything in /tmp/calamares-... as an emergency save function
 #endif
 
     bool is_debug = handle_args( a );
 
-#ifdef WITH_KF5DBus
     KDBusService service( is_debug ? KDBusService::Multiple : KDBusService::Unique );
-#else
-    KDSingleApplicationGuard guard( is_debug ? KDSingleApplicationGuard::NoPolicy
-                                             : KDSingleApplicationGuard::AutoKillOtherInstances );
-    if ( !is_debug && !guard.isPrimaryInstance() )
-    {
-        // Here we have not yet set-up the logger system, so qDebug() is ok
-        auto instancelist = guard.instances();
-        qDebug() << "Calamares is already running, shutting down.";
-        if ( instancelist.count() > 0 )
-        {
-            qDebug() << "Other running Calamares instances:";
-        }
-        for ( const auto& i : instancelist )
-        {
-            qDebug() << "  " << i.isValid() << i.pid() << i.arguments();
-        }
-        return 69;  // EX_UNAVAILABLE on FreeBSD
-    }
-#endif
 
     Calamares::Settings::init( is_debug );
     if ( !Calamares::Settings::instance() || !Calamares::Settings::instance()->isValid() )
diff --git a/src/calamares/progresstree/ProgressTreeDelegate.cpp b/src/calamares/progresstree/ProgressTreeDelegate.cpp
index 48b5b4328..2117a28ae 100644
--- a/src/calamares/progresstree/ProgressTreeDelegate.cpp
+++ b/src/calamares/progresstree/ProgressTreeDelegate.cpp
@@ -25,50 +25,8 @@ item_fontsize()
     return CalamaresUtils::defaultFontSize() + 4;
 }
 
-QSize
-ProgressTreeDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    if ( !index.isValid() )
-    {
-        return option.rect.size();
-    }
-
-    QFont font = qApp->font();
-
-    font.setPointSize( item_fontsize() );
-    QFontMetrics fm( font );
-    int height = fm.height();
-
-    height += 2 * item_margin;
-
-    return QSize( option.rect.width(), height );
-}
-
-
-void
-ProgressTreeDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    QStyleOptionViewItem opt = option;
-
-    painter->save();
-
-    initStyleOption( &opt, index );
-    opt.text.clear();
-
-    painter->setBrush(
-        QColor( Calamares::Branding::instance()->styleString( Calamares::Branding::SidebarBackground ) ) );
-    painter->setPen( QColor( Calamares::Branding::instance()->styleString( Calamares::Branding::SidebarText ) ) );
-
-    paintViewStep( painter, opt, index );
-
-    painter->restore();
-}
-
-
-void
-ProgressTreeDelegate::paintViewStep( QPainter* painter,
-                                     const QStyleOptionViewItem& option,
-                                     const QModelIndex& index ) const
+static void
+paintViewStep( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index )
 {
     QRect textRect = option.rect.adjusted( item_margin, item_margin, -item_margin, -item_margin );
     QFont font = qApp->font();
@@ -78,9 +36,9 @@ ProgressTreeDelegate::paintViewStep( QPainter* painter,
 
     if ( index.row() == index.data( Calamares::ViewManager::ProgressTreeItemCurrentIndex ).toInt() )
     {
-        painter->setPen( Calamares::Branding::instance()->styleString( Calamares::Branding::SidebarTextSelect ) );
+        painter->setPen( Calamares::Branding::instance()->styleString( Calamares::Branding::SidebarTextCurrent ) );
         QString textHighlight
-            = Calamares::Branding::instance()->styleString( Calamares::Branding::SidebarTextHighlight );
+            = Calamares::Branding::instance()->styleString( Calamares::Branding::SidebarBackgroundCurrent );
         if ( textHighlight.isEmpty() )
         {
             painter->setBrush( CalamaresApplication::instance()->mainWindow()->palette().window() );
@@ -122,3 +80,42 @@ ProgressTreeDelegate::paintViewStep( QPainter* painter,
         }
     } while ( shrinkSteps <= maximumShrink );
 }
+
+QSize
+ProgressTreeDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    if ( !index.isValid() )
+    {
+        return option.rect.size();
+    }
+
+    QFont font = qApp->font();
+
+    font.setPointSize( item_fontsize() );
+    QFontMetrics fm( font );
+    int height = fm.height();
+
+    height += 2 * item_margin;
+
+    return QSize( option.rect.width(), height );
+}
+
+
+void
+ProgressTreeDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QStyleOptionViewItem opt = option;
+
+    painter->save();
+
+    initStyleOption( &opt, index );
+    opt.text.clear();
+
+    painter->setBrush(
+        QColor( Calamares::Branding::instance()->styleString( Calamares::Branding::SidebarBackground ) ) );
+    painter->setPen( QColor( Calamares::Branding::instance()->styleString( Calamares::Branding::SidebarText ) ) );
+
+    paintViewStep( painter, opt, index );
+
+    painter->restore();
+}
diff --git a/src/calamares/progresstree/ProgressTreeDelegate.h b/src/calamares/progresstree/ProgressTreeDelegate.h
index 55dcf7ac4..d5a5abcbc 100644
--- a/src/calamares/progresstree/ProgressTreeDelegate.h
+++ b/src/calamares/progresstree/ProgressTreeDelegate.h
@@ -26,9 +26,6 @@ public:
 protected:
     QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const override;
     void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const override;
-
-private:
-    void paintViewStep( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
 };
 
 #endif  // PROGRESSTREEDELEGATE_H
diff --git a/src/calamares/progresstree/ProgressTreeView.h b/src/calamares/progresstree/ProgressTreeView.h
index 5c416dfd6..00decb6c3 100644
--- a/src/calamares/progresstree/ProgressTreeView.h
+++ b/src/calamares/progresstree/ProgressTreeView.h
@@ -14,8 +14,11 @@
 #include 
 
 /**
- * @brief The ProgressTreeView class is a modified QTreeView which displays the
+ * @brief Displays progress through the list of (visible) steps
+ *
+ * The ProgressTreeView class is a modified QListView which displays the
  * available view steps and the user's progress through them.
+ * Since Calamares doesn't support "sub steps", it isn't really a tree.
  */
 class ProgressTreeView : public QListView
 {
diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 95081bb5e..181ec2b30 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -10,20 +10,16 @@
 # (non-GUI) jobs.
 #
 
-add_definitions( -DDLLEXPORT_PRO )
-include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
+add_definitions(-DDLLEXPORT_PRO)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresConfig.h.in
-                ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h )
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresVersion.h.in
-                ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersion.h )
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresVersionX.h.in
-                ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersionX.h )
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CalamaresConfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CalamaresVersion.h.in ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersion.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CalamaresVersionX.h.in ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersionX.h)
 
-set( OPTIONAL_PRIVATE_LIBRARIES "" )
-set( OPTIONAL_PUBLIC_LIBRARIES "" )
-
-set( libSources
+add_library(
+    calamares
+    SHARED
     CalamaresAbout.cpp
     CppJob.cpp
     GlobalStorage.cpp
@@ -32,13 +28,11 @@ set( libSources
     JobQueue.cpp
     ProcessJob.cpp
     Settings.cpp
-
     # GeoIP services
     geoip/Interface.cpp
     geoip/GeoIPFixed.cpp
     geoip/GeoIPJSON.cpp
     geoip/Handler.cpp
-
     # Locale-data service
     locale/Global.cpp
     locale/Lookup.cpp
@@ -47,7 +41,6 @@ set( libSources
     locale/TranslatableString.cpp
     locale/Translation.cpp
     locale/TranslationsModel.cpp
-
     # Modules
     modulesystem/Config.cpp
     modulesystem/Descriptor.cpp
@@ -56,19 +49,15 @@ set( libSources
     modulesystem/Preset.cpp
     modulesystem/RequirementsChecker.cpp
     modulesystem/RequirementsModel.cpp
-
     # Network service
     network/Manager.cpp
-
     # Packages service
     packages/Globals.cpp
-
     # Partition service
     partition/Global.cpp
     partition/Mount.cpp
     partition/PartitionSize.cpp
     partition/Sync.cpp
-
     # Utility service
     utils/CalamaresUtilsSystem.cpp
     utils/CommandList.cpp
@@ -80,248 +69,197 @@ set( libSources
     utils/Retranslator.cpp
     utils/Runner.cpp
     utils/String.cpp
+    utils/StringExpander.cpp
     utils/UMask.cpp
     utils/Variant.cpp
     utils/Yaml.cpp
 )
 
+set_target_properties(
+    calamares
+    PROPERTIES
+        VERSION ${CALAMARES_VERSION_SHORT}
+        SOVERSION ${CALAMARES_VERSION_SHORT}
+        INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_INSTALL_FULL_INCLUDEDIR}/libcalamares
+)
+target_link_libraries(calamares LINK_PUBLIC yamlcpp::yamlcpp Qt5::Core KF5::CoreAddons)
+
 ### OPTIONAL Automount support (requires dbus)
 #
 #
-if( Qt5DBus_FOUND)
-    list( APPEND libSources partition/AutoMount.cpp )
-    list( APPEND OPTIONAL_PRIVATE_LIBRARIES Qt5::DBus )
+if(Qt5DBus_FOUND)
+    target_sources(calamares PRIVATE partition/AutoMount.cpp)
+    target_link_libraries(calamares PRIVATE Qt5::DBus)
 endif()
 
 ### OPTIONAL Python support
 #
 #
-if( WITH_PYTHON )
-    list( APPEND libSources
-        PythonHelper.cpp
-        PythonJob.cpp
-        PythonJobApi.cpp
-    )
-
-    include_directories(${PYTHON_INCLUDE_DIRS})
-    link_directories(${PYTHON_LIBRARIES})
-
-    include_directories(${Boost_INCLUDE_DIRS})
-    link_directories(${Boost_LIBRARY_DIRS})
-
-    list( APPEND OPTIONAL_PRIVATE_LIBRARIES
-        ${PYTHON_LIBRARIES}
-        ${Boost_LIBRARIES}
-    )
+if(WITH_PYTHON)
+    target_sources(calamares PRIVATE PythonHelper.cpp PythonJob.cpp PythonJobApi.cpp)
+    target_link_libraries(calamares PRIVATE Python::Python Boost::python)
 endif()
 
 ### 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 )
+if(Qt5Xml_FOUND)
+    target_sources(calamares PRIVATE geoip/GeoIPXML.cpp)
+    target_link_libraries(calamares PRIVATE Qt5::Network Qt5::Xml)
 endif()
 
 ### OPTIONAL KPMcore support
 #
 #
-include( KPMcoreHelper )
+include(KPMcoreHelper)
 
-if ( KPMcore_FOUND )
-    find_package( Qt5 REQUIRED DBus )  # Needed for KPMCore
-    find_package( KF5 REQUIRED I18n WidgetsAddons )  # Needed for KPMCore
+if(KPMcore_FOUND)
+    find_package(Qt5 REQUIRED DBus) # Needed for KPMCore
+    find_package(KF5 REQUIRED I18n WidgetsAddons) # Needed for KPMCore
 
-    foreach ( d ${KPMcore_API_DEFINITIONS} )
-        add_definitions( -D${d} )
+    foreach(d ${KPMcore_API_DEFINITIONS})
+        add_definitions(-D${d})
     endforeach()
-    include_directories( ${KPMCORE_INCLUDE_DIR} )
-    list( APPEND libSources
-        partition/FileSystem.cpp
-        partition/KPMManager.cpp
-        partition/PartitionIterator.cpp
-        partition/PartitionQuery.cpp
+    include_directories(${KPMCORE_INCLUDE_DIR})
+    target_sources(
+        calamares
+        PRIVATE
+            partition/FileSystem.cpp
+            partition/KPMManager.cpp
+            partition/PartitionIterator.cpp
+            partition/PartitionQuery.cpp
     )
-    list( APPEND OPTIONAL_PRIVATE_LIBRARIES kpmcore )
+    target_link_libraries(calamares PRIVATE kpmcore)
 endif()
 
 ### LIBRARY
 #
 #
-add_library( calamares SHARED ${libSources} )
-set_target_properties( calamares
-    PROPERTIES
-        VERSION ${CALAMARES_VERSION_SHORT}
-        SOVERSION ${CALAMARES_VERSION_SHORT}
-        INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_INSTALL_FULL_INCLUDEDIR}/libcalamares
-)
 calamares_automoc( calamares )
-
-target_link_libraries( calamares
-    LINK_PRIVATE
-        ${OPTIONAL_PRIVATE_LIBRARIES}
-    LINK_PUBLIC
-        yamlcpp::yamlcpp
-        Qt5::Core
-        KF5::CoreAddons
-        ${OPTIONAL_PUBLIC_LIBRARIES}
-)
-
 add_library(Calamares::calamares ALIAS calamares)
 
 ### Installation
 #
 #
-install( TARGETS calamares
+install(
+    TARGETS calamares
     EXPORT Calamares
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
 # 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 "
+install(
+    CODE
+        "
     file( MAKE_DIRECTORY \"\$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_LIBDIR}/calamares\" )
     execute_process( COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ../libcalamares.so.${CALAMARES_VERSION_SHORT} libcalamares.so WORKING_DIRECTORY \"\$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_LIBDIR}/calamares\" )
-")
+"
+)
 
 # Install header files
-file( GLOB rootHeaders "*.h" )
+file(GLOB rootHeaders "*.h")
 install(
-    FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h
-        ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersion.h
-        ${rootHeaders}
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersion.h ${rootHeaders}
     DESTINATION include/libcalamares
 )
 # Install each subdir-worth of header files
-foreach( subdir geoip locale modulesystem network partition utils )
-    file( GLOB subdir_headers "${subdir}/*.h" )
-    install( FILES ${subdir_headers} DESTINATION include/libcalamares/${subdir} )
+foreach(subdir geoip locale modulesystem network partition utils)
+    file(GLOB subdir_headers "${subdir}/*.h")
+    install(FILES ${subdir_headers} DESTINATION include/libcalamares/${subdir})
 endforeach()
 
-
-### TESTING
+### TRANSLATION TESTING
 #
-#
-calamares_add_test(
-    libcalamarestest
-    SOURCES
-        Tests.cpp
-)
+# This is a support function, used just once, to help out the localetest
+function(calamares_qrc_translations basename)
+    set(NAME ${ARGV0})
+    set(options "")
+    set(oneValueArgs SUBDIRECTORY OUTPUT_VARIABLE)
+    set(multiValueArgs LANGUAGES)
+    cmake_parse_arguments(_qrt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-calamares_add_test(
-    libcalamaresgeoiptest
-    SOURCES
-        geoip/GeoIPTests.cpp
-        ${geoip_src}
-)
-
-function ( calamares_qrc_translations basename )
-    set( NAME ${ARGV0} )
-    set( options "" )
-    set( oneValueArgs SUBDIRECTORY OUTPUT_VARIABLE )
-    set( multiValueArgs LANGUAGES )
-    cmake_parse_arguments( _qrt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-
-    if( NOT _qrt_OUTPUT_VARIABLE )
-        set( _qrt_OUTPUT_VARIABLE "qrc_translations_${basename}" )
+    if(NOT _qrt_OUTPUT_VARIABLE)
+        set(_qrt_OUTPUT_VARIABLE "qrc_translations_${basename}")
     endif()
 
-    set( translations_qrc_infile ${CMAKE_CURRENT_BINARY_DIR}/${basename}.qrc )
-    set( translations_qrc_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${basename}.cxx )
+    set(translations_qrc_infile ${CMAKE_CURRENT_BINARY_DIR}/${basename}.qrc)
+    set(translations_qrc_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${basename}.cxx)
 
     # Must use this variable name because of the @ substitution
-    set( calamares_i18n_qrc_content "" )
-    set( calamares_i18n_ts_filelist "" )
-    foreach( lang ${_qrt_LANGUAGES} )
-        string( APPEND calamares_i18n_qrc_content "${basename}_${lang}.qm" )
-        list( APPEND calamares_i18n_ts_filelist "${CMAKE_CURRENT_SOURCE_DIR}/${_qrt_SUBDIRECTORY}/${basename}_${lang}.ts" )
+    set(calamares_i18n_qrc_content "")
+    set(calamares_i18n_ts_filelist "")
+    foreach(lang ${_qrt_LANGUAGES})
+        string(APPEND calamares_i18n_qrc_content "${basename}_${lang}.qm")
+        list(
+            APPEND
+            calamares_i18n_ts_filelist
+            "${CMAKE_CURRENT_SOURCE_DIR}/${_qrt_SUBDIRECTORY}/${basename}_${lang}.ts"
+        )
     endforeach()
 
-    configure_file( ${CMAKE_SOURCE_DIR}/lang/calamares_i18n.qrc.in ${translations_qrc_infile} @ONLY )
+    configure_file(${CMAKE_SOURCE_DIR}/lang/calamares_i18n.qrc.in ${translations_qrc_infile} @ONLY)
     qt5_add_translation(QM_FILES ${calamares_i18n_ts_filelist})
 
     # Run the resource compiler (rcc_options should already be set)
     add_custom_command(
         OUTPUT ${translations_qrc_outfile}
         COMMAND "${Qt5Core_RCC_EXECUTABLE}"
-        ARGS ${rcc_options} --format-version 1 -name ${basename} -o ${translations_qrc_outfile} ${translations_qrc_infile}
+        ARGS
+            ${rcc_options}
+            --format-version
+            1
+            -name
+            ${basename}
+            -o
+            ${translations_qrc_outfile}
+            ${translations_qrc_infile}
         MAIN_DEPENDENCY ${translations_qrc_infile}
         DEPENDS ${QM_FILES}
     )
 
-    set( ${_qrt_OUTPUT_VARIABLE} ${translations_qrc_outfile} PARENT_SCOPE )
+    set(${_qrt_OUTPUT_VARIABLE} ${translations_qrc_outfile} PARENT_SCOPE)
 endfunction()
 
 calamares_qrc_translations( localetest OUTPUT_VARIABLE localetest_qrc SUBDIRECTORY testdata LANGUAGES nl )
-calamares_add_test(
-    libcalamareslocaletest
-    SOURCES
-        locale/Tests.cpp
-        ${localetest_qrc}
-)
 
-calamares_add_test(
-    libcalamaresmodulesystemtest
-    SOURCES
-        modulesystem/Tests.cpp
-)
+### TESTING
+#
+#
+calamares_add_test(libcalamarestest SOURCES Tests.cpp)
 
-calamares_add_test(
-    libcalamaresnetworktest
-    SOURCES
-        network/Tests.cpp
-)
+calamares_add_test(libcalamaresgeoiptest SOURCES geoip/GeoIPTests.cpp ${geoip_src})
 
-calamares_add_test(
-    libcalamarespackagestest
-    SOURCES
-        packages/Tests.cpp
-)
+calamares_add_test(libcalamareslocaletest SOURCES locale/Tests.cpp ${localetest_qrc})
 
-calamares_add_test(
-    libcalamarespartitiontest
-    SOURCES
-        partition/Global.cpp
-        partition/Tests.cpp
-    LIBRARIES
-        ${OPTIONAL_PRIVATE_LIBRARIES}
-)
+calamares_add_test(libcalamaresmodulesystemtest SOURCES modulesystem/Tests.cpp)
 
-if( KPMcore_FOUND )
-    calamares_add_test(
-        libcalamarespartitionkpmtest
-        SOURCES
-            partition/KPMTests.cpp
-        LIBRARIES
-            ${OPTIONAL_PRIVATE_LIBRARIES}
-    )
+calamares_add_test(libcalamaresnetworktest SOURCES network/Tests.cpp)
+
+calamares_add_test(libcalamarespackagestest SOURCES packages/Tests.cpp)
+
+if(KPMcore_FOUND)
+    calamares_add_test(libcalamarespartitiontest SOURCES partition/Global.cpp partition/Tests.cpp LIBRARIES kpmcore)
+    calamares_add_test(libcalamarespartitionkpmtest SOURCES partition/KPMTests.cpp LIBRARIES kpmcore)
 endif()
 
-calamares_add_test(
-    libcalamaresutilstest
-    SOURCES
-        utils/Tests.cpp
-        utils/Runner.cpp
-)
-
-calamares_add_test(
-    libcalamaresutilspathstest
-    SOURCES
-        utils/TestPaths.cpp
-)
+calamares_add_test(libcalamaresutilstest SOURCES utils/Tests.cpp utils/Runner.cpp)
 
+calamares_add_test(libcalamaresutilspathstest SOURCES utils/TestPaths.cpp)
 
 # This is not an actual test, it's a test / demo application
 # for experimenting with GeoIP.
-add_executable( test_geoip geoip/test_geoip.cpp ${geoip_src} )
-target_link_libraries( test_geoip Calamares::calamares Qt5::Network yamlcpp::yamlcpp )
+add_executable(test_geoip geoip/test_geoip.cpp ${geoip_src})
+target_link_libraries(test_geoip Calamares::calamares Qt5::Network yamlcpp::yamlcpp)
 calamares_automoc( test_geoip )
 
-if ( Qt5DBus_FOUND )
-    add_executable( test_automount partition/calautomount.cpp )
-    target_link_libraries( test_automount Calamares::calamares Qt5::DBus )
+if(Qt5DBus_FOUND)
+    add_executable(test_automount partition/calautomount.cpp)
+    target_link_libraries(test_automount Calamares::calamares Qt5::DBus)
 endif()
diff --git a/src/libcalamares/CalamaresConfig.h.in b/src/libcalamares/CalamaresConfig.h.in
index 3d551b8e8..23d4ebfd0 100644
--- a/src/libcalamares/CalamaresConfig.h.in
+++ b/src/libcalamares/CalamaresConfig.h.in
@@ -25,7 +25,6 @@
  * which is the CMake-time side of the same configuration.
  */
 #cmakedefine WITH_PYTHON
-#cmakedefine WITH_PYTHONQT
 #cmakedefine WITH_QML
 
 #endif  // CALAMARESCONFIG_H
diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp
index 3532d8f32..753e222d1 100644
--- a/src/libcalamares/PythonJobApi.cpp
+++ b/src/libcalamares/PythonJobApi.cpp
@@ -262,7 +262,7 @@ host_env_process_output( const boost::python::list& args,
 std::string
 obscure( const std::string& string )
 {
-    return CalamaresUtils::obscure( QString::fromStdString( string ) ).toStdString();
+    return Calamares::String::obscure( QString::fromStdString( string ) ).toStdString();
 }
 
 static QStringList
diff --git a/src/libcalamares/modulesystem/Descriptor.cpp b/src/libcalamares/modulesystem/Descriptor.cpp
index 52275b2f0..14fee0371 100644
--- a/src/libcalamares/modulesystem/Descriptor.cpp
+++ b/src/libcalamares/modulesystem/Descriptor.cpp
@@ -40,7 +40,6 @@ interfaceNames()
         { QStringLiteral("process"), Interface::Process },
         { QStringLiteral("qtplugin"), Interface::QtPlugin },
         { QStringLiteral("python"), Interface::Python },
-        { QStringLiteral("pythonqt"), Interface::PythonQt }
     };
     // *INDENT-ON*
     // clang-format on
@@ -107,7 +106,6 @@ Descriptor::fromDescriptorData( const QVariantMap& moduleDesc, const QString& de
         consumedKeys << "load";
         break;
     case Interface::Python:
-    case Interface::PythonQt:
         d.m_script = CalamaresUtils::getString( moduleDesc, "script" );
         if ( d.m_script.isEmpty() )
         {
diff --git a/src/libcalamares/modulesystem/Descriptor.h b/src/libcalamares/modulesystem/Descriptor.h
index fb1a66309..5b3681336 100644
--- a/src/libcalamares/modulesystem/Descriptor.h
+++ b/src/libcalamares/modulesystem/Descriptor.h
@@ -42,7 +42,6 @@ enum class Interface
     QtPlugin,  // Jobs or Views
     Python,  // Jobs only
     Process,  // Deprecated interface
-    PythonQt  // Views only, available as enum even if PythonQt isn't used
 };
 const NamedEnumTable< Interface >& interfaceNames();
 
@@ -114,7 +113,7 @@ public:
      */
     QString script() const
     {
-        return ( m_interface == Interface::Python || m_interface == Interface::PythonQt ) ? m_script : QString();
+        return m_interface == Interface::Python ? m_script : QString();
     }
 
 private:
diff --git a/src/libcalamares/modulesystem/RequirementsChecker.cpp b/src/libcalamares/modulesystem/RequirementsChecker.cpp
index 3d3e16172..4e4a40ec4 100644
--- a/src/libcalamares/modulesystem/RequirementsChecker.cpp
+++ b/src/libcalamares/modulesystem/RequirementsChecker.cpp
@@ -43,7 +43,7 @@ RequirementsChecker::run()
 {
     m_progressTimer = new QTimer( this );
     connect( m_progressTimer, &QTimer::timeout, this, &RequirementsChecker::reportProgress );
-    m_progressTimer->start( 1200 );  // msec
+    m_progressTimer->start( std::chrono::milliseconds( 1200 ) );
 
     for ( const auto& module : m_modules )
     {
@@ -76,7 +76,7 @@ RequirementsChecker::finished()
         }
 
         m_model->describe();
-        m_model->changeRequirementsList();
+        m_model->reCheckList();
         QTimer::singleShot( 0, this, &RequirementsChecker::done );
     }
 }
@@ -91,7 +91,7 @@ RequirementsChecker::addCheckedRequirements( Module* m )
         m_model->addRequirementsList( l );
     }
 
-    requirementsProgress( tr( "Requirements checking for module %1 is complete." ).arg( m->name() ) );
+    Q_EMIT requirementsProgress( tr( "Requirements checking for module '%1' is complete." ).arg( m->name() ) );
 }
 
 void
@@ -117,11 +117,11 @@ RequirementsChecker::reportProgress()
         unsigned int posInterval = ( m_progressTimer->interval() < 0 ) ? 1000 : uint( m_progressTimer->interval() );
         QString waiting = tr( "Waiting for %n module(s).", "", remaining );
         QString elapsed = tr( "(%n second(s))", "", m_progressTimeouts * posInterval / 1000 );
-        emit requirementsProgress( waiting + QString( " " ) + elapsed );
+        Q_EMIT requirementsProgress( waiting + QString( " " ) + elapsed );
     }
     else
     {
-        emit requirementsProgress( tr( "System-requirements checking is complete." ) );
+        Q_EMIT requirementsProgress( tr( "System-requirements checking is complete." ) );
     }
 }
 
diff --git a/src/libcalamares/modulesystem/RequirementsModel.cpp b/src/libcalamares/modulesystem/RequirementsModel.cpp
index 3a0c85ccd..b9a091014 100644
--- a/src/libcalamares/modulesystem/RequirementsModel.cpp
+++ b/src/libcalamares/modulesystem/RequirementsModel.cpp
@@ -16,17 +16,41 @@ namespace Calamares
 {
 
 void
-RequirementsModel::addRequirementsList( const Calamares::RequirementsList& requirements )
+RequirementsModel::clear()
 {
     QMutexLocker l( &m_addLock );
     beginResetModel();
-    m_requirements.append( requirements );
-    changeRequirementsList();
+    m_requirements.clear();
     endResetModel();
+    reCheckList();
 }
 
 void
-RequirementsModel::changeRequirementsList()
+RequirementsModel::addRequirementsList( const Calamares::RequirementsList& requirements )
+{
+    QMutexLocker l( &m_addLock );
+
+    beginResetModel();
+    for ( const auto& r : requirements )
+    {
+        auto it = std::find_if( m_requirements.begin(),
+                                m_requirements.end(),
+                                [ &r ]( const Calamares::RequirementEntry& re ) { return r.name == re.name; } );
+        if ( it != m_requirements.end() )
+        {
+            *it = r;
+        }
+        else
+        {
+            m_requirements.append( r );
+        }
+    }
+    endResetModel();
+    reCheckList();
+}
+
+void
+RequirementsModel::reCheckList()
 {
     auto isUnSatisfied = []( const Calamares::RequirementEntry& e ) { return !e.satisfied; };
     auto isMandatoryAndUnSatisfied = []( const Calamares::RequirementEntry& e ) { return e.mandatory && !e.satisfied; };
@@ -34,8 +58,8 @@ RequirementsModel::changeRequirementsList()
     m_satisfiedRequirements = std::none_of( m_requirements.begin(), m_requirements.end(), isUnSatisfied );
     m_satisfiedMandatory = std::none_of( m_requirements.begin(), m_requirements.end(), isMandatoryAndUnSatisfied );
 
-    emit satisfiedRequirementsChanged( m_satisfiedRequirements );
-    emit satisfiedMandatoryChanged( m_satisfiedMandatory );
+    Q_EMIT satisfiedRequirementsChanged( m_satisfiedRequirements );
+    Q_EMIT satisfiedMandatoryChanged( m_satisfiedMandatory );
 }
 
 int
@@ -98,7 +122,7 @@ void
 RequirementsModel::setProgressMessage( const QString& m )
 {
     m_progressMessage = m;
-    emit progressMessageChanged( m_progressMessage );
+    Q_EMIT progressMessageChanged( m_progressMessage );
 }
 
 }  // namespace Calamares
diff --git a/src/libcalamares/modulesystem/RequirementsModel.h b/src/libcalamares/modulesystem/RequirementsModel.h
index 5f3e13cbb..bd71ce81f 100644
--- a/src/libcalamares/modulesystem/RequirementsModel.h
+++ b/src/libcalamares/modulesystem/RequirementsModel.h
@@ -33,8 +33,6 @@ class RequirementsChecker;
  */
 class DLLEXPORT RequirementsModel : public QAbstractListModel
 {
-    friend class RequirementsChecker;
-
     Q_OBJECT
     Q_PROPERTY( bool satisfiedRequirements READ satisfiedRequirements NOTIFY satisfiedRequirementsChanged FINAL )
     Q_PROPERTY( bool satisfiedMandatory READ satisfiedMandatory NOTIFY satisfiedMandatoryChanged FINAL )
@@ -45,11 +43,11 @@ public:
 
     enum Roles : short
     {
-        Name,
+        NegatedText = Qt::DisplayRole,
+        Details = Qt::ToolTipRole,
+        Name = Qt::UserRole,
         Satisfied,
         Mandatory,
-        Details,
-        NegatedText,
         HasDetails
     };
     // No Q_ENUM because these are exposed through roleNames()
@@ -69,6 +67,15 @@ public:
     ///@brief Debugging tool, describe the checking-state
     void describe() const;
 
+    ///@brief Update progress message (called by the checker)
+    void setProgressMessage( const QString& m );
+
+    ///@brief Append some requirements; resets the model
+    void addRequirementsList( const Calamares::RequirementsList& requirements );
+
+    ///@brief Check the whole list, emit signals satisfied...()
+    void reCheckList();
+
 signals:
     void satisfiedRequirementsChanged( bool value );
     void satisfiedMandatoryChanged( bool value );
@@ -77,16 +84,10 @@ signals:
 protected:
     QHash< int, QByteArray > roleNames() const override;
 
-    ///@brief Append some requirements; resets the model
-    void addRequirementsList( const Calamares::RequirementsList& requirements );
-
-    ///@brief Update progress message (called by the checker)
-    void setProgressMessage( const QString& m );
+    ///@brief Clears the requirements; resets the model
+    void clear();
 
 private:
-    ///@brief Implementation for {set,add}RequirementsList
-    void changeRequirementsList();
-
     QString m_progressMessage;
     QMutex m_addLock;
     RequirementsList m_requirements;
diff --git a/src/libcalamares/network/Manager.cpp b/src/libcalamares/network/Manager.cpp
index 6cb270ecd..536474b2b 100644
--- a/src/libcalamares/network/Manager.cpp
+++ b/src/libcalamares/network/Manager.cpp
@@ -29,16 +29,11 @@ namespace Network
 void
 RequestOptions::applyToRequest( QNetworkRequest* request ) const
 {
-#if QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 )
-    constexpr const auto RedirectPolicyAttribute = QNetworkRequest::FollowRedirectsAttribute;
-#else
-    constexpr const auto RedirectPolicyAttribute = QNetworkRequest::RedirectPolicyAttribute;
-#endif
 
     if ( m_flags & Flag::FollowRedirect )
     {
         // Follows all redirects except unsafe ones (https to http).
-        request->setAttribute( RedirectPolicyAttribute, true );
+        request->setAttribute( QNetworkRequest::RedirectPolicyAttribute, true );
     }
 
     if ( m_flags & Flag::FakeUserAgent )
diff --git a/src/libcalamares/partition/Global.h b/src/libcalamares/partition/Global.h
index 733e2f69c..b76c74c58 100644
--- a/src/libcalamares/partition/Global.h
+++ b/src/libcalamares/partition/Global.h
@@ -17,13 +17,10 @@
 #define PARTITION_GLOBAL_H
 
 #include "DllMacro.h"
+#include "FileSystem.h"
 #include "JobQueue.h"
 
-#ifdef WITH_KPMCORE4API
-#include "FileSystem.h"
-
 #include 
-#endif
 
 namespace CalamaresUtils
 {
@@ -78,7 +75,6 @@ isFilesystemUsedGS( const QString& filesystemType )
     return isFilesystemUsedGS( Calamares::JobQueue::instanceGlobalStorage(), filesystemType );
 }
 
-#ifdef WITH_KPMCORE4API
 /** @brief Mark a particular filesystem type as used (or not)
  *
  * See useFilesystemGS(const QString&, bool); this method uses the filesystem type
@@ -100,7 +96,6 @@ isFilesystemUsedGS( FileSystem::Type filesystem )
     return isFilesystemUsedGS( untranslatedFS( filesystem ) );
 }
 
-#endif
 }  // namespace Partition
 }  // namespace CalamaresUtils
 
diff --git a/src/libcalamares/partition/KPMHelper.h b/src/libcalamares/partition/KPMHelper.h
index f6007b119..e61c31956 100644
--- a/src/libcalamares/partition/KPMHelper.h
+++ b/src/libcalamares/partition/KPMHelper.h
@@ -25,6 +25,8 @@
 #pragma clang diagnostic ignored "-Wdocumentation"
 #pragma clang diagnostic ignored "-Wsuggest-destructor-override"
 #pragma clang diagnostic ignored "-Winconsistent-missing-destructor-override"
+// Because of __lastType
+#pragma clang diagnostic ignored "-Wreserved-identifier"
 #endif
 
 #include 
diff --git a/src/libcalamares/partition/KPMManager.cpp b/src/libcalamares/partition/KPMManager.cpp
index 8031030b1..7220b6151 100644
--- a/src/libcalamares/partition/KPMManager.cpp
+++ b/src/libcalamares/partition/KPMManager.cpp
@@ -14,10 +14,7 @@
 
 #include 
 #include 
-#if defined( WITH_KPMCORE4API )
 #include 
-#endif
-
 
 #include 
 
@@ -30,7 +27,6 @@ class InternalManager
 {
 public:
     InternalManager();
-    ~InternalManager();
 };
 
 static bool s_kpm_loaded = false;
@@ -69,22 +65,6 @@ InternalManager::InternalManager()
     }
 }
 
-InternalManager::~InternalManager()
-{
-#if defined( WITH_KPMCORE4API ) && !defined( WITH_KPMCORE42API )
-    cDebug() << "Cleaning up KPMCore backend ..";
-
-    // From KPMcore 4.0 until KPMcore 4.2 we needed to stop
-    // the helper by hand. KPMcore 4.2 ported to polkit directly,
-    // which doesn't need a helper.
-    auto backend_p = CoreBackendManager::self()->backend();
-    if ( backend_p )
-    {
-        ExternalCommand::stopHelper();
-    }
-#endif
-}
-
 std::shared_ptr< InternalManager >
 getInternal()
 {
diff --git a/src/libcalamares/partition/KPMTests.cpp b/src/libcalamares/partition/KPMTests.cpp
index 3834b7913..2f828f772 100644
--- a/src/libcalamares/partition/KPMTests.cpp
+++ b/src/libcalamares/partition/KPMTests.cpp
@@ -57,18 +57,10 @@ KPMTests::testFlagNames()
 
     QCOMPARE( PartitionTable::flagName( static_cast< PartitionTable::Flag >( 1 ) ), QStringLiteral( "boot" ) );
 
-#ifdef WITH_KPMCORE4API
     // KPMCore 4 unifies the flags and handles them internally
     QCOMPARE( PartitionTable::flagName( PartitionTable::Flag::Boot ), QStringLiteral( "boot" ) );
     QVERIFY( names.contains( QStringLiteral( "boot" ) ) );
     QVERIFY( !names.contains( QStringLiteral( "esp" ) ) );
-#else
-    // KPMCore 3 has separate flags
-    QCOMPARE( PartitionTable::flagName( PartitionTable::FlagBoot ), QStringLiteral( "boot" ) );
-    QCOMPARE( PartitionTable::flagName( PartitionTable::FlagEsp ), QStringLiteral( "esp" ) );
-    QVERIFY( names.contains( QStringLiteral( "boot" ) ) );
-    QVERIFY( names.contains( QStringLiteral( "esp" ) ) );
-#endif
 }
 
 void
diff --git a/src/libcalamares/partition/PartitionQuery.cpp b/src/libcalamares/partition/PartitionQuery.cpp
index 0356f920c..4d54215f3 100644
--- a/src/libcalamares/partition/PartitionQuery.cpp
+++ b/src/libcalamares/partition/PartitionQuery.cpp
@@ -50,12 +50,7 @@ isPartitionFreeSpace( const Partition* partition )
 bool
 isPartitionNew( const Partition* partition )
 {
-#if defined( WITH_KPMCORE4API )
-    constexpr auto NewState = Partition::State::New;
-#else
-    constexpr auto NewState = Partition::StateNew;
-#endif
-    return partition->state() == NewState;
+    return partition->state() == Partition::State::New;
 }
 
 
diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/CalamaresUtilsSystem.cpp
index 2d6bdde83..7622b006d 100644
--- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp
+++ b/src/libcalamares/utils/CalamaresUtilsSystem.cpp
@@ -230,7 +230,7 @@ System::createTargetParentDirs( const QString& filePath ) const
 }
 
 
-QPair< qint64, qreal >
+QPair< quint64, qreal >
 System::getTotalMemoryB() const
 {
 #ifdef Q_OS_LINUX
diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.h b/src/libcalamares/utils/CalamaresUtilsSystem.h
index f7f04079e..f4f5257c4 100644
--- a/src/libcalamares/utils/CalamaresUtilsSystem.h
+++ b/src/libcalamares/utils/CalamaresUtilsSystem.h
@@ -337,7 +337,7 @@ public:
      *
      * @return size, guesstimate-factor
      */
-    DLLEXPORT QPair< qint64, qreal > getTotalMemoryB() const;
+    DLLEXPORT QPair< quint64, qreal > getTotalMemoryB() const;
 
     /**
      * @brief getCpuDescription returns a string describing the CPU.
diff --git a/src/libcalamares/utils/CommandList.cpp b/src/libcalamares/utils/CommandList.cpp
index 4652dcc5a..7e1f42d22 100644
--- a/src/libcalamares/utils/CommandList.cpp
+++ b/src/libcalamares/utils/CommandList.cpp
@@ -16,6 +16,7 @@
 // #include "utils/CalamaresUtils.h"
 #include "utils/CalamaresUtilsSystem.h"
 #include "utils/Logger.h"
+#include "utils/StringExpander.h"
 #include "utils/Variant.h"
 
 #include 
@@ -67,6 +68,48 @@ get_variant_stringlist( const QVariantList& l )
     return retl;
 }
 
+static Calamares::String::DictionaryExpander
+get_gs_expander( System::RunLocation location )
+{
+    Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
+
+    Calamares::String::DictionaryExpander expander;
+
+    // Figure out the replacement for ${ROOT}
+    if ( location == System::RunLocation::RunInTarget )
+    {
+        expander.insert( QStringLiteral( "ROOT" ), QStringLiteral( "/" ) );
+    }
+    else if ( gs && gs->contains( "rootMountPoint" ) )
+    {
+        expander.insert( QStringLiteral( "ROOT" ), gs->value( "rootMountPoint" ).toString() );
+    }
+
+    // Replacement for ${USER}
+    if ( gs && gs->contains( "username" ) )
+    {
+        expander.insert( QStringLiteral( "USER" ), gs->value( "username" ).toString() );
+    }
+
+    return expander;
+}
+
+CommandLine
+CommandLine::expand( KMacroExpanderBase& expander ) const
+{
+    QString c = first;
+    expander.expandMacrosShellQuote( c );
+    return { c, second };
+}
+
+CalamaresUtils::CommandLine
+CommandLine::expand() const
+{
+    auto expander = get_gs_expander( System::RunLocation::RunInHost );
+    return expand( expander );
+}
+
+
 CommandList::CommandList( bool doChroot, std::chrono::seconds timeout )
     : m_doChroot( doChroot )
     , m_timeout( timeout )
@@ -90,7 +133,7 @@ CommandList::CommandList::CommandList( const QVariant& v, bool doChroot, std::ch
     }
     else if ( v.type() == QVariant::String )
     {
-        append( v.toString() );
+        append( { v.toString(), m_timeout } );
     }
     else if ( v.type() == QVariant::Map )
     {
@@ -107,61 +150,28 @@ CommandList::CommandList::CommandList( const QVariant& v, bool doChroot, std::ch
     }
 }
 
-CommandList::~CommandList() {}
-
-static inline bool
-findInCommands( const CommandList& l, const QString& needle )
-{
-    for ( CommandList::const_iterator i = l.cbegin(); i != l.cend(); ++i )
-        if ( i->command().contains( needle ) )
-        {
-            return true;
-        }
-    return false;
-}
-
 Calamares::JobResult
 CommandList::run()
 {
-    QLatin1String rootMagic( "@@ROOT@@" );
-    QLatin1String userMagic( "@@USER@@" );
-
     System::RunLocation location = m_doChroot ? System::RunLocation::RunInTarget : System::RunLocation::RunInHost;
 
-    /* Figure out the replacement for @@ROOT@@ */
-    QString root = QStringLiteral( "/" );
-    Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
-
-    bool needsRootSubstitution = findInCommands( *this, rootMagic );
-    if ( needsRootSubstitution && ( location == System::RunLocation::RunInHost ) )
+    auto expander = get_gs_expander( location );
+    auto expandedList = expand( expander );
+    if ( expander.hasErrors() )
     {
-        if ( !gs || !gs->contains( "rootMountPoint" ) )
-        {
-            cError() << "No rootMountPoint defined.";
-            return Calamares::JobResult::error(
-                QCoreApplication::translate( "CommandList", "Could not run command." ),
-                QCoreApplication::translate( "CommandList",
-                                             "The command runs in the host environment and needs to know the root "
-                                             "path, but no rootMountPoint is defined." ) );
-        }
-        root = gs->value( "rootMountPoint" ).toString();
-    }
-
-    bool needsUserSubstitution = findInCommands( *this, userMagic );
-    if ( needsUserSubstitution && ( !gs || !gs->contains( "username" ) ) )
-    {
-        cError() << "No username defined.";
+        const auto missing = expander.errorNames();
+        cError() << "Missing variables:" << missing;
         return Calamares::JobResult::error(
             QCoreApplication::translate( "CommandList", "Could not run command." ),
             QCoreApplication::translate( "CommandList",
-                                         "The command needs to know the user's name, but no username is defined." ) );
+                                         "The commands use variables that are not defined. "
+                                         "Missing variables are: %1." )
+                .arg( missing.join( ',' ) ) );
     }
-    QString user = gs->value( "username" ).toString();  // may be blank if unset
 
-    for ( CommandList::const_iterator i = cbegin(); i != cend(); ++i )
+    for ( CommandList::const_iterator i = expandedList.cbegin(); i != expandedList.cend(); ++i )
     {
         QString processed_cmd = i->command();
-        processed_cmd.replace( rootMagic, root ).replace( userMagic, user );
         bool suppress_result = false;
         if ( processed_cmd.startsWith( '-' ) )
         {
@@ -191,10 +201,24 @@ CommandList::run()
     return Calamares::JobResult::ok();
 }
 
-void
-CommandList::append( const QString& s )
+CommandList
+CommandList::expand( KMacroExpanderBase& expander ) const
 {
-    append( CommandLine( s, m_timeout ) );
+    // Copy and expand the list, collecting missing variables (so don't call expand())
+    CommandList expandedList( m_doChroot, m_timeout );
+    std::transform( cbegin(),
+                    cend(),
+                    std::back_inserter( expandedList ),
+                    [ &expander ]( const CommandLine& c ) { return c.expand( expander ); } );
+    return expandedList;
 }
 
+CommandList
+CommandList::expand() const
+{
+    auto expander = get_gs_expander( System::RunLocation::RunInHost );
+    return expand( expander );
+}
+
+
 }  // namespace CalamaresUtils
diff --git a/src/libcalamares/utils/CommandList.h b/src/libcalamares/utils/CommandList.h
index 432020a96..586b04ed3 100644
--- a/src/libcalamares/utils/CommandList.h
+++ b/src/libcalamares/utils/CommandList.h
@@ -18,6 +18,8 @@
 
 #include 
 
+class KMacroExpanderBase;
+
 namespace CalamaresUtils
 {
 
@@ -50,6 +52,20 @@ struct CommandLine : public QPair< QString, std::chrono::seconds >
     std::chrono::seconds timeout() const { return second; }
 
     bool isValid() const { return !first.isEmpty(); }
+
+    /** @brief Returns a copy of this one command, with variables expanded
+     *
+     * The given macro-expander is used to expand the command-line.
+     * This will normally be a Calamares::String::DictionaryExpander
+     * instance, which handles the ROOT and USER variables.
+     */
+    CommandLine expand( KMacroExpanderBase& expander ) const;
+    /** @brief As above, with a default macro-expander.
+     *
+     * The default macro-expander assumes RunInHost (e.g. ROOT will
+     * expand to the RootMountPoint set in Global Storage).
+     */
+    CommandLine expand() const;
 };
 
 /** @brief Abbreviation, used internally. */
@@ -69,7 +85,6 @@ public:
     /** @brief empty command-list with timeout to apply to entries. */
     CommandList( bool doChroot = true, std::chrono::seconds timeout = std::chrono::seconds( 10 ) );
     CommandList( const QVariant& v, bool doChroot = true, std::chrono::seconds timeout = std::chrono::seconds( 10 ) );
-    ~CommandList();
 
     bool doChroot() const { return m_doChroot; }
 
@@ -81,10 +96,21 @@ public:
     using CommandList_t::const_iterator;
     using CommandList_t::count;
     using CommandList_t::isEmpty;
+    using CommandList_t::push_back;
+    using CommandList_t::value_type;
 
-protected:
-    using CommandList_t::append;
-    void append( const QString& );
+    /** @brief Return a copy of this command-list, with variables expanded
+     *
+     * Each command-line in the list is expanded with the given @p expander.
+     * @see CommandLine::expand() for details.
+     */
+    CommandList expand( KMacroExpanderBase& expander ) const;
+    /** @brief As above, with a default macro-expander.
+     *
+     * Each command-line in the list is expanded with that default macro-expander.
+     * @see CommandLine::expand() for details.
+     */
+    CommandList expand() const;
 
 private:
     bool m_doChroot;
diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp
index adb082687..10f7cad8c 100644
--- a/src/libcalamares/utils/Logger.cpp
+++ b/src/libcalamares/utils/Logger.cpp
@@ -53,7 +53,14 @@ setupLogLevel( unsigned int level )
     {
         level = LOGVERBOSE;
     }
-    s_threshold = level + 1;  // Comparison is < in log() function
+    s_threshold = level + 1;  // Comparison is < in logLevelEnabled() function
+}
+
+unsigned int
+logLevel()
+{
+    // Undo the +1 in setupLogLevel()
+    return s_threshold > 0 ? s_threshold - 1 : 0;
 }
 
 bool
@@ -62,33 +69,40 @@ logLevelEnabled( unsigned int level )
     return level < s_threshold;
 }
 
-unsigned int
-logLevel()
+/** @brief Should we call the log_implementation() function with this level?
+ *
+ * The implementation logs everything for which logLevelEnabled() is
+ * true to the file **and** to stdout; it logs everything at debug-level
+ * or below to the file regardless.
+ */
+static inline bool
+log_enabled( unsigned int level )
 {
-    return s_threshold > 0 ? s_threshold - 1 : 0;
+    return level <= LOGDEBUG || logLevelEnabled( level );
 }
 
 static void
-log( const char* msg, unsigned int debugLevel, bool withTime = true )
+log_implementation( const char* msg, unsigned int debugLevel, const bool withTime )
 {
+    QMutexLocker lock( &s_mutex );
+
+    const auto date = QDate::currentDate().toString( Qt::ISODate );
+    const auto time = QTime::currentTime().toString();
+
+    // If we don't format the date as a Qt::ISODate then we get a crash when
+    // logging at exit as Qt tries to use QLocale to format, but QLocale is
+    // on its way out.
+    logfile << date.toUtf8().data() << " - " << time.toUtf8().data() << " [" << debugLevel << "]: " << msg << std::endl;
+
+    logfile.flush();
+
     if ( logLevelEnabled( debugLevel ) )
     {
-        QMutexLocker lock( &s_mutex );
-
-        // If we don't format the date as a Qt::ISODate then we get a crash when
-        // logging at exit as Qt tries to use QLocale to format, but QLocale is
-        // on its way out.
-        logfile << QDate::currentDate().toString( Qt::ISODate ).toUtf8().data() << " - "
-                << QTime::currentTime().toString().toUtf8().data() << " ["
-                << QString::number( debugLevel ).toUtf8().data() << "]: " << msg << std::endl;
-
-        logfile.flush();
-
         if ( withTime )
         {
-            std::cout << QTime::currentTime().toString().toUtf8().data() << " ["
-                      << QString::number( debugLevel ).toUtf8().data() << "]: ";
+            std::cout << time.toUtf8().data() << " [" << debugLevel << "]: ";
         }
+        // The endl is desired, since it also flushes (like the logfile, above)
         std::cout << msg << std::endl;
     }
 }
@@ -97,29 +111,30 @@ log( const char* msg, unsigned int debugLevel, bool withTime = true )
 static void
 CalamaresLogHandler( QtMsgType type, const QMessageLogContext&, const QString& msg )
 {
-    static QMutex s_mutex;
-
-    QByteArray ba = msg.toUtf8();
-    const char* message = ba.constData();
-
-    QMutexLocker locker( &s_mutex );
-
+    unsigned int level = LOGVERBOSE;
     switch ( type )
     {
     case QtInfoMsg:
-        log( message, LOGVERBOSE );
+        level = LOGVERBOSE;
         break;
     case QtDebugMsg:
-        log( message, LOGDEBUG );
+        level = LOGDEBUG;
         break;
     case QtWarningMsg:
-        log( message, LOGWARNING );
+        level = LOGWARNING;
         break;
     case QtCriticalMsg:
     case QtFatalMsg:
-        log( message, LOGERROR );
+        level = LOGERROR;
         break;
     }
+
+    if ( !log_enabled( level ) )
+    {
+        return;
+    }
+
+    log_implementation( msg.toUtf8().constData(), level, true );
 }
 
 
@@ -188,14 +203,14 @@ CDebug::CDebug( unsigned int debugLevel, const char* func )
 
 CDebug::~CDebug()
 {
-    if ( logLevelEnabled( m_debugLevel ) )
+    if ( log_enabled( m_debugLevel ) )
     {
         if ( m_funcinfo )
         {
             m_msg.prepend( s_Continuation );  // Prepending, so back-to-front
             m_msg.prepend( m_funcinfo );
         }
-        log( m_msg.toUtf8().data(), m_debugLevel, m_funcinfo );
+        log_implementation( m_msg.toUtf8().data(), m_debugLevel, bool( m_funcinfo ) );
     }
 }
 
diff --git a/src/libcalamares/utils/PluginFactory.h b/src/libcalamares/utils/PluginFactory.h
index a3371dd72..8e841f5e7 100644
--- a/src/libcalamares/utils/PluginFactory.h
+++ b/src/libcalamares/utils/PluginFactory.h
@@ -4,10 +4,6 @@
  *   SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot 
  *   SPDX-License-Identifier: GPL-3.0-or-later
  *
- *   Based on KPluginFactory from KCoreAddons, KDE project
- *   SPDX-FileCopyrightText: 2007 Matthias Kretz 
- *   SPDX-FileCopyrightText: 2007 Bernhard Loos 
- *
  *   Calamares is Free Software: see the License-Identifier above.
  *
  *
@@ -16,81 +12,100 @@
 #ifndef UTILS_PLUGINFACTORY_H
 #define UTILS_PLUGINFACTORY_H
 
-#include 
+#include 
 
 #define CalamaresPluginFactory_iid "io.calamares.PluginFactory"
 
 /** @brief Plugin factory for Calamares
  *
- * Try to re-use KPluginFactory as much as possible (since the
- * old code for PluginFactory was a fork of an old version of
- * exactly that).
+ * A Calamares plugin contains just one kind of plugin -- either
+ * a job, or a viewstep -- so the factory is straightforward.
+ * It gets a single CreateInstanceFunction and calls that;
+ * the function is set when registerPlugin() is called in a subclass.
  *
- * The current createInstance() method passes more arguments
- * to the job and viewstep constructors than we want; chasing
- * that change means modifying each Calamares module. This class
- * implements a version of createInstance() with fewer arguments
- * and overloads registerPlugin() to use that.
  */
-class CalamaresPluginFactory : public KPluginFactory
+class CalamaresPluginFactory : public QObject
 {
     Q_OBJECT
 public:
-    explicit CalamaresPluginFactory()
-        : KPluginFactory()
-    {
-    }
+    explicit CalamaresPluginFactory() {}
     ~CalamaresPluginFactory() override;
 
-    /** @brief Create an object from the factory.
-     *
-     * Ignores all the @p args since they are not used. Calls
-     * Calamares constructors for the Jobs and ViewSteps.
-     */
-    template < class impl, class ParentType >
-    static QObject* createInstance( QWidget* parentWidget, QObject* parent, const QVariantList& args )
+    typedef QObject* ( *CreateInstanceFunction )( QObject* );
+
+    template < class T >
+    T* create( QObject* parent = nullptr )
     {
-        Q_UNUSED( parentWidget )
-        Q_UNUSED( args )
-        ParentType* p = nullptr;
-        if ( parent )
+        auto* op = fn ? fn( parent ) : nullptr;
+        if ( !op )
         {
-            p = qobject_cast< ParentType* >( parent );
-            Q_ASSERT( p );
+            return nullptr;
         }
-        return new impl( p );
+        T* tp = qobject_cast< T* >( op );
+        if ( !tp )
+        {
+            delete op;
+        }
+        return tp;
     }
 
-    /** @brief register a plugin
-     *
-     * The Calamares version doesn't accept keywords, and uses
-     * the Calamares createInstance() version which ignores
-     * the QVariantList of arguments.
-     */
-    template < class T >
-    void registerPlugin()
-    {
-        KPluginFactory::registerPlugin< T >( QString(), &createInstance< T, QObject > );
-    }
+protected:
+    CreateInstanceFunction fn = nullptr;
 };
 
 /** @brief declare a Calamares Plugin Factory
  *
- * This would be defined as K_PLUGIN_FACTORY_DECLARATION_WITH_BASEFACTORY,
- * except that does not actually use the base factory class that is
- * passed in.
+ * There should be one declaration -- generally alongside the
+ * class definition for the Job or ViewStep that the plugin is
+ * going to provide, in the header -- and one definition -- in
+ * the corresponding implementation.
  */
 #define CALAMARES_PLUGIN_FACTORY_DECLARATION( name ) \
     class name : public CalamaresPluginFactory \
     { \
         Q_OBJECT \
-        Q_INTERFACES( KPluginFactory ) \
+        Q_INTERFACES( CalamaresPluginFactory ) \
         Q_PLUGIN_METADATA( IID CalamaresPluginFactory_iid ) \
     public: \
         explicit name(); \
         ~name() override; \
+        template < class T > \
+        static QObject* createInstance( QObject* parent ) \
+        { \
+            return new T( parent ); \
+        } \
+        template < class T > \
+        void registerPlugin() \
+        { \
+            fn = createInstance< T >; \
+        } \
     };
+
+/** @brief Define a Calamares Plugin Factory
+ *
+ * This should be done exactly once, generally in the translation
+ * unit containing the definitions for the main class of the plugin,
+ * either the Job or the ViewStep definitions.
+ *
+ * The @p name must match the name used in the declaration, while
+ * @p pluginRegistrations should be a single call to `registerPlugin()`
+ * where `T` is the type (subclass of Job or ViewStep) defined by the
+ * plugin, eg.
+ *
+ * ```
+ * CALAMARES_PLUGIN_FACTORY_DEFINITION( MyPlugin, registerPlugin() )
+ * ```
+ *
+ * Leaving out the `()` will lead to generally-weird compiler warnings.
+ */
 #define CALAMARES_PLUGIN_FACTORY_DEFINITION( name, pluginRegistrations ) \
-    K_PLUGIN_FACTORY_DEFINITION_WITH_BASEFACTORY( name, CalamaresPluginFactory, pluginRegistrations )
+    name::name() \
+        : CalamaresPluginFactory() \
+    { \
+        pluginRegistrations; \
+    } \
+    name::~name() {}
+
+Q_DECLARE_INTERFACE( CalamaresPluginFactory, CalamaresPluginFactory_iid )
 
 #endif
diff --git a/src/libcalamares/utils/Retranslator.cpp b/src/libcalamares/utils/Retranslator.cpp
index 74617fa47..f3ae93836 100644
--- a/src/libcalamares/utils/Retranslator.cpp
+++ b/src/libcalamares/utils/Retranslator.cpp
@@ -80,14 +80,20 @@ BrandingLoader::tryLoad( QTranslator* translator )
     {
         return false;
     }
+    // This is working backwards against m_prefix containing both
+    // a path and a branding-name. Split it in path + branding-name.
+    const int lastDirSeparator = m_prefix.lastIndexOf( QDir::separator() );
     QString brandingTranslationsDirPath( m_prefix );
-    brandingTranslationsDirPath.truncate( m_prefix.lastIndexOf( QDir::separator() ) );
-    QDir brandingTranslationsDir( brandingTranslationsDirPath );
-    if ( brandingTranslationsDir.exists() )
+    brandingTranslationsDirPath.truncate( lastDirSeparator );
+    QString filenameBase( m_prefix );
+    filenameBase.remove( 0, lastDirSeparator + 1 );
+
+
+    if ( QDir( brandingTranslationsDirPath ).exists() )
     {
-        QString filenameBase( m_prefix );
-        filenameBase.remove( 0, m_prefix.lastIndexOf( QDir::separator() ) + 1 );
-        if ( translator->load( m_localeName, filenameBase, "_", brandingTranslationsDir.absolutePath() ) )
+        const QString fileName = QStringLiteral( "%1_%2" ).arg( filenameBase, m_localeName );
+        cDebug() << Logger::SubEntry << "Loading" << fileName << "from" << brandingTranslationsDirPath;
+        if ( translator->load( fileName, brandingTranslationsDirPath ) )
         {
             cDebug() << Logger::SubEntry << "Branding using locale:" << m_localeName;
             return true;
diff --git a/src/libcalamares/utils/String.cpp b/src/libcalamares/utils/String.cpp
index c88c23693..f1708d5a3 100644
--- a/src/libcalamares/utils/String.cpp
+++ b/src/libcalamares/utils/String.cpp
@@ -19,7 +19,9 @@
 
 #include 
 
-namespace CalamaresUtils
+namespace Calamares
+{
+namespace String
 {
 QString
 removeDiacritics( const QString& string )
@@ -124,7 +126,7 @@ obscure( const QString& string )
 
 
 QString
-truncateMultiLine( const QString& string, CalamaresUtils::LinesStartEnd lines, CalamaresUtils::CharCount chars )
+truncateMultiLine( const QString& string, LinesStartEnd lines, CharCount chars )
 {
     const char NEWLINE = '\n';
     const int maxLines = lines.atStart + lines.atEnd;
@@ -246,4 +248,5 @@ removeTrailing( QString& string, QChar c )
     string.remove( lastIndex, string.length() );
 }
 
-}  // namespace CalamaresUtils
+}  // namespace String
+}  // namespace Calamares
diff --git a/src/libcalamares/utils/String.h b/src/libcalamares/utils/String.h
index 1adc2336a..30fca66d2 100644
--- a/src/libcalamares/utils/String.h
+++ b/src/libcalamares/utils/String.h
@@ -42,10 +42,15 @@ constexpr static const auto SplitKeepEmptyParts =
 #endif
     ;
 
+namespace Calamares
+{
 /**
- * @brief The CalamaresUtils namespace contains utility functions.
+ * @brief The Calamares::String namespace
+ *
+ * This namespace contains functions related to string-handling,
+ * string-expansion, etc.
  */
-namespace CalamaresUtils
+namespace String
 {
 /**
  * @brief removeDiacritics replaces letters with diacritics and ligatures with
@@ -113,6 +118,7 @@ DLLEXPORT void removeLeading( QString& string, QChar c );
  */
 DLLEXPORT void removeTrailing( QString& string, QChar c );
 
-}  // namespace CalamaresUtils
+}  // namespace String
+}  // namespace Calamares
 
 #endif
diff --git a/src/libcalamares/utils/StringExpander.cpp b/src/libcalamares/utils/StringExpander.cpp
new file mode 100644
index 000000000..38093869d
--- /dev/null
+++ b/src/libcalamares/utils/StringExpander.cpp
@@ -0,0 +1,89 @@
+/* === This file is part of Calamares -  ===
+ *
+ *   SPDX-FileCopyrightText: 2022 Adriaan de Groot 
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ *
+ */
+
+#include "StringExpander.h"
+#include "Logger.h"
+
+namespace Calamares
+{
+namespace String
+{
+
+struct DictionaryExpander::Private
+{
+    QHash< QString, QString > dictionary;
+    QStringList missing;
+};
+
+DictionaryExpander::DictionaryExpander()
+    : KWordMacroExpander( '$' )
+    , d( std::make_unique< Private >() )
+{
+}
+
+DictionaryExpander::DictionaryExpander( Calamares::String::DictionaryExpander&& other )
+    : KWordMacroExpander( other.escapeChar() )
+    , d( std::move( other.d ) )
+{
+}
+
+
+DictionaryExpander::~DictionaryExpander() {}
+
+
+void
+DictionaryExpander::insert( const QString& key, const QString& value )
+{
+    d->dictionary.insert( key, value );
+}
+
+void
+DictionaryExpander::clearErrors()
+{
+    d->missing.clear();
+}
+
+bool
+DictionaryExpander::hasErrors() const
+{
+    return !d->missing.isEmpty();
+}
+
+QStringList
+DictionaryExpander::errorNames() const
+{
+    return d->missing;
+}
+
+QString
+DictionaryExpander::expand( QString s )
+{
+    clearErrors();
+    expandMacros( s );
+    return s;
+}
+
+bool
+DictionaryExpander::expandMacro( const QString& str, QStringList& ret )
+{
+    if ( d->dictionary.contains( str ) )
+    {
+        ret << d->dictionary[ str ];
+        return true;
+    }
+    else
+    {
+        d->missing << str;
+        return false;
+    }
+}
+
+}  // namespace String
+}  // namespace Calamares
diff --git a/src/libcalamares/utils/StringExpander.h b/src/libcalamares/utils/StringExpander.h
new file mode 100644
index 000000000..9168621f0
--- /dev/null
+++ b/src/libcalamares/utils/StringExpander.h
@@ -0,0 +1,69 @@
+/* === This file is part of Calamares -  ===
+ *
+ *   SPDX-FileCopyrightText: 2022 Adriaan de Groot 
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ *
+ */
+
+#ifndef UTILS_STRINGEXPANDER_H
+#define UTILS_STRINGEXPANDER_H
+
+#include "DllMacro.h"
+
+#include 
+
+#include 
+#include 
+
+#include 
+
+namespace Calamares
+{
+namespace String
+{
+
+/** @brief Expand variables in a string against a dictionary.
+ *
+ * This class provides a convenience API for building up a dictionary
+ * and using it to expand strings. Use the `expand()` method to
+ * do standard word-based expansion with `$` as macro-symbol.
+ *
+ * Unlike straight-up `KMacroExpander::expandMacros()`, this
+ * provides an API to find out which variables were missing
+ * from the dictionary during expansion. Use `hasErrors()` and
+ * `errorNames()` to find out which variables those were.
+ *
+ * Call `clearErrors()` to reset the stored errors. Calling
+ * `expand()` implicitly clears the errors before starting
+ * a new expansion, as well.
+ */
+class DictionaryExpander : public KWordMacroExpander
+{
+public:
+    DictionaryExpander();
+    DictionaryExpander( DictionaryExpander&& );
+    virtual ~DictionaryExpander() override;
+
+    void insert( const QString& key, const QString& value );
+
+    void clearErrors();
+    bool hasErrors() const;
+    QStringList errorNames() const;
+
+    QString expand( QString s );
+
+protected:
+    virtual bool expandMacro( const QString& str, QStringList& ret ) override;
+
+private:
+    struct Private;
+    std::unique_ptr< Private > d;
+};
+
+}  // namespace String
+}  // namespace Calamares
+
+#endif
diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp
index 1105915ad..e94c104db 100644
--- a/src/libcalamares/utils/Tests.cpp
+++ b/src/libcalamares/utils/Tests.cpp
@@ -10,11 +10,13 @@
  */
 
 #include "CalamaresUtilsSystem.h"
+#include "CommandList.h"
 #include "Entropy.h"
 #include "Logger.h"
 #include "RAII.h"
 #include "Runner.h"
 #include "String.h"
+#include "StringExpander.h"
 #include "Traits.h"
 #include "UMask.h"
 #include "Variant.h"
@@ -45,7 +47,10 @@ private Q_SLOTS:
     void testLoadSaveYaml();  // Just settings.conf
     void testLoadSaveYamlExtended();  // Do a find() in the src dir
 
+    /** @section Test running commands and command-expansion. */
     void testCommands();
+    void testCommandExpansion_data();
+    void testCommandExpansion();  // See also shellprocess tests
 
     /** @section Test that all the UMask objects work correctly. */
     void testUmask();
@@ -75,6 +80,10 @@ private Q_SLOTS:
     void testStringRemoveTrailing_data();
     void testStringRemoveTrailing();
 
+    /** @section Test String expansion. */
+    void testStringMacroExpander_data();
+    void testStringMacroExpander();  // The KF5::CoreAddons bits
+
     /** @section Test Runner directory-manipulation. */
     void testRunnerDirs();
     void testCalculateWorkingDirectory();
@@ -94,6 +103,16 @@ LibCalamaresTests::~LibCalamaresTests() {}
 void
 LibCalamaresTests::initTestCase()
 {
+    Calamares::GlobalStorage* gs
+        = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
+
+    if ( !gs )
+    {
+        cDebug() << "Creating new JobQueue";
+        (void)new Calamares::JobQueue();
+        gs = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
+    }
+    QVERIFY( gs );
 }
 
 void
@@ -251,6 +270,34 @@ LibCalamaresTests::testCommands()
     QVERIFY( r.getOutput().contains( tfn.fileName() ) );
 }
 
+void
+LibCalamaresTests::testCommandExpansion_data()
+{
+    QTest::addColumn< QString >( "command" );
+    QTest::addColumn< QString >( "expected" );
+
+    QTest::newRow( "empty" ) << QString() << QString();
+    QTest::newRow( "ls   " ) << QStringLiteral( "ls" ) << QStringLiteral( "ls" );
+    QTest::newRow( "user " ) << QStringLiteral( "chmod $USER" ) << QStringLiteral( "chmod alice" );
+}
+
+void
+LibCalamaresTests::testCommandExpansion()
+{
+    Calamares::GlobalStorage* gs
+        = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
+    QVERIFY( gs );
+    gs->insert( QStringLiteral( "username" ), QStringLiteral( "alice" ) );
+
+    QFETCH( QString, command );
+    QFETCH( QString, expected );
+    CalamaresUtils::CommandLine c( command, std::chrono::seconds( 0 ) );
+    CalamaresUtils::CommandLine e = c.expand();
+
+    QCOMPARE( c.command(), command );
+    QCOMPARE( e.command(), expected );
+}
+
 void
 LibCalamaresTests::testUmask()
 {
@@ -554,7 +601,7 @@ LibCalamaresTests::testStringTruncation()
 {
     Logger::setupLogLevel( Logger::LOGDEBUG );
 
-    using namespace CalamaresUtils;
+    using namespace Calamares::String;
 
     const QString longString( R"(---
 --- src/libcalamares/utils/String.h
@@ -635,7 +682,7 @@ LibCalamaresTests::testStringTruncationShorter()
 {
     Logger::setupLogLevel( Logger::LOGDEBUG );
 
-    using namespace CalamaresUtils;
+    using namespace Calamares::String;
 
     const QString longString( R"(Some strange string artifacts appeared, leading to `{1?}` being
 displayed in various user-facing messages. These have been removed
@@ -730,7 +777,7 @@ LibCalamaresTests::testStringTruncationDegenerate()
 {
     Logger::setupLogLevel( Logger::LOGDEBUG );
 
-    using namespace CalamaresUtils;
+    using namespace Calamares::String;
 
     // This is quite long, 1 line only, with no newlines
     const QString longString( "The portscout new distfile checker has detected that one or more of your "
@@ -783,7 +830,7 @@ LibCalamaresTests::testStringRemoveLeading()
     QFETCH( QString, result );
 
     const QString initial = string;
-    CalamaresUtils::removeLeading( string, c );
+    Calamares::String::removeLeading( string, c );
     QCOMPARE( string, result );
 }
 
@@ -813,10 +860,64 @@ LibCalamaresTests::testStringRemoveTrailing()
     QFETCH( QString, result );
 
     const QString initial = string;
-    CalamaresUtils::removeTrailing( string, c );
+    Calamares::String::removeTrailing( string, c );
     QCOMPARE( string, result );
 }
 
+void
+LibCalamaresTests::testStringMacroExpander_data()
+{
+    QTest::addColumn< QString >( "source" );
+    QTest::addColumn< QString >( "result" );
+    QTest::addColumn< QStringList >( "errors" );
+
+    QTest::newRow( "empty   " ) << QString() << QString() << QStringList {};
+    QTest::newRow( "constant" ) << QStringLiteral( "bunnies!" ) << QStringLiteral( "bunnies!" ) << QStringList {};
+    QTest::newRow( "escaped " ) << QStringLiteral( "$$bun" ) << QStringLiteral( "$bun" )
+                                << QStringList {};  // Double $$ is an escaped $
+    QTest::newRow( "whole   " ) << QStringLiteral( "${ROOT}" ) << QStringLiteral( "wortel" ) << QStringList {};
+    QTest::newRow( "unbraced" ) << QStringLiteral( "$ROOT" ) << QStringLiteral( "wortel" )
+                                << QStringList {};  // Does not need {}
+    QTest::newRow( "bad-var1" ) << QStringLiteral( "${ROOF}" ) << QStringLiteral( "${ROOF}" )
+                                << QStringList { QStringLiteral( "ROOF" ) };  // Not replaced
+    QTest::newRow( "twice   " ) << QStringLiteral( "${ROOT}x${ROOT}" ) << QStringLiteral( "wortelxwortel" )
+                                << QStringList {};
+    QTest::newRow( "bad-var2" ) << QStringLiteral( "${ROOT}x${ROPE}" ) << QStringLiteral( "wortelx${ROPE}" )
+                                << QStringList { QStringLiteral( "ROPE" ) };  // Not replaced
+    // This is a borked string with a "nested" variable. The variable-name-
+    // scanner goes from ${ to the next } and tries to match that.
+    QTest::newRow( "confuse1" ) << QStringLiteral( "${RO${ROOT}" ) << QStringLiteral( "${ROwortel" )
+                                << QStringList { "RO${ROOT" };
+    // This one doesn't have a { for the first name to match with
+    QTest::newRow( "confuse2" ) << QStringLiteral( "$RO${ROOT}" ) << QStringLiteral( "$ROwortel" )
+                                << QStringList { "RO" };
+    // Here we see it just doesn't nest
+    QTest::newRow( "confuse3" ) << QStringLiteral( "${RO${ROOT}}" ) << QStringLiteral( "${ROwortel}" )
+                                << QStringList { "RO${ROOT" };
+}
+
+void
+LibCalamaresTests::testStringMacroExpander()
+{
+    QHash< QString, QString > dict;
+    dict.insert( QStringLiteral( "ROOT" ), QStringLiteral( "wortel" ) );
+
+    Calamares::String::DictionaryExpander d;
+    d.insert( QStringLiteral( "ROOT" ), QStringLiteral( "wortel" ) );
+
+    QFETCH( QString, source );
+    QFETCH( QString, result );
+    QFETCH( QStringList, errors );
+
+    QString km_expanded = KMacroExpander::expandMacros( source, dict, '$' );
+    QCOMPARE( km_expanded, result );
+
+    QString de_expanded = d.expand( source );
+    QCOMPARE( de_expanded, result );
+    QCOMPARE( d.errorNames(), errors );
+    QCOMPARE( d.hasErrors(), !errors.isEmpty() );
+}
+
 static QString
 dirname( const QTemporaryDir& d )
 {
diff --git a/src/libcalamares/utils/Units.h b/src/libcalamares/utils/Units.h
index bb5bf4509..3b909dc02 100644
--- a/src/libcalamares/utils/Units.h
+++ b/src/libcalamares/utils/Units.h
@@ -17,6 +17,8 @@
 
 namespace CalamaresUtils
 {
+/// @brief Type for expressing units
+using intunit_t = quint64;
 
 namespace Units
 {
@@ -137,12 +139,19 @@ BytesToMiB( qint64 b )
     return int( b / 1024 / 1024 );
 }
 
+// TODO: deprecate signed version
 constexpr int
 BytesToGiB( qint64 b )
 {
     return int( b / 1024 / 1024 / 1024 );
 }
 
+constexpr intunit_t
+BytesToGiB( intunit_t b )
+{
+    return b / 1024 / 1024 / 1024;
+}
+
 constexpr qint64
 alignBytesToBlockSize( qint64 bytes, qint64 blocksize )
 {
diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp
index 49c5dab11..66753cc95 100644
--- a/src/libcalamaresui/Branding.cpp
+++ b/src/libcalamaresui/Branding.cpp
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -85,14 +86,6 @@ const QStringList Branding::s_imageEntryStrings =
     "productWelcome"
 };
 
-const QStringList Branding::s_styleEntryStrings =
-{
-    "sidebarBackground",
-    "sidebarText",
-    "sidebarTextSelect",
-    "sidebarTextHighlight"
-};
-
 const QStringList Branding::s_uploadServerStrings =
 {
     "type",
@@ -102,6 +95,36 @@ const QStringList Branding::s_uploadServerStrings =
 // clang-format on
 // *INDENT-ON*
 
+/** @brief Check that all the entries in the @p style map make sense
+ *
+ * This will catch typo's in key names.
+ */
+static bool
+validateStyleEntries( const QMap< QString, QString >& style )
+{
+    using SE = Branding::StyleEntry;
+
+    Logger::Once o;
+    bool valid = true;
+
+    const auto meta = QMetaEnum::fromType< SE >();
+    QSet< QString > validNames;
+    for ( SE i : { SE::SidebarBackground, SE::SidebarBackgroundCurrent, SE::SidebarText, SE::SidebarTextCurrent } )
+    {
+        validNames.insert( meta.valueToKey( i ) );
+    }
+
+    for ( const auto& k : style.keys() )
+    {
+        if ( !validNames.contains( k ) )
+        {
+            cWarning() << o << "Unknown branding *style* entry" << k;
+            valid = false;
+        }
+    }
+
+    return valid;
+}
 
 const NamedEnumTable< Branding::WindowDimensionUnit >&
 Branding::WindowDimension::suffixes()
@@ -296,6 +319,7 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent )
     {
         cDebug() << "Loaded branding component" << m_componentName;
     }
+    validateStyleEntries( m_style );
 }
 
 
@@ -317,7 +341,8 @@ Branding::string( Branding::StringEntry stringEntry ) const
 QString
 Branding::styleString( Branding::StyleEntry styleEntry ) const
 {
-    return m_style.value( s_styleEntryStrings.value( styleEntry ) );
+    const auto meta = QMetaEnum::fromType< Branding::StyleEntry >();
+    return m_style.value( meta.valueToKey( styleEntry ) );
 }
 
 
diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h
index 1654b4d56..6e7d780ee 100644
--- a/src/libcalamaresui/Branding.h
+++ b/src/libcalamaresui/Branding.h
@@ -72,14 +72,18 @@ public:
     };
     Q_ENUM( ImageEntry )
 
+    /** @brief Names of style entries, for use in code
+     *
+     * These names are mapped to names in the branding.desc file through
+     * an internal table s_styleEntryStrings, which defines which names
+     * in `branding.desc` key *style* are used for which entry.
+     */
     enum StyleEntry : short
     {
         SidebarBackground,
         SidebarText,
-        SidebarTextSelect,
-        SidebarTextSelected = SidebarTextSelect,  // TODO:3.3:Remove SidebarTextSelect
-        SidebarTextHighlight,
-        SidebarBackgroundSelected = SidebarTextHighlight  // TODO:3.3:Remove SidebarTextHighlight
+        SidebarTextCurrent,
+        SidebarBackgroundCurrent,
     };
     Q_ENUM( StyleEntry )
 
@@ -258,6 +262,12 @@ public slots:
     QString shortProductName() const { return string( ShortProductName ); }
     QString shortVersionedName() const { return string( ShortVersionedName ); }
 
+    /** @brief Map an enum-value to the entry from the *style* key.
+     *
+     * e.g. StyleEntry::SidebarTextCurrent maps to the corresponding
+     * *style* entry, which is (confusingly) named "sidebarTextSelect"
+     * in the branding file.
+     */
     QString styleString( StyleEntry styleEntry ) const;
     QString imagePath( ImageEntry imageEntry ) const;
 
@@ -269,7 +279,6 @@ private:
 
     static const QStringList s_stringEntryStrings;
     static const QStringList s_imageEntryStrings;
-    static const QStringList s_styleEntryStrings;
     static const QStringList s_uploadServerStrings;
 
     QString m_descriptorPath;  // Path to descriptor (e.g. "/etc/calamares/default/branding.desc")
diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index 48e4c4b4d..406bd3ce4 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -8,24 +8,21 @@
 # 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 ${CMAKE_SOURCE_DIR} )
+include_directories(${CMAKE_SOURCE_DIR}/src/libcalamares ${CMAKE_BINARY_DIR}/src/libcalamares ${CMAKE_SOURCE_DIR})
 
-set( calamaresui_SOURCES
+set(calamaresui_SOURCES
     modulesystem/CppJobModule.cpp
     modulesystem/ModuleFactory.cpp
     modulesystem/ModuleManager.cpp
     modulesystem/ProcessJobModule.cpp
     modulesystem/ViewModule.cpp
-
     utils/CalamaresUtilsGui.cpp
     utils/ImageRegistry.cpp
     utils/Paste.cpp
-
     viewpages/BlankViewStep.cpp
     viewpages/ExecutionViewStep.cpp
     viewpages/Slideshow.cpp
     viewpages/ViewStep.cpp
-
     widgets/ClickableLabel.cpp
     widgets/ErrorDialog.cpp
     widgets/FixedAspectRatioLabel.cpp
@@ -33,42 +30,20 @@ set( calamaresui_SOURCES
     widgets/LogWidget.cpp
     widgets/TranslationFix.cpp
     widgets/WaitingWidget.cpp
-    ${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
-
+    widgets/waitingspinnerwidget.cpp
     Branding.cpp
     ViewManager.cpp
 )
 
-# Don't warn about third-party sources
-mark_thirdparty_code(
-    ${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
-)
-
-if( WITH_PYTHON )
-    list( APPEND calamaresui_SOURCES
-        modulesystem/PythonJobModule.cpp
-    )
+if(WITH_PYTHON)
+    list(APPEND calamaresui_SOURCES modulesystem/PythonJobModule.cpp)
 endif()
 
-if( WITH_PYTHONQT )
-    list( APPEND calamaresui_SOURCES
-        modulesystem/PythonQtViewModule.cpp
-        utils/PythonQtUtils.cpp
-        viewpages/PythonQtJob.cpp
-        viewpages/PythonQtViewStep.cpp
-        viewpages/PythonQtGlobalStorageWrapper.cpp
-        viewpages/PythonQtUtilsWrapper.cpp
-    )
+if(WITH_QML)
+    list(APPEND calamaresui_SOURCES utils/Qml.cpp viewpages/QmlViewStep.cpp)
 endif()
 
-if( WITH_QML )
-    list( APPEND calamaresui_SOURCES
-        utils/Qml.cpp
-        viewpages/QmlViewStep.cpp
-    )
-endif()
-
-calamares_add_library( calamaresui
+calamares_add_library(calamaresui
     SOURCES ${calamaresui_SOURCES}
     EXPORT_MACRO UIDLLEXPORT_PRO
     LINK_LIBRARIES
@@ -79,22 +54,17 @@ calamares_add_library( calamaresui
         utils/ErrorDialog/ErrorDialog.ui
     VERSION ${CALAMARES_VERSION_SHORT}
 )
-target_link_libraries( calamaresui PRIVATE yamlcpp::yamlcpp )
-if( KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58 )
-    target_compile_definitions( calamaresui PRIVATE WITH_KOSRelease )
+target_link_libraries(calamaresui PRIVATE yamlcpp::yamlcpp)
+if(KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58)
+    target_compile_definitions(calamaresui PRIVATE WITH_KOSRelease)
+    target_link_libraries(calamaresui PRIVATE KF5::CoreAddons)
 endif()
-if( WITH_PYTHONQT )
-    # *_DIRS because we also use extensions
-    target_include_directories( calamaresui PRIVATE ${PYTHON_INCLUDE_DIRS} ${PYTHONQT_INCLUDE_DIRS} )
-    target_link_libraries( calamaresui PRIVATE ${PYTHON_LIBRARIES} ${PYTHONQT_LIBRARIES} )
-endif()
-if( WITH_QML )
-    target_link_libraries( calamaresui PUBLIC Qt5::QuickWidgets )
+if(WITH_QML)
+    target_link_libraries(calamaresui PUBLIC Qt5::QuickWidgets)
 endif()
 
 add_library(Calamares::calamaresui ALIAS calamaresui)
 
-
 ### Installation
 #
 #
@@ -103,24 +73,12 @@ add_library(Calamares::calamaresui ALIAS calamaresui)
 # where libcalamares and libcalamaresui live in different branches,
 # we're going to glom it all together in the installed headers location.
 
-install(
-    FILES
-        Branding.h
-        ViewManager.h
-    DESTINATION include/libcalamares
-)
+install(FILES Branding.h ViewManager.h DESTINATION include/libcalamares)
 
 # Install each subdir-worth of header files
-foreach( subdir modulesystem utils viewpages widgets )
-    file( GLOB subdir_headers "${subdir}/*.h" )
-    install( FILES ${subdir_headers} DESTINATION include/libcalamares/${subdir} )
+foreach(subdir modulesystem utils viewpages widgets)
+    file(GLOB subdir_headers "${subdir}/*.h")
+    install(FILES ${subdir_headers} DESTINATION include/libcalamares/${subdir})
 endforeach()
 
-calamares_add_test(
-    test_libcalamaresuipaste
-    SOURCES
-        utils/TestPaste.cpp
-        utils/Paste.cpp
-    LIBRARIES
-        calamaresui
-)
+calamares_add_test(test_libcalamaresuipaste SOURCES utils/TestPaste.cpp utils/Paste.cpp LIBRARIES calamaresui)
diff --git a/src/libcalamaresui/modulesystem/ModuleFactory.cpp b/src/libcalamaresui/modulesystem/ModuleFactory.cpp
index a7193d3f5..7f44a0052 100644
--- a/src/libcalamaresui/modulesystem/ModuleFactory.cpp
+++ b/src/libcalamaresui/modulesystem/ModuleFactory.cpp
@@ -24,10 +24,6 @@
 #include "PythonJobModule.h"
 #endif
 
-#ifdef WITH_PYTHONQT
-#include "PythonQtViewModule.h"
-#endif
-
 #include 
 #include 
 #include 
@@ -59,14 +55,6 @@ moduleFromDescriptor( const Calamares::ModuleSystem::Descriptor& moduleDescripto
         {
             m.reset( new ViewModule() );
         }
-        else if ( moduleDescriptor.interface() == Interface::PythonQt )
-        {
-#ifdef WITH_PYTHONQT
-            m.reset( new PythonQtViewModule() );
-#else
-            cError() << "PythonQt view modules are not supported in this version of Calamares.";
-#endif
-        }
         else
         {
             cError() << "Bad interface"
diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp
index 1e397b340..1233b1115 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.cpp
+++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp
@@ -349,7 +349,18 @@ ModuleManager::checkRequirements()
     connect( rq,
              &RequirementsChecker::done,
              this,
-             [ = ]() { this->requirementsComplete( m_requirementsModel->satisfiedMandatory() ); } );
+             [ = ]()
+             {
+                 if ( m_requirementsModel->satisfiedMandatory() )
+                 {
+                     /* we're done */ this->requirementsComplete( true );
+                 }
+                 else
+                 {
+                     this->requirementsComplete( false );
+                     QTimer::singleShot( std::chrono::seconds( 5 ), this, &ModuleManager::checkRequirements );
+                 }
+             } );
 
     QTimer::singleShot( 0, rq, &RequirementsChecker::run );
 }
diff --git a/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp b/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp
deleted file mode 100644
index 105dd2998..000000000
--- a/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac 
- *   SPDX-FileCopyrightText: 2018 Adriaan de Groot 
- *   SPDX-FileCopyrightText: 2018 Raul Rodrigo Segura 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#include "PythonQtViewModule.h"
-
-#include "CalamaresConfig.h"
-#include "GlobalStorage.h"
-#include "JobQueue.h"
-#include "ViewManager.h"
-#include "utils/Logger.h"
-#include "viewpages/PythonQtGlobalStorageWrapper.h"
-#include "viewpages/PythonQtUtilsWrapper.h"
-#include "viewpages/PythonQtViewStep.h"
-#include "viewpages/ViewStep.h"
-
-#include 
-#include 
-
-#include 
-#include 
-
-
-static QPointer< GlobalStorage > s_gs = nullptr;
-static QPointer< Utils > s_utils = nullptr;
-
-namespace Calamares
-{
-
-Module::Type
-PythonQtViewModule::type() const
-{
-    return Module::Type::View;
-}
-
-
-Module::Interface
-PythonQtViewModule::interface() const
-{
-    return Module::Interface::PythonQt;
-}
-
-
-void
-PythonQtViewModule::loadSelf()
-{
-    if ( !m_scriptFileName.isEmpty() )
-    {
-        if ( PythonQt::self() == nullptr )
-        {
-            if ( Py_IsInitialized() )
-                PythonQt::init( PythonQt::IgnoreSiteModule | PythonQt::RedirectStdOut
-                                | PythonQt::PythonAlreadyInitialized );
-            else
-            {
-                PythonQt::init();
-            }
-
-            PythonQt_QtAll::init();
-            cDebug() << "Initializing PythonQt bindings."
-                     << "This should only happen once.";
-
-            //TODO: register classes here into the PythonQt environment, like this:
-            //PythonQt::self()->registerClass( &PythonQtViewStep::staticMetaObject,
-            //                                 "calamares" );
-
-            // We only do the following to force PythonQt to create a submodule
-            // "calamares" for us to put our static objects in
-            PythonQt::self()->registerClass( &::GlobalStorage::staticMetaObject, "calamares" );
-
-            // Get a PythonQtObjectPtr to the PythonQt.calamares submodule
-            PythonQtObjectPtr pqtm = PythonQt::priv()->pythonQtModule();
-            PythonQtObjectPtr cala = PythonQt::self()->lookupObject( pqtm, "calamares" );
-
-            // Prepare GlobalStorage object, in module PythonQt.calamares
-            if ( !s_gs )
-            {
-                s_gs = new ::GlobalStorage( Calamares::JobQueue::instance()->globalStorage() );
-            }
-            cala.addObject( "global_storage", s_gs );
-
-            // Prepare Utils object, in module PythonQt.calamares
-            if ( !s_utils )
-            {
-                s_utils = new ::Utils( Calamares::JobQueue::instance()->globalStorage() );
-            }
-            cala.addObject( "utils", s_utils );
-
-            // Append configuration object, in module PythonQt.calamares
-            cala.addVariable( "configuration", m_configurationMap );
-
-            // Basic stdout/stderr handling
-            QObject::connect( PythonQt::self(),
-                              &PythonQt::pythonStdOut,
-                              []( const QString& message ) { cDebug() << "PythonQt OUT>" << message; } );
-            QObject::connect( PythonQt::self(),
-                              &PythonQt::pythonStdErr,
-                              []( const QString& message ) { cDebug() << "PythonQt ERR>" << message; } );
-        }
-
-        QDir workingDir( m_workingPath );
-        if ( !workingDir.exists() )
-        {
-            cDebug() << "Invalid working directory" << m_workingPath << "for module" << name();
-            return;
-        }
-
-        QString fullPath = workingDir.absoluteFilePath( m_scriptFileName );
-        QFileInfo scriptFileInfo( fullPath );
-        if ( !scriptFileInfo.isReadable() )
-        {
-            cDebug() << "Invalid main script file path" << fullPath << "for module" << name();
-            return;
-        }
-
-        // Construct empty Python module with the given name
-        PythonQtObjectPtr cxt = PythonQt::self()->createModuleFromScript( name() );
-        if ( cxt.isNull() )
-        {
-            cDebug() << "Cannot load PythonQt context from file" << fullPath << "for module" << name();
-            return;
-        }
-
-        static const QLatin1String calamares_module_annotation(
-            "_calamares_module_typename = ''\n"
-            "def calamares_module(viewmodule_type):\n"
-            "    global _calamares_module_typename\n"
-            "    _calamares_module_typename = viewmodule_type.__name__\n"
-            "    return viewmodule_type\n" );
-
-        // Load in the decorator
-        PythonQt::self()->evalScript( cxt, calamares_module_annotation );
-
-        // Load the module
-        PythonQt::self()->evalFile( cxt, fullPath );
-
-        m_viewStep = new PythonQtViewStep( cxt );
-
-        cDebug() << "PythonQtViewModule loading self for instance" << instanceKey() << "\nPythonQtViewModule at address"
-                 << this << "\nViewStep at address" << m_viewStep;
-
-        m_viewStep->setModuleInstanceKey( instanceKey() );
-        m_viewStep->setConfigurationMap( m_configurationMap );
-        ViewManager::instance()->addViewStep( m_viewStep );
-        m_loaded = true;
-        cDebug() << "PythonQtViewModule" << instanceKey() << "loading complete.";
-    }
-}
-
-
-JobList
-PythonQtViewModule::jobs() const
-{
-    return m_viewStep->jobs();
-}
-
-
-void
-PythonQtViewModule::initFrom( const QVariantMap& moduleDescriptor )
-{
-    QDir directory( location() );
-    m_workingPath = directory.absolutePath();
-
-    if ( !moduleDescriptor.value( "script" ).toString().isEmpty() )
-    {
-        m_scriptFileName = moduleDescriptor.value( "script" ).toString();
-    }
-}
-
-PythonQtViewModule::PythonQtViewModule()
-    : Module()
-{
-}
-
-PythonQtViewModule::~PythonQtViewModule() {}
-
-}  // namespace Calamares
diff --git a/src/libcalamaresui/modulesystem/PythonQtViewModule.h b/src/libcalamaresui/modulesystem/PythonQtViewModule.h
deleted file mode 100644
index 8267dd2cb..000000000
--- a/src/libcalamaresui/modulesystem/PythonQtViewModule.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#ifndef CALAMARES_PYTHONQTVIEWMODULE_H
-#define CALAMARES_PYTHONQTVIEWMODULE_H
-
-#include "DllMacro.h"
-#include "Module.h"
-
-namespace Calamares
-{
-
-class ViewStep;
-
-class UIDLLEXPORT PythonQtViewModule : public Module
-{
-public:
-    Type type() const override;
-    Interface interface() const override;
-
-    void loadSelf() override;
-    JobList jobs() const override;
-
-protected:
-    void initFrom( const QVariantMap& moduleDescriptor ) override;
-
-private:
-    explicit PythonQtViewModule();
-    virtual ~PythonQtViewModule();
-
-    ViewStep* m_viewStep = nullptr;
-
-    QString m_scriptFileName;
-    QString m_workingPath;
-
-    friend Module* Calamares::moduleFromDescriptor( const ModuleSystem::Descriptor& moduleDescriptor,
-                                                    const QString& instanceId,
-                                                    const QString& configFileName,
-                                                    const QString& moduleDirectory );
-};
-
-}  // namespace Calamares
-
-#endif  // CALAMARES_PYTHONQTVIEWMODULE_H
diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
index d10aada73..a1030d03e 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
@@ -128,62 +128,12 @@ defaultPixmap( ImageType type, ImageMode mode, const QSize& size )
 }
 
 
-QPixmap
-createRoundedImage( const QPixmap& pixmap, const QSize& size, float frameWidthPct )
-{
-    int height;
-    int width;
-
-    if ( !size.isEmpty() )
-    {
-        height = size.height();
-        width = size.width();
-    }
-    else
-    {
-        height = pixmap.height();
-        width = pixmap.width();
-    }
-
-    if ( !height || !width )
-    {
-        return QPixmap();
-    }
-
-    QPixmap scaledAvatar = pixmap.scaled( width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
-    if ( frameWidthPct == 0.00f )
-    {
-        return scaledAvatar;
-    }
-
-    QPixmap frame( width, height );
-    frame.fill( Qt::transparent );
-
-    QPainter painter( &frame );
-    painter.setRenderHint( QPainter::Antialiasing );
-
-    QRect outerRect( 0, 0, width, height );
-    QBrush brush( scaledAvatar );
-    QPen pen;
-    pen.setColor( Qt::transparent );
-    pen.setJoinStyle( Qt::RoundJoin );
-
-    painter.setBrush( brush );
-    painter.setPen( pen );
-    painter.drawRoundedRect(
-        outerRect, qreal( frameWidthPct ) * 100.0, qreal( frameWidthPct ) * 100.0, Qt::RelativeSize );
-
-    return frame;
-}
-
-
 void
 unmarginLayout( QLayout* layout )
 {
     if ( layout )
     {
         layout->setContentsMargins( 0, 0, 0, 0 );
-        layout->setMargin( 0 );
         layout->setSpacing( 0 );
 
         for ( int i = 0; i < layout->count(); i++ )
@@ -224,15 +174,6 @@ defaultFontHeight()
 }
 
 
-QFont
-defaultFont()
-{
-    QFont f;
-    f.setPointSize( defaultFontSize() );
-    return f;
-}
-
-
 QFont
 largeFont()
 {
@@ -257,24 +198,4 @@ defaultIconSize()
     return QSize( w, w );
 }
 
-
-void
-clearLayout( QLayout* layout )
-{
-    while ( QLayoutItem* item = layout->takeAt( 0 ) )
-    {
-        if ( QWidget* widget = item->widget() )
-        {
-            widget->deleteLater();
-        }
-
-        if ( QLayout* childLayout = item->layout() )
-        {
-            clearLayout( childLayout );
-        }
-
-        delete item;
-    }
-}
-
 }  // namespace CalamaresUtils
diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h
index aa7aff79b..5a0ee336f 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.h
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h
@@ -63,7 +63,6 @@ enum ImageMode
     CoverInCase,
     Grid,
     DropShadow,
-    RoundedCorners
 };
 
 /**
@@ -78,35 +77,15 @@ UIDLLEXPORT QPixmap defaultPixmap( ImageType type,
                                    ImageMode mode = CalamaresUtils::Original,
                                    const QSize& size = QSize( 0, 0 ) );
 
-// TODO:3.3:This has only one consumer, move to ImageRegistry, make static
-/**
- * @brief createRoundedImage returns a rounded version of a pixmap.
- * @param avatar the input pixmap.
- * @param size the new size.
- * @param frameWidthPct the frame size, as percentage of width.
- * @return the transformed pixmap.
- * This one is currently unused.
- */
-UIDLLEXPORT QPixmap createRoundedImage( const QPixmap& avatar, const QSize& size, float frameWidthPct = 0.20f );
-
 /**
  * @brief unmarginLayout recursively walks the QLayout tree and removes all margins.
  * @param layout the layout to unmargin.
  */
 UIDLLEXPORT void unmarginLayout( QLayout* layout );
 
-// TODO:3.3:This has only one consumer, move to LicensePage, make static
-/**
- * @brief clearLayout recursively walks the QLayout tree and deletes all the child
- * widgets and layouts.
- * @param layout the layout to clear.
- */
-UIDLLEXPORT void clearLayout( QLayout* layout );
-
 UIDLLEXPORT void setDefaultFontSize( int points );
 UIDLLEXPORT int defaultFontSize();  // in points
 UIDLLEXPORT int defaultFontHeight();  // in pixels, DPI-specific
-UIDLLEXPORT QFont defaultFont();  // TODO:3.3:This has one consumer, move to BlankViewStep
 UIDLLEXPORT QFont largeFont();
 UIDLLEXPORT QSize defaultIconSize();
 
diff --git a/src/libcalamaresui/utils/ImageRegistry.cpp b/src/libcalamaresui/utils/ImageRegistry.cpp
index 3ae519f55..96dd79e78 100644
--- a/src/libcalamaresui/utils/ImageRegistry.cpp
+++ b/src/libcalamaresui/utils/ImageRegistry.cpp
@@ -8,6 +8,7 @@
 
 #include "ImageRegistry.h"
 
+#include 
 #include 
 #include 
 #include 
@@ -89,11 +90,6 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils::
 
     if ( !pixmap.isNull() )
     {
-        if ( mode == CalamaresUtils::RoundedCorners )
-        {
-            pixmap = CalamaresUtils::createRoundedImage( pixmap, size );
-        }
-
         if ( !size.isNull() && pixmap.size() != size )
         {
             if ( size.width() == 0 )
diff --git a/src/libcalamaresui/utils/PythonQtUtils.cpp b/src/libcalamaresui/utils/PythonQtUtils.cpp
deleted file mode 100644
index bc4e034f0..000000000
--- a/src/libcalamaresui/utils/PythonQtUtils.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#include "PythonQtUtils.h"
-
-namespace CalamaresUtils
-{
-
-QVariant
-lookupAndCall( PyObject* object,
-               const QStringList& candidateNames,
-               const QVariantList& args,
-               const QVariantMap& kwargs )
-{
-    Q_ASSERT( object );
-    Q_ASSERT( !candidateNames.isEmpty() );
-
-    for ( const QString& name : candidateNames )
-    {
-        PythonQtObjectPtr callable = PythonQt::self()->lookupCallable( object, name );
-        if ( callable )
-        {
-            return callable.call( args, kwargs );
-        }
-    }
-
-    // If we haven't found a callable with the given names, we force an error:
-    return PythonQt::self()->call( object, candidateNames.first(), args, kwargs );
-}
-
-}  // namespace CalamaresUtils
diff --git a/src/libcalamaresui/utils/PythonQtUtils.h b/src/libcalamaresui/utils/PythonQtUtils.h
deleted file mode 100644
index 49f3bb1c4..000000000
--- a/src/libcalamaresui/utils/PythonQtUtils.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#ifndef PYTHONQTUTILS_H
-#define PYTHONQTUTILS_H
-
-#include 
-
-#include 
-
-
-namespace CalamaresUtils
-{
-//NOTE: when running this, it is assumed that Python is initialized and
-//      PythonQt::self() is valid.
-QVariant lookupAndCall( PyObject* object,
-                        const QStringList& candidateNames,
-                        const QVariantList& args = QVariantList(),
-                        const QVariantMap& kwargs = QVariantMap() );
-
-}  // namespace CalamaresUtils
-
-#endif  // PYTHONQTUTILS_H
diff --git a/src/libcalamaresui/viewpages/PythonQtGlobalStorageWrapper.cpp b/src/libcalamaresui/viewpages/PythonQtGlobalStorageWrapper.cpp
deleted file mode 100644
index 0d667a097..000000000
--- a/src/libcalamaresui/viewpages/PythonQtGlobalStorageWrapper.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#include "PythonQtGlobalStorageWrapper.h"
-
-#include "GlobalStorage.h"
-
-
-GlobalStorage::GlobalStorage( Calamares::GlobalStorage* gs )
-    : QObject( gs )
-    , m_gs( gs )
-{
-}
-
-
-bool
-GlobalStorage::contains( const QString& key ) const
-{
-    return m_gs->contains( key );
-}
-
-
-int
-GlobalStorage::count() const
-{
-    return m_gs->count();
-}
-
-
-void
-GlobalStorage::insert( const QString& key, const QVariant& value )
-{
-    m_gs->insert( key, value );
-}
-
-
-QStringList
-GlobalStorage::keys() const
-{
-    return m_gs->keys();
-}
-
-
-int
-GlobalStorage::remove( const QString& key )
-{
-    return m_gs->remove( key );
-}
-
-
-QVariant
-GlobalStorage::value( const QString& key ) const
-{
-    return m_gs->value( key );
-}
diff --git a/src/libcalamaresui/viewpages/PythonQtGlobalStorageWrapper.h b/src/libcalamaresui/viewpages/PythonQtGlobalStorageWrapper.h
deleted file mode 100644
index 5d1282d0f..000000000
--- a/src/libcalamaresui/viewpages/PythonQtGlobalStorageWrapper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac 
- *   SPDX-FileCopyrightText: 2018 Adriaan de Groot 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#ifndef PYTHONQTGLOBALSTORAGEWRAPPER_H
-#define PYTHONQTGLOBALSTORAGEWRAPPER_H
-
-#include 
-#include 
-#include 
-
-namespace Calamares
-{
-class GlobalStorage;
-}
-
-
-/**
- * @brief This GlobalStorage class is a namespace-free wrapper for
- *        Calamares::GlobalStorage. This is unfortunately a necessity
- *        because PythonQt doesn't like namespaces.
- */
-class GlobalStorage : public QObject
-{
-    Q_OBJECT
-public:
-    explicit GlobalStorage( Calamares::GlobalStorage* gs );
-    virtual ~GlobalStorage() {}
-
-public slots:
-    bool contains( const QString& key ) const;
-    int count() const;
-    void insert( const QString& key, const QVariant& value );
-    QStringList keys() const;
-    int remove( const QString& key );
-    QVariant value( const QString& key ) const;
-
-private:
-    Calamares::GlobalStorage* m_gs;
-};
-
-#endif  // PYTHONQTGLOBALSTORAGEWRAPPER_H
diff --git a/src/libcalamaresui/viewpages/PythonQtJob.cpp b/src/libcalamaresui/viewpages/PythonQtJob.cpp
deleted file mode 100644
index d41c70f1f..000000000
--- a/src/libcalamaresui/viewpages/PythonQtJob.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#include "PythonQtJob.h"
-
-#include "utils/PythonQtUtils.h"
-
-PythonQtJob::PythonQtJob( PythonQtObjectPtr cxt, PythonQtObjectPtr pyJob, QObject* parent )
-    : Calamares::Job( parent )
-    , m_cxt( cxt )
-    , m_pyJob( pyJob )
-{
-}
-
-
-QString
-PythonQtJob::prettyName() const
-{
-    return CalamaresUtils::lookupAndCall( m_pyJob, { "prettyName", "prettyname", "pretty_name" } ).toString();
-}
-
-
-QString
-PythonQtJob::prettyDescription() const
-{
-    return CalamaresUtils::lookupAndCall( m_pyJob, { "prettyDescription", "prettydescription", "pretty_description" } )
-        .toString();
-}
-
-
-QString
-PythonQtJob::prettyStatusMessage() const
-{
-    return CalamaresUtils::lookupAndCall( m_pyJob,
-                                          { "prettyStatusMessage", "prettystatusmessage", "pretty_status_message" } )
-        .toString();
-}
-
-
-Calamares::JobResult
-PythonQtJob::exec()
-{
-    QVariant response = m_pyJob.call( "exec" );
-    if ( response.isNull() )
-    {
-        return Calamares::JobResult::ok();
-    }
-
-    QVariantMap map = response.toMap();
-    if ( map.isEmpty() || map.value( "ok" ).toBool() )
-    {
-        return Calamares::JobResult::ok();
-    }
-
-    return Calamares::JobResult::error( map.value( "message" ).toString(), map.value( "details" ).toString() );
-}
diff --git a/src/libcalamaresui/viewpages/PythonQtJob.h b/src/libcalamaresui/viewpages/PythonQtJob.h
deleted file mode 100644
index 4d48921e1..000000000
--- a/src/libcalamaresui/viewpages/PythonQtJob.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#ifndef PYTHONQTJOB_H
-#define PYTHONQTJOB_H
-
-#include "Job.h"
-
-#include 
-
-namespace Calamares
-{
-class PythonQtViewStep;
-}
-
-class PythonQtJobResult : public QObject, public Calamares::JobResult
-{
-    Q_OBJECT
-public:
-    explicit PythonQtJobResult( bool ok, const QString& message, const QString& details )
-        : QObject( nullptr )
-        , Calamares::JobResult( message, details, ok ? 0 : Calamares::JobResult::GenericError )
-    {
-    }
-};
-
-
-class PythonQtJob : public Calamares::Job
-{
-    Q_OBJECT
-public:
-    virtual ~PythonQtJob() {}
-
-    QString prettyName() const override;
-    QString prettyDescription() const override;
-    QString prettyStatusMessage() const override;
-    Calamares::JobResult exec() override;
-
-private:
-    explicit PythonQtJob( PythonQtObjectPtr cxt, PythonQtObjectPtr pyJob, QObject* parent = nullptr );
-    friend class Calamares::PythonQtViewStep;  // only this one can call the ctor
-
-    PythonQtObjectPtr m_cxt;
-    PythonQtObjectPtr m_pyJob;
-};
-
-#endif  // PYTHONQTJOB_H
diff --git a/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.cpp b/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.cpp
deleted file mode 100644
index 4cd72f8c0..000000000
--- a/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac 
- *   SPDX-FileCopyrightText: 2019 Adriaan de Groot 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#include "PythonQtUtilsWrapper.h"
-
-#include "partition/Mount.h"
-#include "utils/CalamaresUtilsSystem.h"
-#include "utils/Logger.h"
-#include "utils/String.h"
-
-#include 
-
-
-Utils::Utils( QObject* parent )
-    : QObject( parent )
-    , m_exceptionCxt( PythonQt::self()->createUniqueModule() )
-{
-    PythonQt::self()->evalScript( m_exceptionCxt, "import subprocess" );
-}
-
-
-void
-Utils::debug( const QString& s ) const
-{
-    cDebug() << "PythonQt DBG>" << s;
-}
-
-
-int
-Utils::mount( const QString& device_path,
-              const QString& mount_point,
-              const QString& filesystem_name,
-              const QString& options ) const
-{
-    return CalamaresUtils::Partition::mount( device_path, mount_point, filesystem_name, options );
-}
-
-
-int
-Utils::target_env_call( const QString& command, const QString& stdin, int timeout ) const
-{
-    return CalamaresUtils::System::instance()->targetEnvCall(
-        command, QString(), stdin, std::chrono::seconds( timeout > 0 ? timeout : 0 ) );
-}
-
-
-int
-Utils::target_env_call( const QStringList& args, const QString& stdin, int timeout ) const
-{
-    return CalamaresUtils::System::instance()->targetEnvCall(
-        args, QString(), stdin, std::chrono::seconds( timeout > 0 ? timeout : 0 ) );
-}
-
-
-int
-Utils::check_target_env_call( const QString& command, const QString& stdin, int timeout ) const
-{
-    int ec = target_env_call( command, stdin, timeout );
-    return _handle_check_target_env_call_error( ec, command );
-}
-
-
-int
-Utils::check_target_env_call( const QStringList& args, const QString& stdin, int timeout ) const
-{
-    int ec = target_env_call( args, stdin, timeout );
-    return _handle_check_target_env_call_error( ec, args.join( ' ' ) );
-}
-
-
-QString
-Utils::check_target_env_output( const QString& command, const QString& stdin, int timeout ) const
-{
-    QString output;
-    int ec = CalamaresUtils::System::instance()->targetEnvOutput(
-        command, output, QString(), stdin, std::chrono::seconds( timeout > 0 ? timeout : 0 ) );
-    _handle_check_target_env_call_error( ec, command );
-    return output;
-}
-
-
-QString
-Utils::check_target_env_output( const QStringList& args, const QString& stdin, int timeout ) const
-{
-    QString output;
-    int ec = CalamaresUtils::System::instance()->targetEnvOutput(
-        args, output, QString(), stdin, std::chrono::seconds( timeout > 0 ? timeout : 0 ) );
-    _handle_check_target_env_call_error( ec, args.join( ' ' ) );
-    return output;
-}
-
-
-QString
-Utils::obscure( const QString& string ) const
-{
-    return CalamaresUtils::obscure( string );
-}
-
-
-int
-Utils::_handle_check_target_env_call_error( int ec, const QString& cmd ) const
-{
-    if ( ec )
-    {
-        QString raise = QString( "raise subprocess.CalledProcessError(%1,\"%2\")" ).arg( ec ).arg( cmd );
-        PythonQt::self()->evalScript( m_exceptionCxt, raise );
-    }
-    return ec;
-}
diff --git a/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.h b/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.h
deleted file mode 100644
index e39249185..000000000
--- a/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#ifndef PYTHONQTUTILSWRAPPER_H
-#define PYTHONQTUTILSWRAPPER_H
-
-#include 
-
-#include 
-
-
-/**
- * @brief The Utils class wraps around functions from CalamaresUtils to make them
- * available in the PythonQt interface.
- */
-class Utils : public QObject
-{
-    Q_OBJECT
-public:
-    explicit Utils( QObject* parent = nullptr );
-    virtual ~Utils() {}
-
-public slots:
-    void debug( const QString& s ) const;
-
-    int mount( const QString& device_path,
-               const QString& mount_point,
-               const QString& filesystem_name,
-               const QString& options ) const;
-
-    int target_env_call( const QString& command, const QString& stdin = QString(), int timeout = 0 ) const;
-
-    int target_env_call( const QStringList& args, const QString& stdin = QString(), int timeout = 0 ) const;
-
-    int check_target_env_call( const QString& command, const QString& stdin = QString(), int timeout = 0 ) const;
-
-    int check_target_env_call( const QStringList& args, const QString& stdin = QString(), int timeout = 0 ) const;
-
-    QString check_target_env_output( const QString& command, const QString& stdin = QString(), int timeout = 0 ) const;
-
-    QString check_target_env_output( const QStringList& args, const QString& stdin = QString(), int timeout = 0 ) const;
-
-    QString obscure( const QString& string ) const;
-
-private:
-    inline int _handle_check_target_env_call_error( int ec, const QString& cmd ) const;
-
-    PythonQtObjectPtr m_exceptionCxt;
-};
-
-#endif  // PYTHONQTUTILSWRAPPER_H
diff --git a/src/libcalamaresui/viewpages/PythonQtViewStep.cpp b/src/libcalamaresui/viewpages/PythonQtViewStep.cpp
deleted file mode 100644
index df3c11994..000000000
--- a/src/libcalamaresui/viewpages/PythonQtViewStep.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac 
- *   SPDX-FileCopyrightText: 2018 Adriaan de Groot 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#include "PythonQtViewStep.h"
-#include "utils/CalamaresUtilsGui.h"
-#include "utils/Logger.h"
-#include "utils/PythonQtUtils.h"
-#include "utils/Retranslator.h"
-#include "viewpages/PythonQtJob.h"
-
-#include 
-
-#include 
-#include 
-
-
-namespace Calamares
-{
-
-PythonQtViewStep::PythonQtViewStep( PythonQtObjectPtr cxt, QObject* parent )
-    : ViewStep( parent )
-    , m_widget( new QWidget() )
-    , m_cxt( cxt )
-{
-    PythonQt* pq = PythonQt::self();
-    Q_ASSERT( pq );
-
-    // The @calamares_module decorator should have filled _calamares_module_typename
-    // for us.
-    QString className = m_cxt.getVariable( "_calamares_module_typename" ).toString();
-
-    // Instantiate an object of the class marked with @calamares_module and
-    // store it as _calamares_module.
-    pq->evalScript( m_cxt, QString( "_calamares_module = %1()" ).arg( className ) );
-    m_obj = pq->lookupObject( m_cxt, "_calamares_module" );
-
-    Q_ASSERT( !m_obj.isNull() );  // no entry point, no party
-
-    // Prepare the base widget for the module's pages
-    m_widget->setLayout( new QVBoxLayout );
-    CalamaresUtils::unmarginLayout( m_widget->layout() );
-    m_cxt.addObject( "_calamares_module_basewidget", m_widget );
-
-    CALAMARES_RETRANSLATE_FOR(
-        m_widget,
-        CalamaresUtils::lookupAndCall( m_obj, { "retranslate" }, { CalamaresUtils::translatorLocaleName() } ); )
-}
-
-
-QString
-PythonQtViewStep::prettyName() const
-{
-    return CalamaresUtils::lookupAndCall( m_obj, { "prettyName", "prettyname", "pretty_name" } ).toString();
-}
-
-
-QWidget*
-PythonQtViewStep::widget()
-{
-    if ( m_widget->layout()->count() > 1 )
-        cWarning() << "PythonQtViewStep wrapper widget has more than 1 child. "
-                      "This should never happen.";
-
-    bool nothingChanged
-        = m_cxt.evalScript( "_calamares_module.widget() in _calamares_module_basewidget.children()" ).toBool();
-    if ( nothingChanged )
-    {
-        return m_widget;
-    }
-
-    // Else, we either don't have a child widget, or we have a child widget that
-    // was previously set and doesn't apply any more since the Python module
-    // set a new one.
-
-    // First we clear the layout, which should only ever have 1 item.
-    // We only remove from the layout and not delete because Python is in charge
-    // of memory management for these widgets.
-    while ( m_widget->layout()->itemAt( 0 ) )
-    {
-        m_widget->layout()->takeAt( 0 );
-    }
-
-    m_cxt.evalScript( "_calamares_module_basewidget.layout().addWidget(_calamares_module.widget())" );
-
-    return m_widget;
-}
-
-
-void
-PythonQtViewStep::next()
-{
-    CalamaresUtils::lookupAndCall( m_obj, { "next" } );
-}
-
-
-void
-PythonQtViewStep::back()
-{
-    CalamaresUtils::lookupAndCall( m_obj, { "back" } );
-}
-
-
-bool
-PythonQtViewStep::isNextEnabled() const
-{
-    return CalamaresUtils::lookupAndCall( m_obj, { "isNextEnabled", "isnextenabled", "is_next_enabled" } ).toBool();
-}
-
-
-bool
-PythonQtViewStep::isBackEnabled() const
-{
-    return CalamaresUtils::lookupAndCall( m_obj, { "isBackEnabled", "isbackenabled", "is_back_enabled" } ).toBool();
-}
-
-
-bool
-PythonQtViewStep::isAtBeginning() const
-{
-    return CalamaresUtils::lookupAndCall( m_obj, { "isAtBeginning", "isatbeginning", "is_at_beginning" } ).toBool();
-}
-
-
-bool
-PythonQtViewStep::isAtEnd() const
-{
-    return CalamaresUtils::lookupAndCall( m_obj, { "isAtEnd", "isatend", "is_at_end" } ).toBool();
-}
-
-void
-PythonQtViewStep::onActivate()
-{
-    CalamaresUtils::lookupAndCall( m_obj, { "onActivate", "onactivate", "on_activate" } );
-}
-
-void
-PythonQtViewStep::onLeave()
-{
-    CalamaresUtils::lookupAndCall( m_obj, { "onLeave", "onleave", "on_leave" } );
-}
-
-
-JobList
-PythonQtViewStep::jobs() const
-{
-    JobList jobs;
-
-    PythonQtObjectPtr jobsCallable = PythonQt::self()->lookupCallable( m_obj, "jobs" );
-    if ( jobsCallable.isNull() )
-    {
-        return jobs;
-    }
-
-    PythonQtObjectPtr response = PythonQt::self()->callAndReturnPyObject( jobsCallable );
-    if ( response.isNull() )
-    {
-        return jobs;
-    }
-
-    PythonQtObjectPtr listPopCallable = PythonQt::self()->lookupCallable( response, "pop" );
-    if ( listPopCallable.isNull() )
-    {
-        return jobs;
-    }
-
-    forever
-    {
-        PythonQtObjectPtr aJob = PythonQt::self()->callAndReturnPyObject( listPopCallable, { 0 } );
-        if ( aJob.isNull() )
-        {
-            break;
-        }
-
-        jobs.append( Calamares::job_ptr( new PythonQtJob( m_cxt, aJob ) ) );
-    }
-
-    return jobs;
-}
-
-
-void
-PythonQtViewStep::setConfigurationMap( const QVariantMap& configurationMap )
-{
-    m_obj.addVariable( "configuration", configurationMap );
-}
-
-
-QWidget*
-PythonQtViewStep::createScriptingConsole()
-{
-    PythonQtScriptingConsole* console = new PythonQtScriptingConsole( nullptr, m_cxt );
-    console->setProperty( "classname", m_cxt.getVariable( "_calamares_module_typename" ).toString() );
-    return console;
-}
-
-}  // namespace Calamares
diff --git a/src/libcalamaresui/viewpages/PythonQtViewStep.h b/src/libcalamaresui/viewpages/PythonQtViewStep.h
deleted file mode 100644
index b23a540b9..000000000
--- a/src/libcalamaresui/viewpages/PythonQtViewStep.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#ifndef PYTHONQTVIEWSTEP_H
-#define PYTHONQTVIEWSTEP_H
-
-#include "ViewStep.h"
-
-#include 
-
-namespace Calamares
-{
-
-class PythonQtViewStep : public Calamares::ViewStep
-{
-    Q_OBJECT
-public:
-    PythonQtViewStep( PythonQtObjectPtr cxt, QObject* parent = nullptr );
-
-    QString prettyName() const override;
-
-    QWidget* widget() override;
-
-    void next() override;
-    void back() override;
-    void onLeave() override;
-    void onActivate() override;
-
-    bool isNextEnabled() const override;
-    bool isBackEnabled() const override;
-
-    bool isAtBeginning() const override;
-    bool isAtEnd() const override;
-
-    JobList jobs() const override;
-
-    void setConfigurationMap( const QVariantMap& configurationMap ) override;
-
-    QWidget* createScriptingConsole();
-
-protected:
-    QWidget* m_widget;
-
-private:
-    PythonQtObjectPtr m_cxt;
-    PythonQtObjectPtr m_obj;
-};
-
-}  // namespace Calamares
-
-#endif  // PYTHONQTVIEWSTEP_H
diff --git a/src/libcalamaresui/viewpages/ViewStep.h b/src/libcalamaresui/viewpages/ViewStep.h
index c20a9d396..22e72e5fd 100644
--- a/src/libcalamaresui/viewpages/ViewStep.h
+++ b/src/libcalamaresui/viewpages/ViewStep.h
@@ -29,8 +29,7 @@ namespace Calamares
  * A view module is a Calamares module which has at least one UI page (exposed as
  * ViewStep::widget), and can optionally create Calamares jobs at runtime.
  * As of early 2020, a view module can be implemented by deriving from ViewStep
- * in C++ (as a Qt Plugin or a Qml ViewStep) or in Python with the PythonQt interface
- * (which also mimics the ViewStep class).
+ * in C++ (as a Qt Plugin or a Qml ViewStep).
  *
  * A ViewStep can describe itself in human-readable format for the SummaryPage
  * (which shows all of the things which have been collected to be done in the
diff --git a/src/libcalamaresui/widgets/ClickableLabel.cpp b/src/libcalamaresui/widgets/ClickableLabel.cpp
index be7b142f1..8475a5aea 100644
--- a/src/libcalamaresui/widgets/ClickableLabel.cpp
+++ b/src/libcalamaresui/widgets/ClickableLabel.cpp
@@ -13,7 +13,8 @@
 
 namespace Calamares
 {
-
+namespace Widgets
+{
 
 ClickableLabel::ClickableLabel( QWidget* parent )
     : QLabel( parent )
@@ -47,5 +48,5 @@ ClickableLabel::mouseReleaseEvent( QMouseEvent* event )
         emit clicked();
     }
 }
-
+}  // namespace Widgets
 }  // namespace Calamares
diff --git a/src/libcalamaresui/widgets/ClickableLabel.h b/src/libcalamaresui/widgets/ClickableLabel.h
index 8c5561677..259f4a71f 100644
--- a/src/libcalamaresui/widgets/ClickableLabel.h
+++ b/src/libcalamaresui/widgets/ClickableLabel.h
@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef LIBCALAMARESUI_CLICKABLELABEL_H
-#define LIBCALAMARESUI_CLICKABLELABEL_H
+#ifndef LIBCALAMARESUI_WIDGETS_CLICKABLELABEL_H
+#define LIBCALAMARESUI_WIDGETS_CLICKABLELABEL_H
 
 #include 
 #include 
@@ -18,7 +18,8 @@
 
 namespace Calamares
 {
-
+namespace Widgets
+{
 /** @brief A Label where the whole label area is clickable
  *
  * When clicking anywhere on the Label (text, background, whatever)
@@ -44,7 +45,7 @@ protected:
 private:
     QElapsedTimer m_time;
 };
-
+}  // namespace Widgets
 }  // namespace Calamares
 
-#endif  // LIBCALAMARESUI_CLICKABLELABEL_H
+#endif  // LIBCALAMARESUI_WIDGETS_CLICKABLELABEL_H
diff --git a/src/libcalamaresui/widgets/PrettyRadioButton.cpp b/src/libcalamaresui/widgets/PrettyRadioButton.cpp
index b79f93a25..62e462a58 100644
--- a/src/libcalamaresui/widgets/PrettyRadioButton.cpp
+++ b/src/libcalamaresui/widgets/PrettyRadioButton.cpp
@@ -20,6 +20,8 @@
 
 namespace Calamares
 {
+namespace Widgets
+{
 
 PrettyRadioButton::PrettyRadioButton( QWidget* parent )
     : QWidget( parent )
@@ -124,5 +126,5 @@ PrettyRadioButton::toggleOptions( bool toggle )
         m_optionsLayout->parentWidget()->setVisible( toggle );
     }
 }
-
+}  // namespace Widgets
 }  // namespace Calamares
diff --git a/src/libcalamaresui/widgets/PrettyRadioButton.h b/src/libcalamaresui/widgets/PrettyRadioButton.h
index 1874457a8..fd00911e1 100644
--- a/src/libcalamaresui/widgets/PrettyRadioButton.h
+++ b/src/libcalamaresui/widgets/PrettyRadioButton.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef LIBCALAMARESUI_PRETTYRADIOBUTTON_H
-#define LIBCALAMARESUI_PRETTYRADIOBUTTON_H
+#ifndef LIBCALAMARESUI_WIDGETS_PRETTYRADIOBUTTON_H
+#define LIBCALAMARESUI_WIDGETS_PRETTYRADIOBUTTON_H
 
 #include "DllMacro.h"
 
@@ -21,6 +21,8 @@ class QHBoxLayout;
 
 namespace Calamares
 {
+namespace Widgets
+{
 class ClickableLabel;
 
 /** @brief A radio button with fancy label next to it.
@@ -72,6 +74,6 @@ protected:
     QGridLayout* m_mainLayout;
     QHBoxLayout* m_optionsLayout;
 };
-
+}  // namespace Widgets
 }  // namespace Calamares
-#endif  // LIBCALAMARESUI_PRETTYRADIOBUTTON_H
+#endif  // LIBCALAMARESUI_WIDGETS_PRETTYRADIOBUTTON_H
diff --git a/src/libcalamaresui/widgets/WaitingWidget.cpp b/src/libcalamaresui/widgets/WaitingWidget.cpp
index aef5aecf5..18acc11b7 100644
--- a/src/libcalamaresui/widgets/WaitingWidget.cpp
+++ b/src/libcalamaresui/widgets/WaitingWidget.cpp
@@ -12,46 +12,108 @@
 
 #include "utils/CalamaresUtilsGui.h"
 
-#include "3rdparty/waitingspinnerwidget.h"
-
 #include 
 #include 
+#include 
 
 WaitingWidget::WaitingWidget( const QString& text, QWidget* parent )
-    : QWidget( parent )
+    : WaitingSpinnerWidget( parent, false, false )
 {
-    QBoxLayout* waitingLayout = new QVBoxLayout;
-    setLayout( waitingLayout );
-    waitingLayout->addStretch();
-    QBoxLayout* pbLayout = new QHBoxLayout;
-    waitingLayout->addLayout( pbLayout );
-    pbLayout->addStretch();
-
-    WaitingSpinnerWidget* spnr = new WaitingSpinnerWidget();
-    pbLayout->addWidget( spnr );
-
-    pbLayout->addStretch();
-
-    m_waitingLabel = new QLabel( text );
-
-    int spnrSize = m_waitingLabel->fontMetrics().height() * 4;
-    spnr->setFixedSize( spnrSize, spnrSize );
-    spnr->setInnerRadius( spnrSize / 2 );
-    spnr->setLineLength( spnrSize / 2 );
-    spnr->setLineWidth( spnrSize / 8 );
-    spnr->start();
-
-    m_waitingLabel->setAlignment( Qt::AlignCenter );
-    waitingLayout->addSpacing( spnrSize / 2 );
-    waitingLayout->addWidget( m_waitingLabel );
-    waitingLayout->addStretch();
-
-    CalamaresUtils::unmarginLayout( waitingLayout );
+    int spnrSize = CalamaresUtils::defaultFontHeight() * 4;
+    setFixedSize( spnrSize, spnrSize );
+    setInnerRadius( spnrSize / 2 );
+    setLineLength( spnrSize / 2 );
+    setLineWidth( spnrSize / 8 );
+    setAlignment( Qt::AlignmentFlag::AlignBottom );
+    setText( text );
+    start();
 }
 
+WaitingWidget::~WaitingWidget() {}
+
+struct CountdownWaitingWidget::Private
+{
+    std::chrono::seconds duration;
+    // int because we count down, need to be able to show a 0,
+    // and then wrap around to duration a second later.
+    int count = 0;
+    QTimer* timer = nullptr;
+
+    Private( std::chrono::seconds seconds, QWidget* parent )
+        : duration( seconds )
+        , timer( new QTimer( parent ) )
+    {
+    }
+};
+
+CountdownWaitingWidget::CountdownWaitingWidget( std::chrono::seconds duration, QWidget* parent )
+    : WaitingSpinnerWidget( parent, false, false )
+    , d( std::make_unique< Private >( duration, this ) )
+{
+    // Set up the label first for sizing
+    const int labelHeight = qBound( 16, CalamaresUtils::defaultFontHeight() * 3 / 2, 64 );
+
+    // Set up the spinner
+    setFixedSize( labelHeight, labelHeight );
+    setRevolutionsPerSecond( 1.0 / double( duration.count() ) );
+    setInnerRadius( labelHeight / 2 );
+    setLineLength( labelHeight / 2 );
+    setLineWidth( labelHeight / 8 );
+    setAlignment( Qt::AlignmentFlag::AlignVCenter );
+
+    // Last because it updates the text
+    setInterval( duration );
+
+    d->timer->setInterval( std::chrono::seconds( 1 ) );
+    connect( d->timer, &QTimer::timeout, this, &CountdownWaitingWidget::tick );
+}
+
+CountdownWaitingWidget::~CountdownWaitingWidget()
+{
+    d->timer->stop();
+}
 
 void
-WaitingWidget::setText( const QString& text )
+CountdownWaitingWidget::setInterval( std::chrono::seconds duration )
 {
-    m_waitingLabel->setText( text );
+    d->duration = duration;
+    d->count = int( duration.count() );
+    tick();
+}
+
+void
+CountdownWaitingWidget::start()
+{
+    // start it from the top
+    if ( d->count <= 0 )
+    {
+        d->count = int( d->duration.count() );
+        tick();
+    }
+    d->timer->start();
+    WaitingSpinnerWidget::start();
+}
+
+void
+CountdownWaitingWidget::stop()
+{
+    d->timer->stop();
+    WaitingSpinnerWidget::stop();
+}
+
+void
+CountdownWaitingWidget::tick()
+{
+    // We do want to **display** a 0 which is why we wrap around only
+    // after counting down from 0.
+    d->count--;
+    if ( d->count < 0 )
+    {
+        d->count = int( d->duration.count() );
+    }
+    setText( QString::number( d->count ) );
+    if ( d->count == 0 )
+    {
+        timeout();
+    }
 }
diff --git a/src/libcalamaresui/widgets/WaitingWidget.h b/src/libcalamaresui/widgets/WaitingWidget.h
index 850b81ca9..4f256259e 100644
--- a/src/libcalamaresui/widgets/WaitingWidget.h
+++ b/src/libcalamaresui/widgets/WaitingWidget.h
@@ -10,20 +10,61 @@
 #ifndef WAITINGWIDGET_H
 #define WAITINGWIDGET_H
 
-#include 
+#include "widgets/waitingspinnerwidget.h"
+
+#include 
+#include 
 
 class QLabel;
+class QTimer;
 
-class WaitingWidget : public QWidget
+/** @brief A spinner and a label below it
+ *
+ * The spinner has a fixed size of 4* the font height,
+ * and the text is displayed centered below it. Use this
+ * to display a long-term waiting situation with a status report.
+ */
+class WaitingWidget : public WaitingSpinnerWidget
+{
+public:
+    /// Create a WaitingWidget with initial @p text label.
+    explicit WaitingWidget( const QString& text, QWidget* parent = nullptr );
+    ~WaitingWidget() override;
+};
+
+/** @brief A spinner and a countdown inside it
+ *
+ * The spinner is sized to the text-height and displays a
+ * numeric countdown iside the spinner. The countdown is updated
+ * every second. The signal timeout() is sent every time
+ * the countdown reaches 0.
+ */
+class CountdownWaitingWidget : public WaitingSpinnerWidget
 {
     Q_OBJECT
 public:
-    explicit WaitingWidget( const QString& text, QWidget* parent = nullptr );
+    /// Create a countdown widget with a given @p duration
+    explicit CountdownWaitingWidget( std::chrono::seconds duration = std::chrono::seconds( 5 ),
+                                     QWidget* parent = nullptr );
+    ~CountdownWaitingWidget() override;
 
-    void setText( const QString& text );
+    /// Changes the duration used and resets the countdown
+    void setInterval( std::chrono::seconds duration );
+
+    /// Start the countdown, resets to the full duration
+    void start();
+    /// Stop the countdown
+    void stop();
+
+Q_SIGNALS:
+    void timeout();
+
+protected Q_SLOTS:
+    void tick();
 
 private:
-    QLabel* m_waitingLabel;
+    struct Private;
+    std::unique_ptr< Private > d;
 };
 
 #endif  // WAITINGWIDGET_H
diff --git a/src/libcalamaresui/widgets/waitingspinnerwidget.cpp b/src/libcalamaresui/widgets/waitingspinnerwidget.cpp
new file mode 100644
index 000000000..3073e9b97
--- /dev/null
+++ b/src/libcalamaresui/widgets/waitingspinnerwidget.cpp
@@ -0,0 +1,390 @@
+/*
+ *   SPDX-FileCopyrightText: 2012-2014 Alexander Turkin
+ *   SPDX-FileCopyrightText: 2014 William Hallatt
+ *   SPDX-FileCopyrightText: 2015 Jacob Dawid
+ *   SPDX-FileCopyrightText: 2018 huxingyi
+ *   SPDX-License-Identifier: MIT
+ */
+
+/* Original Work Copyright (c) 2012-2014 Alexander Turkin
+   Modified 2014 by William Hallatt
+   Modified 2015 by Jacob Dawid
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include "waitingspinnerwidget.h"
+
+#include 
+#include 
+#include 
+
+static bool
+isAlignCenter( Qt::AlignmentFlag a )
+{
+    return a == Qt::AlignmentFlag::AlignVCenter;
+}
+
+static int
+lineCountDistanceFromPrimary( int current, int primary, int totalNrOfLines )
+{
+    int distance = primary - current;
+    if ( distance < 0 )
+    {
+        distance += totalNrOfLines;
+    }
+    return distance;
+}
+
+static QColor
+currentLineColor( int countDistance, int totalNrOfLines, qreal trailFadePerc, qreal minOpacity, QColor color )
+{
+    if ( countDistance == 0 )
+    {
+        return color;
+    }
+    const qreal minAlphaF = minOpacity / 100.0;
+    int distanceThreshold = static_cast< int >( qCeil( ( totalNrOfLines - 1 ) * trailFadePerc / 100.0 ) );
+    if ( countDistance > distanceThreshold )
+    {
+        color.setAlphaF( minAlphaF );
+    }
+    else
+    {
+        qreal alphaDiff = color.alphaF() - minAlphaF;
+        qreal gradient = alphaDiff / static_cast< qreal >( distanceThreshold + 1 );
+        qreal resultAlpha = color.alphaF() - gradient * countDistance;
+
+        // If alpha is out of bounds, clip it.
+        resultAlpha = qBound( 0.0, resultAlpha, 1.0 );
+        color.setAlphaF( resultAlpha );
+    }
+    return color;
+}
+
+WaitingSpinnerWidget::WaitingSpinnerWidget( QWidget* parent, bool centerOnParent, bool disableParentWhenSpinning )
+    : WaitingSpinnerWidget( Qt::WindowModality::NonModal, parent, centerOnParent, disableParentWhenSpinning )
+{
+}
+
+WaitingSpinnerWidget::WaitingSpinnerWidget( Qt::WindowModality modality,
+                                            QWidget* parent,
+                                            bool centerOnParent,
+                                            bool disableParentWhenSpinning )
+    : QWidget( parent,
+               modality == Qt::WindowModality::NonModal ? Qt::WindowFlags() : Qt::Dialog | Qt::FramelessWindowHint )
+    , _centerOnParent( centerOnParent )
+    , _disableParentWhenSpinning( disableParentWhenSpinning )
+{
+    _timer = new QTimer( this );
+    connect( _timer, SIGNAL( timeout() ), this, SLOT( rotate() ) );
+    updateSize();
+    updateTimer();
+    hide();
+
+    // We need to set the window modality AFTER we've hidden the
+    // widget for the first time since changing this property while
+    // the widget is visible has no effect.
+    //
+    // Non-modal windows don't need any work
+    if ( modality != Qt::WindowModality::NonModal )
+    {
+        setWindowModality( modality );
+        setAttribute( Qt::WA_TranslucentBackground );
+    }
+}
+
+void
+WaitingSpinnerWidget::paintEvent( QPaintEvent* )
+{
+    updatePosition();
+    QPainter painter( this );
+    painter.fillRect( this->rect(), Qt::transparent );
+    painter.setRenderHint( QPainter::Antialiasing, true );
+
+    if ( _currentCounter >= _numberOfLines )
+    {
+        _currentCounter = 0;
+    }
+
+    painter.setPen( Qt::NoPen );
+    for ( int i = 0; i < _numberOfLines; ++i )
+    {
+        painter.save();
+        painter.translate( _innerRadius + _lineLength, _innerRadius + _lineLength );
+        painter.translate( ( width() - _imageSize.width() ) / 2, 0 );
+        qreal rotateAngle = static_cast< qreal >( 360 * i ) / static_cast< qreal >( _numberOfLines );
+        painter.rotate( rotateAngle );
+        painter.translate( _innerRadius, 0 );
+        int distance = lineCountDistanceFromPrimary( i, _currentCounter, _numberOfLines );
+        QColor color = currentLineColor( distance, _numberOfLines, _trailFadePercentage, _minimumTrailOpacity, _color );
+        painter.setBrush( color );
+        // TODO improve the way rounded rect is painted
+        painter.drawRoundedRect(
+            QRect( 0, -_lineWidth / 2, _lineLength, _lineWidth ), _roundness, _roundness, Qt::RelativeSize );
+        painter.restore();
+    }
+
+    if ( !_text.isEmpty() )
+    {
+        painter.setPen( QPen( _textColor ) );
+        if ( isAlignCenter( alignment() ) )
+        {
+            painter.drawText( QRect( 0, 0, width(), height() ), Qt::AlignVCenter | Qt::AlignHCenter, _text );
+        }
+        else
+        {
+            painter.drawText( QRect( 0, _imageSize.height(), width(), height() - _imageSize.height() ),
+                              Qt::AlignBottom | Qt::AlignHCenter,
+                              _text );
+        }
+    }
+}
+
+void
+WaitingSpinnerWidget::start()
+{
+    updatePosition();
+    _isSpinning = true;
+    show();
+
+    if ( parentWidget() && _disableParentWhenSpinning )
+    {
+        parentWidget()->setEnabled( false );
+    }
+
+    if ( !_timer->isActive() )
+    {
+        _timer->start();
+        _currentCounter = 0;
+    }
+}
+
+void
+WaitingSpinnerWidget::stop()
+{
+    _isSpinning = false;
+    hide();
+
+    if ( parentWidget() && _disableParentWhenSpinning )
+    {
+        parentWidget()->setEnabled( true );
+    }
+
+    if ( _timer->isActive() )
+    {
+        _timer->stop();
+        _currentCounter = 0;
+    }
+}
+
+void
+WaitingSpinnerWidget::setNumberOfLines( int lines )
+{
+    _numberOfLines = lines;
+    _currentCounter = 0;
+    updateTimer();
+}
+
+void
+WaitingSpinnerWidget::setLineLength( int length )
+{
+    _lineLength = length;
+    updateSize();
+}
+
+void
+WaitingSpinnerWidget::setLineWidth( int width )
+{
+    _lineWidth = width;
+    updateSize();
+}
+
+void
+WaitingSpinnerWidget::setInnerRadius( int radius )
+{
+    _innerRadius = radius;
+    updateSize();
+}
+
+void
+WaitingSpinnerWidget::setText( const QString& text )
+{
+    _text = text;
+    updateSize();
+}
+
+void
+WaitingSpinnerWidget::setAlignment( Qt::AlignmentFlag align )
+{
+    _alignment = align;
+    updateSize();
+}
+
+QColor
+WaitingSpinnerWidget::color() const
+{
+    return _color;
+}
+
+QColor
+WaitingSpinnerWidget::textColor() const
+{
+    return _textColor;
+}
+
+QString
+WaitingSpinnerWidget::text() const
+{
+    return _text;
+}
+
+qreal
+WaitingSpinnerWidget::roundness() const
+{
+    return _roundness;
+}
+
+qreal
+WaitingSpinnerWidget::minimumTrailOpacity() const
+{
+    return _minimumTrailOpacity;
+}
+
+qreal
+WaitingSpinnerWidget::trailFadePercentage() const
+{
+    return _trailFadePercentage;
+}
+
+qreal
+WaitingSpinnerWidget::revolutionsPersSecond() const
+{
+    return _revolutionsPerSecond;
+}
+
+int
+WaitingSpinnerWidget::numberOfLines() const
+{
+    return _numberOfLines;
+}
+
+int
+WaitingSpinnerWidget::lineLength() const
+{
+    return _lineLength;
+}
+
+int
+WaitingSpinnerWidget::lineWidth() const
+{
+    return _lineWidth;
+}
+
+int
+WaitingSpinnerWidget::innerRadius() const
+{
+    return _innerRadius;
+}
+
+bool
+WaitingSpinnerWidget::isSpinning() const
+{
+    return _isSpinning;
+}
+
+void
+WaitingSpinnerWidget::setRoundness( qreal roundness )
+{
+    _roundness = qBound( 0.0, roundness, 100.0 );
+}
+
+void
+WaitingSpinnerWidget::setColor( QColor color )
+{
+    _color = color;
+}
+
+void
+WaitingSpinnerWidget::setTextColor( QColor color )
+{
+    _textColor = color;
+}
+
+void
+WaitingSpinnerWidget::setRevolutionsPerSecond( qreal revolutionsPerSecond )
+{
+    _revolutionsPerSecond = revolutionsPerSecond;
+    updateTimer();
+}
+
+void
+WaitingSpinnerWidget::setTrailFadePercentage( qreal trail )
+{
+    _trailFadePercentage = trail;
+}
+
+void
+WaitingSpinnerWidget::setMinimumTrailOpacity( qreal minimumTrailOpacity )
+{
+    _minimumTrailOpacity = minimumTrailOpacity;
+}
+
+void
+WaitingSpinnerWidget::rotate()
+{
+    ++_currentCounter;
+    if ( _currentCounter >= _numberOfLines )
+    {
+        _currentCounter = 0;
+    }
+    update();
+}
+
+void
+WaitingSpinnerWidget::updateSize()
+{
+    int size = ( _innerRadius + _lineLength ) * 2;
+    _imageSize = QSize( size, size );
+    if ( _text.isEmpty() || isAlignCenter( alignment() ) )
+    {
+        setFixedSize( size, size );
+    }
+    else
+    {
+        QFontMetrics fm( font() );
+        QSize textSize = QSize( fm.horizontalAdvance( _text ), fm.height() );
+        setFixedSize( qMax( size, textSize.width() ), size + size / 4 + textSize.height() );
+    }
+}
+
+void
+WaitingSpinnerWidget::updateTimer()
+{
+    // Old-style interval in milliseconds; force to int to suppress warning
+    _timer->setInterval( int( 1000 / ( _numberOfLines * _revolutionsPerSecond ) ) );
+}
+
+void
+WaitingSpinnerWidget::updatePosition()
+{
+    if ( parentWidget() && _centerOnParent )
+    {
+        move( parentWidget()->width() / 2 - width() / 2, parentWidget()->height() / 2 - height() / 2 );
+    }
+}
diff --git a/src/libcalamaresui/widgets/waitingspinnerwidget.h b/src/libcalamaresui/widgets/waitingspinnerwidget.h
new file mode 100644
index 000000000..29385566e
--- /dev/null
+++ b/src/libcalamaresui/widgets/waitingspinnerwidget.h
@@ -0,0 +1,161 @@
+/*
+ *   SPDX-FileCopyrightText: 2012-2014 Alexander Turkin
+ *   SPDX-FileCopyrightText: 2014 William Hallatt
+ *   SPDX-FileCopyrightText: 2015 Jacob Dawid
+ *   SPDX-FileCopyrightText: 2018 huxingyi
+ *   SPDX-License-Identifier: MIT
+ */
+
+/* Original Work Copyright (c) 2012-2014 Alexander Turkin
+   Modified 2014 by William Hallatt
+   Modified 2015 by Jacob Dawid
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#pragma once
+
+// Qt includes
+#include 
+#include 
+#include 
+
+class WaitingSpinnerWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    /** @brief Constructor for "standard" widget behaviour
+     *
+     * Use this constructor if you wish to, e.g. embed your widget in another.
+     */
+    WaitingSpinnerWidget( QWidget* parent = nullptr,
+                          bool centerOnParent = true,
+                          bool disableParentWhenSpinning = true );
+
+    /** @brief Constructor
+     *
+     * Use this constructor to automatically create a modal
+     * ("blocking") spinner on top of the calling widget/window.  If a valid
+     * parent widget is provided, "centreOnParent" will ensure that
+     * QtWaitingSpinner automatically centres itself on it, if not,
+     * @p centerOnParent is ignored.
+     */
+    WaitingSpinnerWidget( Qt::WindowModality modality,
+                          QWidget* parent = nullptr,
+                          bool centerOnParent = true,
+                          bool disableParentWhenSpinning = true );
+
+    WaitingSpinnerWidget( const WaitingSpinnerWidget& ) = delete;
+    WaitingSpinnerWidget& operator=( const WaitingSpinnerWidget& ) = delete;
+
+    void setColor( QColor color );
+    void setTextColor( QColor color );
+    void setRoundness( qreal roundness );
+    void setMinimumTrailOpacity( qreal minimumTrailOpacity );
+    void setTrailFadePercentage( qreal trail );
+    void setRevolutionsPerSecond( qreal revolutionsPerSecond );
+    void setNumberOfLines( int lines );
+    void setLineLength( int length );
+    void setLineWidth( int width );
+    void setInnerRadius( int radius );
+
+    /** @brief Sets the text displayed in or below the spinner
+     *
+     * If the text is empty, no text is displayed. The text is displayed
+     * in or below the spinner depending on the value of alignment().
+     * With AlignBottom, the text is displayed below the spinner,
+     * centered horizontally relative to the spinner; any other alignment
+     * will put the text in the middle of the spinner itself.
+     *
+     * TODO: this does not support rich text. Rich text could be done
+     *       through a QStaticText, or an HTML document. However, then
+     *       we need to do more alignment calculations ourselves.
+     */
+    void setText( const QString& text );
+    /** @brief Sets the alignment of text for the spinner
+     *
+     * The only meaningful values are AlignBottom and AlignVCenter,
+     * for text below the spinner and text in the middle.
+     */
+    void setAlignment( Qt::AlignmentFlag align );
+    /// Convenience to set text-in-the-middle (@c true) or text-at-bottom (@c false)
+    void setCenteredText( bool centered )
+    {
+        setAlignment( centered ? Qt::AlignmentFlag::AlignVCenter : Qt::AlignmentFlag::AlignBottom );
+    }
+
+    QColor color() const;
+    QColor textColor() const;
+    QString text() const;
+    Qt::AlignmentFlag alignment() const { return _alignment; }
+    qreal roundness() const;
+    qreal minimumTrailOpacity() const;
+    qreal trailFadePercentage() const;
+    qreal revolutionsPersSecond() const;
+    int numberOfLines() const;
+    int lineLength() const;
+    int lineWidth() const;
+    int innerRadius() const;
+
+    bool isSpinning() const;
+
+public Q_SLOTS:
+    void start();
+    void stop();
+
+private Q_SLOTS:
+    void rotate();
+
+protected:
+    void paintEvent( QPaintEvent* paintEvent ) override;
+
+private:
+    void updateSize();
+    void updateTimer();
+    void updatePosition();
+
+private:
+    // PI, leading to a full fade in one whole revolution
+    static constexpr const auto radian = 3.14159265358979323846;
+
+    // Spinner-wheel related settings
+    QColor _color = Qt::black;
+    qreal _roundness = 100.0;  // 0..100
+    qreal _minimumTrailOpacity = radian;
+    qreal _trailFadePercentage = 80.0;
+    qreal _revolutionsPerSecond = radian / 2;
+    int _numberOfLines = 20;
+    int _lineLength = 10;
+    int _lineWidth = 2;
+    int _innerRadius = 10;
+    QSize _imageSize;
+
+    // Text-related settings
+    Qt::AlignmentFlag _alignment = Qt::AlignmentFlag::AlignBottom;
+    QString _text;
+    QColor _textColor = Qt::black;
+
+    // Environment settings
+    bool _centerOnParent = true;
+    bool _disableParentWhenSpinning = true;
+
+    // Internal bits
+    QTimer* _timer = nullptr;
+    int _currentCounter = 0;
+    bool _isSpinning = false;
+};
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 03384105e..bb7335316 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -8,7 +8,7 @@
 # individual modules can also decide they must be skipped (e.g. OS-specific
 # modules, or ones with unmet dependencies). Collect the skipped modules
 # in this list.
-set( LIST_SKIPPED_MODULES "" )
+set(LIST_SKIPPED_MODULES "")
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/src/libcalamares
@@ -16,29 +16,46 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/src/libcalamaresui
 )
 
-string( REPLACE " " ";" SKIP_LIST "${SKIP_MODULES}" )
+string(REPLACE " " ";" SKIP_LIST "${SKIP_MODULES}")
 
-file( GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*" )
-list( SORT SUBDIRECTORIES )
+file(GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*")
+list(SORT SUBDIRECTORIES)
 
-foreach( SUBDIRECTORY ${SUBDIRECTORIES} )
+foreach(SUBDIRECTORY ${SUBDIRECTORIES})
     calamares_add_module_subdirectory( ${SUBDIRECTORY} LIST_SKIPPED_MODULES )
 endforeach()
 
-# TODO:3.3: Use FindPython3
-if ( BUILD_TESTING AND BUILD_SCHEMA_TESTING AND PYTHONINTERP_FOUND AND PYTHON_EXECUTABLE )
+if(BUILD_TESTING AND BUILD_SCHEMA_TESTING AND Python_Interpreter_FOUND)
     # The tests for each config file are independent of whether the
     # module is enabled or not: the config file should match its schema
     # regardless.
-    foreach( SUBDIRECTORY ${SUBDIRECTORIES} )
-        set( _schema_file "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${SUBDIRECTORY}.schema.yaml" )
-        set( _conf_file "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${SUBDIRECTORY}.conf" )
-        if ( EXISTS "${_schema_file}" AND EXISTS "${_conf_file}" )
-            add_test(
-                NAME validate-${SUBDIRECTORY}
-                COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" "${_schema_file}" "${_conf_file}"
-            )
+    foreach(SUBDIRECTORY ${SUBDIRECTORIES})
+        set(_schema_file "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${SUBDIRECTORY}.schema.yaml")
+        # Collect config files from the module-directory and from a tests/ subdir,
+        # using the same mechanism to find those test-config-files as function
+        # calamares_add_module_subdirectory() would do.
+        set(_conf_files "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${SUBDIRECTORY}.conf")
+        set(_count 1)
+        set(_testdir "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/tests")
+        while(EXISTS "${_testdir}/${_count}.global" OR EXISTS "${_testdir}/${_count}.job")
+            if(EXISTS "${_testdir}/${_count}.job")
+                list(APPEND _conf_files "${_testdir}/${_count}.job")
+            endif()
+            math(EXPR _count "${_count} + 1")
+        endwhile()
+
+        if(EXISTS "${_schema_file}")
+            foreach(_conf_file ${_conf_files})
+                if(EXISTS ${_conf_file})
+                    get_filename_component(_conf_base "${_conf_file}" NAME_WE)
+                    add_test(
+                        NAME validate-${SUBDIRECTORY}-${_conf_base}
+                        COMMAND
+                            ${Python_EXECUTABLE} "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" "${_schema_file}"
+                            "${_conf_file}"
+                    )
+                endif()
+            endforeach()
         endif()
     endforeach()
 endif()
-
diff --git a/src/modules/README.md b/src/modules/README.md
index e5bd2e7b6..e654177c7 100644
--- a/src/modules/README.md
+++ b/src/modules/README.md
@@ -180,26 +180,40 @@ it is possible to take the whole installation-process into account
 for determining the relative weights there.
 
 
-## Global storage keys
+## Global Storage keys
 
-Some modules place values in global storage so that they can be referenced later by other modules or even other parts of the same module.  The following table represents a partial list of the values available as well as where they originate from and which module consume them.
+Some modules place values in Global Storage so that they can be referenced later by other modules or even other parts of the same module.  The following table represents a partial list of the values available as well as where they originate from and which module consume them.
+Keys whose name is followed by a `+` are **structured** data, and have
+entries (which start with `+`) below the parent key describing subkeys.
+Some structured keys refer to other documentation sources.
 
-Key               |Source          |Consumers|Description
-------------------|----------------|---|---
-btrfsSubvolumes   |mount           |fstab|List of maps containing the mountpoint and btrtfs subvolume
+Key               |Source          |Consumers      |Description
+------------------|----------------|---------------|---
+bootloader +      |partition       |               |Bootloader location
+\+ installPath    |                |               |Device (e.g. `/dev/sda`) where the bootloader is installed
+branding +        |                |               |See `src/branding/README.md`
+btrfsSubvolumes   |mount           |fstab          |List of maps containing the mountpoint and btrtfs subvolume
 btrfsRootSubvolume|mount           |bootloader, luksopenswaphook|String containing the subvolume mounted at root
 efiSystemPartition|partition       |bootloader, fstab|String containing the path to the ESP relative to the installed system
 extraMounts       |mount           |unpackfs|List of maps holding metadata for the temporary mountpoints used by the installer
-fullname          |users           ||The full username (e.g. "Jane Q. Public")
-hostname          |users           ||A string containing the hostname of the new system
-netinstallAdd     |packagechooser  |netinstall|Data to add to netinstall tree. Same format as netinstall.yaml
-netinstallSelect  |packagechooser  |netinstall|List of group names to select in the netinstall tree
-partitions        |partition, rawfs|numerous modules|List of maps of metadata about each partition
-rootMountPoint    |mount           |numerous modules|A string with the absolute path to the root mountpoint
+fullname          |users           |               |The full username (e.g. "Jane Q. Public")
+hostname          |users           |               |A string containing the hostname of the new system
+netinstallAdd     |packagechooser  |netinstall     |Data to add to netinstall tree. Same format as netinstall.yaml
+netinstallSelect  |packagechooser  |netinstall     |List of group names to select in the netinstall tree
+packageOperations +|packagechooser, netinstall|packages|Operations to perform
+\+ (list data)    |                |               |See `packages.conf`
+partitions +      |partition, rawfs|(many)         |List of maps of metadata about each partition
+\+ device         |                |               |path to the partition device
+\+ fs             |                |               |the name of the file system
+\+ mountPoint     |                |               |where the device should be mounted
+\+ uuid           |                |               |the UUID of the partition device
+rootMountPoint    |mount           |(many)         |A string with the absolute path to the root mountpoint
 username          |users           |networkcfg, plasmainf, preservefiles|A string containing the username of the new user
 zfsDatasets       |zfs             |bootloader, grubcfg, mount|List of maps of zfs datasets including the name and mount information
-zfsInfo           |partition       |mount, zfs|List of encrypted zfs partitions and the encription info
-zfsPoolInfo       |zfs             |mount, umount|List of maps of zfs pool info including the name and mountpoint
+zfsInfo           |partition       |mount, zfs     |List of encrypted zfs partitions and the encription info
+zfsPoolInfo       |zfs             |mount, umount  |List of maps of zfs pool info including the name and mountpoint
+
+
 
 
 ## C++ modules
diff --git a/src/modules/bootloader/bootloader.conf b/src/modules/bootloader/bootloader.conf
index 224ee8d72..bac9e517f 100644
--- a/src/modules/bootloader/bootloader.conf
+++ b/src/modules/bootloader/bootloader.conf
@@ -13,19 +13,21 @@
 # Possible options are 'grub', 'sb-shim' and 'systemd-boot'.
 efiBootLoader: "grub"
 
-# systemd-boot configuration files settings, set kernel and initramfs file names
+# systemd-boot configuration files settings, set kernel search path, kernel name
 # and amount of time before default selection boots
-kernel: "_ALL_kver_"
-img: "_default_image_"
-fallback: "_fallback_image_"
+kernelSearchPath: "/usr/lib/modules"
+kernelName: "vmlinuz"
 timeout: "10"
 
-# Optionally set the menu entry name and kernel name to use in systemd-boot.
+# additionalInitrdFiles is a comma seperated list of file names
+additionalInitrdFiles:
+    - "/boot/amd-ucode"
+    - "/boot/intel-ucode"
+
+# Optionally set the menu entry name to use in systemd-boot.
 # If not specified here, these settings will be taken from branding.desc.
 #
-# bootloaderEntryName: "Manjaro"
-kernelLine: ", with _manjaro_kernel_"
-fallbackKernelLine: ", with _manjaro_kernel_ (fallback initramfs)"
+# bootloaderEntryName: "Generic GNU/Linux"
 
 # GRUB 2 binary names and boot directory
 # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
diff --git a/src/modules/bootloader/bootloader.schema.yaml b/src/modules/bootloader/bootloader.schema.yaml
index 152d3ab72..0849f6865 100644
--- a/src/modules/bootloader/bootloader.schema.yaml
+++ b/src/modules/bootloader/bootloader.schema.yaml
@@ -7,10 +7,13 @@ additionalProperties: false
 type: object
 properties:
     efiBootLoader: { type: string }
-    kernel:  { type: string }
-    img:  { type: string }
-    fallback:  { type: string }
+    kernelSearchPath:  { type: string }
+    kernelName:  { type: string }
     timeout:  { type: string }  # Inserted verbatim
+    additionalInitrdFiles:
+        type: array
+        items:
+            type: string
     bootloaderEntryName:  { type: string }
     kernelLine:  { type: string }
     fallbackKernelLine:  { type: string }
@@ -27,9 +30,10 @@ properties:
 
 required:
     - efiBootLoader
-    - kernel
-    - img
+    - kernelSearchPath
+    - kernelName
     - grubInstall
     - grubMkconfig
     - grubCfg
     - grubProbe
+    - machineid
diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index fb8e19ac2..cc22746dd 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -136,18 +136,18 @@ def is_zfs_root(partition):
     return partition["mountPoint"] == "/" and partition["fs"] == "zfs"
 
 
-def create_systemd_boot_conf(install_path, efi_dir, uuid, entry, entry_name, kernel_type):
+def create_systemd_boot_conf(installation_root_path, efi_dir, uuid, entry, kernel, kernel_type, kernel_version):
     """
     Creates systemd-boot configuration files based on given parameters.
 
-    :param install_path:
-    :param efi_dir:
-    :param uuid:
-    :param entry:
-    :param entry_name:
-    :param kernel_type:
+    :param installation_root_path: A string containing the absolute path to the root of the installation
+    :param efi_dir: A string containing the path to the efi dir relative to the root of the installation
+    :param uuid: A string containing the UUID of the root volume
+    :param entry: A string containing the name of the entry as it will be displayed on boot
+    :param kernel: A string containing the path to the kernel relative to the root of the installation
+    :param kernel_type: A string which should be set if there is a special version of the entry, for example "fallback"
+    :param kernel_version: The kernel version string
     """
-    kernel = libcalamares.job.configuration["kernel"]
     kernel_params = ["quiet"]
 
     partitions = libcalamares.globalstorage.value("partitions")
@@ -208,42 +208,59 @@ def create_systemd_boot_conf(install_path, efi_dir, uuid, entry, entry_name, ker
         kernel_params.append("resume=/dev/mapper/{!s}".format(
             swap_outer_mappername))
 
-    kernel_line = get_kernel_line(kernel_type)
-    libcalamares.utils.debug("Configure: \"{!s}\"".format(kernel_line))
+    libcalamares.utils.debug("Configure: \"{!s}\"".format(f"{entry} {kernel_version}"))
 
     if kernel_type == "fallback":
-        img = libcalamares.job.configuration["fallback"]
-        entry_name = entry_name + "-fallback"
+        version_string = kernel_version + "-fallback"
+        initrd = "initrd-fallback"
     else:
-        img = libcalamares.job.configuration["img"]
+        version_string = kernel_version
+        initrd = "initrd"
 
-    conf_path = os.path.join(install_path + efi_dir,
+    # get the machine-id
+    with open(os.path.join(installation_root_path, "etc", "machine-id"), 'r') as machineid_file:
+        machine_id = machineid_file.read().rstrip('\n')
+
+    # Copy kernel to a subdirectory of /efi partition
+    machine_dir = os.path.join(installation_root_path + efi_dir, machine_id)
+    os.makedirs(machine_dir, exist_ok=True)
+
+    target_efi_files_dir = os.path.join(machine_dir, kernel_version)
+    os.makedirs(target_efi_files_dir, exist_ok=True)
+
+    kernel_path = os.path.join(installation_root_path, kernel)
+    kernel_name = os.path.basename(kernel_path)
+    shutil.copyfile(kernel_path, os.path.join(target_efi_files_dir, "linux"))
+
+    # write the entry
+    lines = [
+        '## Generated by Calamares\n',
+        '\n',
+        "title      {!s}\n".format(entry),
+        "version    {!s}\n".format(version_string),
+        "machine-id {!s}\n".format(machine_id),
+        "linux      {!s}\n".format(os.path.join("/", machine_id, kernel_version, "linux")),
+    ]
+
+    try:
+        additional_initrd_files = libcalamares.job.configuration["additionalInitrdFiles"]
+        for initrd_file in additional_initrd_files:
+            libcalamares.utils.debug("Attempting to handle initrd image " + initrd_file)
+            if os.path.isfile(os.path.join(installation_root_path, initrd_file.lstrip('/'))):
+                libcalamares.utils.debug("Found image " + initrd_file)
+                shutil.copyfile(os.path.join(installation_root_path, initrd_file.lstrip('/')), os.path.join(target_efi_files_dir, os.path.basename(initrd_file)))
+                lines.append("initrd     {!s}\n".format(os.path.join("/", machine_id, kernel_version, os.path.basename(initrd_file))))
+    except KeyError: # If the configuration option isn't set, we can just move on
+        libcalamares.utils.debug("Failed to find key additionalInitrdFiles")
+        pass
+
+    lines.append("initrd     {!s}\n".format(os.path.join("/", machine_id, kernel_version, initrd)))
+    lines.append("options    {!s} rw\n".format(" ".join(kernel_params)))
+
+    conf_path = os.path.join(installation_root_path + efi_dir,
                              "loader",
                              "entries",
-                             entry_name + ".conf")
-
-    # Copy kernel and initramfs to a subdirectory of /efi partition
-    files_dir = os.path.join(install_path + efi_dir, entry_name)
-    os.makedirs(files_dir, exist_ok=True)
-
-    kernel_path = install_path + kernel
-    kernel_name = os.path.basename(kernel_path)
-    shutil.copyfile(kernel_path, os.path.join(files_dir, kernel_name))
-
-    img_path = install_path + img
-    img_name = os.path.basename(img_path)
-    shutil.copyfile(img_path, os.path.join(files_dir, img_name))
-
-    lines = [
-        '## This is just an example config file.\n',
-        '## Please edit the paths and kernel parameters according\n',
-        '## to your system.\n',
-        '\n',
-        "title   {!s}{!s}\n".format(entry, kernel_line),
-        "linux   {!s}\n".format(os.path.join("/", entry_name, kernel_name)),
-        "initrd  {!s}\n".format(os.path.join("/", entry_name, img_name)),
-        "options {!s} rw\n".format(" ".join(kernel_params)),
-    ]
+                             machine_id + "-" + version_string + ".conf")
 
     with open(conf_path, 'w') as conf_file:
         for line in lines:
@@ -465,6 +482,30 @@ def efi_boot_next():
     if boot_entry:
         subprocess.call([boot_mgr, "-n", boot_entry])
 
+def get_kernels(installation_root_path):
+    """
+    Gets a list of kernels and associated values for each kernel.  This will work as is for many distros.
+    If not, it should be safe to modify it to better support your distro
+
+    :param installation_root_path: A string with the absolute path to the root of the installation
+
+    Returns a list of 3-tuples
+
+    Each 3-tuple contains the kernel, kernel_type and kernel_version
+    """
+    kernel_search_path = libcalamares.job.configuration["kernelSearchPath"]
+    source_kernel_name = libcalamares.job.configuration["kernelName"]
+    kernel_list = []
+
+    # find all the installed kernels and generate default and fallback entries for each
+    for root, dirs, files in os.walk(os.path.join(installation_root_path, kernel_search_path.lstrip('/'))):
+        for file in files:
+            if file == source_kernel_name:
+                rel_root = os.path.relpath(root, installation_root_path)
+                kernel_list.append((os.path.join(rel_root, file),"default",os.path.basename(root)))
+                kernel_list.append((os.path.join(rel_root, file),"fallback",os.path.basename(root)))
+
+    return kernel_list
 
 def install_systemd_boot(efi_directory):
     """
@@ -473,8 +514,8 @@ def install_systemd_boot(efi_directory):
     :param efi_directory:
     """
     libcalamares.utils.debug("Bootloader: systemd-boot")
-    install_path = libcalamares.globalstorage.value("rootMountPoint")
-    install_efi_directory = install_path + efi_directory
+    installation_root_path = libcalamares.globalstorage.value("rootMountPoint")
+    install_efi_directory = installation_root_path + efi_directory
     uuid = get_uuid()
     distribution = get_bootloader_entry_name()
     distribution_translated = distribution.translate(file_name_sanitizer)
@@ -484,21 +525,17 @@ def install_systemd_boot(efi_directory):
     subprocess.call(["bootctl",
                      "--path={!s}".format(install_efi_directory),
                      "install"])
-    create_systemd_boot_conf(install_path,
-                             efi_directory,
-                             uuid,
-                             distribution,
-                             distribution_translated,
-                             "default")
-    if "fallback" in libcalamares.job.configuration:
-        create_systemd_boot_conf(install_path,
-                                 efi_directory,
-                                 uuid,
-                                 distribution,
-                                 distribution_translated,
-                                 "fallback")
-    create_loader(loader_path, distribution_translated)
 
+    for (kernel, kernel_type, kernel_version) in get_kernels(installation_root_path):
+        create_systemd_boot_conf(installation_root_path,
+                                efi_directory,
+                                uuid,
+                                distribution,
+                                kernel,
+                                kernel_type,
+                                kernel_version)
+
+    create_loader(loader_path, distribution_translated)
 
 def get_grub_efi_parameters():
     """
@@ -616,8 +653,8 @@ def install_grub(efi_directory, fw_type):
 
     if fw_type == "efi":
         libcalamares.utils.debug("Bootloader: grub (efi)")
-        install_path = libcalamares.globalstorage.value("rootMountPoint")
-        install_efi_directory = install_path + efi_directory
+        installation_root_path = libcalamares.globalstorage.value("rootMountPoint")
+        install_efi_directory = installation_root_path + efi_directory
 
         if not os.path.isdir(install_efi_directory):
             os.makedirs(install_efi_directory)
@@ -668,8 +705,8 @@ def install_secureboot(efi_directory):
     """
     efi_bootloader_id = efi_label(efi_directory)
 
-    install_path = libcalamares.globalstorage.value("rootMountPoint")
-    install_efi_directory = install_path + efi_directory
+    installation_root_path = libcalamares.globalstorage.value("rootMountPoint")
+    install_efi_directory = installation_root_path + efi_directory
 
     if efi_word_size() == "64":
         install_efi_bin = "shimx64.efi"
@@ -761,8 +798,12 @@ def run():
 
     fw_type = libcalamares.globalstorage.value("firmwareType")
 
-    if (libcalamares.globalstorage.value("bootLoader") is None and fw_type != "efi"):
-        libcalamares.utils.warning( "Non-EFI system, and no bootloader is set." )
+    if libcalamares.globalstorage.value("bootLoader") is None:
+        # Don't want a bootloader, but do log that this has an effect:
+        if fw_type != "efi":
+            libcalamares.utils.warning( "Non-EFI system, and no bootloader is set." )
+        else:
+            libcalamares.utils.warning( "EFI system, and no bootloader is set." )
         return None
 
     partitions = libcalamares.globalstorage.value("partitions")
diff --git a/src/modules/contextualprocess/CMakeLists.txt b/src/modules/contextualprocess/CMakeLists.txt
index d7716bbfb..9520515ce 100644
--- a/src/modules/contextualprocess/CMakeLists.txt
+++ b/src/modules/contextualprocess/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-calamares_add_plugin( contextualprocess
+calamares_add_plugin(contextualprocess
     TYPE job
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
@@ -15,7 +15,6 @@ calamares_add_test(
     contextualprocesstest
     SOURCES
         Tests.cpp
-        ContextualProcessJob.cpp  # Builds it a second time
-    LIBRARIES
-        yamlcpp::yamlcpp
+        ContextualProcessJob.cpp # Builds it a second time
+    LIBRARIES yamlcpp::yamlcpp
 )
diff --git a/src/modules/displaymanager/displaymanager.conf b/src/modules/displaymanager/displaymanager.conf
index 0fd2af163..c5c0e0b78 100644
--- a/src/modules/displaymanager/displaymanager.conf
+++ b/src/modules/displaymanager/displaymanager.conf
@@ -22,7 +22,6 @@ displaymanagers:
   - gdm
   - mdm
   - lxdm
-  - kdm
   - greetd
 
 # Enable the following settings to force a desktop environment
diff --git a/src/modules/displaymanager/displaymanager.schema.yaml b/src/modules/displaymanager/displaymanager.schema.yaml
index 89d657a3b..7e4c5f54c 100644
--- a/src/modules/displaymanager/displaymanager.schema.yaml
+++ b/src/modules/displaymanager/displaymanager.schema.yaml
@@ -10,7 +10,7 @@ properties:
         type: array
         items:
             type: string
-            enum: [slim, sddm, lightdm, gdm, mdm, lxdm, kdm, greetd]
+            enum: [slim, sddm, lightdm, gdm, mdm, lxdm, greetd]
         minItems: 1  # Must be non-empty, if present at all
     defaultDesktopEnvironment:
         type: object
diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py
index ab68488ed..2b49a595c 100644
--- a/src/modules/displaymanager/main.py
+++ b/src/modules/displaymanager/main.py
@@ -481,84 +481,6 @@ class DMgdm(DisplayManager):
         pass
 
 
-class DMkdm(DisplayManager):
-    name = "kdm"
-    executable = "kdm"
-
-    def set_autologin(self, username, do_autologin, default_desktop_environment):
-        # Systems with KDM as Desktop Manager
-        kdm_conf_path = os.path.join(
-            self.root_mount_point, "usr/share/config/kdm/kdmrc"
-            )
-        # Check which path is in use: SUSE does something else.
-        # Also double-check the default setting. Pick the first
-        # one that exists in the target.
-        for candidate_kdmrc in (
-            "usr/share/config/kdm/kdmrc",
-            "usr/share/kde4/config/kdm/kdmrc",
-        ):
-            p = os.path.join(self.root_mount_point, candidate_kdmrc)
-            if os.path.exists(p):
-                kdm_conf_path = p
-                break
-        text = []
-
-        if os.path.exists(kdm_conf_path):
-            with open(kdm_conf_path, 'r') as kdm_conf:
-                text = kdm_conf.readlines()
-
-            with open(kdm_conf_path, 'w') as kdm_conf:
-                for line in text:
-                    if 'AutoLoginEnable=' in line:
-                        if do_autologin:
-                            line = 'AutoLoginEnable=true\n'
-                        else:
-                            line = 'AutoLoginEnable=false\n'
-
-                    if do_autologin and 'AutoLoginUser=' in line:
-                        line = "AutoLoginUser={!s}\n".format(username)
-
-                    kdm_conf.write(line)
-        else:
-            return (
-                _("Cannot write KDM configuration file"),
-                _("KDM config file {!s} does not exist").format(kdm_conf_path)
-                )
-
-    def basic_setup(self):
-        if libcalamares.utils.target_env_call(
-                ['getent', 'group', 'kdm']
-                ) != 0:
-            libcalamares.utils.target_env_call(
-                ['groupadd', '-g', '135', 'kdm']
-                )
-
-        if libcalamares.utils.target_env_call(
-                ['getent', 'passwd', 'kdm']
-                ) != 0:
-            libcalamares.utils.target_env_call(
-                ['useradd',
-                    '-u', '135',
-                    '-g', 'kdm',
-                    '-d', '/var/lib/kdm',
-                    '-s', '/bin/false',
-                    '-r',
-                    '-M',
-                    'kdm'
-                    ]
-                )
-
-        libcalamares.utils.target_env_call(
-            ['chown', '-R', '135:135', 'var/lib/kdm']
-            )
-
-    def desktop_environment_setup(self, desktop_environment):
-        pass
-
-    def greeter_setup(self):
-        pass
-
-
 class DMlxdm(DisplayManager):
     name = "lxdm"
     executable = "lxdm"
diff --git a/src/modules/dracutlukscfg/CMakeLists.txt b/src/modules/dracutlukscfg/CMakeLists.txt
index aaa7a8c17..85efccc0c 100644
--- a/src/modules/dracutlukscfg/CMakeLists.txt
+++ b/src/modules/dracutlukscfg/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-calamares_add_plugin( dracutlukscfg
+calamares_add_plugin(dracutlukscfg
     TYPE job
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
diff --git a/src/modules/dummycpp/CMakeLists.txt b/src/modules/dummycpp/CMakeLists.txt
index 2916b4d67..b822a03be 100644
--- a/src/modules/dummycpp/CMakeLists.txt
+++ b/src/modules/dummycpp/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-calamares_add_plugin( dummycpp
+calamares_add_plugin(dummycpp
     TYPE job
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
diff --git a/src/modules/dummypythonqt/dummypythonqt.conf b/src/modules/dummypythonqt/dummypythonqt.conf
deleted file mode 100644
index 6caf9cc18..000000000
--- a/src/modules/dummypythonqt/dummypythonqt.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-# This is a dummy (example) module for PythonQt.
-#
-# The code is the documentation for the configuration file.
----
-syntax: "YAML map of anything"
-example:
-    whats_this: "module-specific configuration"
-    from_where: "dummypythonqt.conf"
-a_list:
-    - "item1"
-    - "item2"
-    - "item3"
-    - "item4"
-a_list_of_maps:
-    - name: "an Item"
-      contents:
-        - "an element"
-        - "another element"
-    - name: "another item"
-      contents:
-        - "not much"
diff --git a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 91d430930..000000000
--- a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Abubakaragoub Y , 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Abubakaragoub Y , 2018\n"
-"Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "اضغط علي!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "QLabel جديد"
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "دميه خطوة PythonQt "
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "دميه عملية PythonQt "
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "هذة دميه عملية خطوة PythonQt. و تقول: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "رسالة حاله دميه عملية خطوة PythonQt"
diff --git a/src/modules/dummypythonqt/lang/as/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/as/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 75d63e46e..000000000
--- a/src/modules/dummypythonqt/lang/as/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Deep Jyoti Choudhury , 2020
-# Wrishiraj Kaushik , 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-19 17:27+0100\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Wrishiraj Kaushik , 2020\n"
-"Language-Team: Assamese (https://www.transifex.com/calamares/teams/20061/as/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: as\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "ইয়াত ক্লিক কৰক!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "এটা নতুন QLabel।"
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "ডামী পাইথন-কিউট্ ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "ডামী পাইথন-কিউট্ কায্য"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "এইটোৱে ডামী পাইথন-কিউট্ কাৰ্য্য। ডামী কাৰ্য্যটোৱে কয় যে: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "ডামী পাইথন-কিউট্ কায্যৰ বাবে এটা অৱস্থা বাৰ্তা।"
diff --git a/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 1807e45d6..000000000
--- a/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# enolp , 2019
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-22 07:09-0500\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: enolp , 2019\n"
-"Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ast\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "¡Cálcame!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Una QLabel nueva."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "ViewStep maniquín en PythonQt"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "El trabayu maniquín en PythonQt"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Esti ye'l trabayu maniquín en PythonQt. El trabayu maniquín diz: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Un mensaxe d'estáu pal trabayu maniquín en PythonQt."
diff --git a/src/modules/dummypythonqt/lang/be/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/be/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index c14151114..000000000
--- a/src/modules/dummypythonqt/lang/be/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Zmicer Turok , 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-10 19:18-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Zmicer Turok , 2018\n"
-"Language-Team: Belarusian (https://www.transifex.com/calamares/teams/20061/be/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: be\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Націсніце сюды! "
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Новы QLabel. "
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Dummy PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "The Dummy PythonQt Job"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Гэта Dummy PythonQt Job. Фіктыўная задача паведамляе: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Паведамленне статусу Dummy PythonQt Job. "
diff --git a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 831105b95..000000000
--- a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Georgi Georgiev , 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Georgi Georgiev , 2018\n"
-"Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Натисни ме!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Нов QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Фиктивен PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Фиктивната задача PythonQt"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Това е фиктивната задача PythonQt. Фиктивната задача заявява: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Съобщение за състоянието на фиктивната задача PythonQt."
diff --git a/src/modules/dummypythonqt/lang/bn/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/bn/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index d2783e5e3..000000000
--- a/src/modules/dummypythonqt/lang/bn/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-30 23:13+0200\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Bengali (https://www.transifex.com/calamares/teams/20061/bn/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bn\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 19f669849..000000000
--- a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Davidmp , 2019
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-10 19:18-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Davidmp , 2019\n"
-"Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Clica'm!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Una etiqueta Q nova."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Vistes de Dummy PythonQt"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "La tasca Dummy PythonQt"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Soc la tasca Dummy PythonQt. La tasca diu el següent: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Un missatge d'estat per a la tasca Dummy PythonQt."
diff --git a/src/modules/dummypythonqt/lang/ca@valencia/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ca@valencia/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index e67e371f3..000000000
--- a/src/modules/dummypythonqt/lang/ca@valencia/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-10 19:18-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Catalan (Valencian) (https://www.transifex.com/calamares/teams/20061/ca@valencia/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ca@valencia\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 44cd1e2d4..000000000
--- a/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# pavelrz, 2017
-# Pavel Borecki , 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-22 07:09-0500\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Pavel Borecki , 2017\n"
-"Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: cs_CZ\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Klikněte na mě!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Nový QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Testovací PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Testovací úloha PythonQt"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Toto je testovací úloha PythonQt. Testovací úloha sděluje: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Stavová zpráva o testovací úloze PythonQt."
diff --git a/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 5a1473add..000000000
--- a/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# scootergrisen, 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: scootergrisen, 2017\n"
-"Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Klik på mig!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "En ny QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Dummy PythonQt-visningstrin"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Dummy PythonQt-jobbet"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Dette er dummy PythonQt-jobbet. Dummy-jobbet siger: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "En statusmeddelelse til dummy PythonQt-job."
diff --git a/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index b0121397f..000000000
--- a/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Christian Spaan, 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Christian Spaan, 2017\n"
-"Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Klick mich!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Ein neues QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Dummy PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Der Dummy-PythonQt-Job"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Dies ist der Dummy-PythonQt-Job. Der Dummy-Job lautet: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Eine Statusmeldung für den Dummy-PythonQt-Job."
diff --git a/src/modules/dummypythonqt/lang/dummypythonqt.pot b/src/modules/dummypythonqt/lang/dummypythonqt.pot
deleted file mode 100644
index f3a9fc325..000000000
--- a/src/modules/dummypythonqt/lang/dummypythonqt.pot
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-17 15:52+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-
-#: src/modules/dummypythonqt/main.py:75
-msgid "Click me!"
-msgstr "Click me!"
-
-#: src/modules/dummypythonqt/main.py:85
-msgid "A new QLabel."
-msgstr "A new QLabel."
-
-#: src/modules/dummypythonqt/main.py:88
-msgid "Dummy PythonQt ViewStep"
-msgstr "Dummy PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:174
-msgid "The Dummy PythonQt Job"
-msgstr "The Dummy PythonQt Job"
-
-#: src/modules/dummypythonqt/main.py:177
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "This is the Dummy PythonQt Job. The dummy job says: {}"
-
-#: src/modules/dummypythonqt/main.py:181
-msgid "A status message for Dummy PythonQt Job."
-msgstr "A status message for Dummy PythonQt Job."
diff --git a/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 316384619..000000000
--- a/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index a0e21be1f..000000000
--- a/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Jason Collins , 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Jason Collins , 2018\n"
-"Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Click me!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "A new QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Dummy PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "The Dummy PythonQt Job"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "This is the Dummy PythonQt Job. The dummy job says: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "A status message for Dummy PythonQt Job."
diff --git a/src/modules/dummypythonqt/lang/eo/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/eo/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index a656d0608..000000000
--- a/src/modules/dummypythonqt/lang/eo/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Kurt Ankh Phoenix , 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Kurt Ankh Phoenix , 2018\n"
-"Language-Team: Esperanto (https://www.transifex.com/calamares/teams/20061/eo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Alklaku min!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Nova QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Formala PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "La Formala PythonQt Laboro"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Ĉi tiu estas la Formala PythonQt Laboro. La formala laboro diras: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Statusa mesaĝo por Formala PythonQt Laboro."
diff --git a/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index b29ba10b3..000000000
--- a/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# strel, 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: strel, 2017\n"
-"Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "¡Púlsame!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Una nueva QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "ViewStep de PythonQt Ficticia"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "La Tarea PythonQt Ficticia"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Esta es la Tarea PythonQt Ficticia. La tarea ficticia dice: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Un mensaje de estado para la Tarea PythonQt Ficticia."
diff --git a/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 6dc2d8278..000000000
--- a/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# guillermo pacheco , 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: guillermo pacheco , 2018\n"
-"Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es_MX\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "¡Haz clic en mí!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Una nueva QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Vision del PythonQt ficticio"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Trabajo del PythonQt ficticio"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Este es el Trabajo PythonQt ficticio. El trabajo ficticio dice: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Un mensaje de estado para el trabajo PythonQt ficticio."
diff --git a/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 1b767f1ad..000000000
--- a/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es_PR\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 4ab56cc0f..000000000
--- a/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Madis Otenurm, 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-06 01:16+0200\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Madis Otenurm, 2018\n"
-"Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Klõpsa mind!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Uus QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Testiv PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Testiv PythonQt Töö"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "See on testiv PythonQt töö. Testiv töö ütleb: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Olekusõnum testivale PythonQt tööle."
diff --git a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index a336c22a0..000000000
--- a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Ander Elortondo, 2019
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Ander Elortondo, 2019\n"
-"Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Egidazu klik!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "QLabel berria."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Dummy PythonQt pauso-ikuspegia"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr " Dummy PythonQt lana"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Hau  Dummy PythonQt lana da. Dummy lanak zera dio: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Dummy PythonQt lanaren egoera mezua."
diff --git a/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 373a4c3e9..000000000
--- a/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Danial Behzadi , 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-30 23:13+0200\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Danial Behzadi , 2020\n"
-"Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "کلیکم کنید!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "یک QLabel جدید."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "گام نمایش PythonQt الکی"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "کار PythonQt الکی"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "این کار PythonQt الکی است. کار الکی می‌گوید: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "پیام وضعیتی برای کار PythonQt الکی."
diff --git a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 1d8526f2a..000000000
--- a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Assalat3 , 2017
-# Kimmo Kujansuu , 2019
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-10 19:18-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Kimmo Kujansuu , 2019\n"
-"Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fi_FI\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Klikkaa minua!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Uusi Qtyönimi."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Näppärä Python Qt-näkymä"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Näppärä Python Qt-työkalu"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Tämä on näppärä Python Qt-työkalu. Näennäinen työ sanoo: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Python Qt-työkalun tilailmoitus."
diff --git a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index fe75d0c55..000000000
--- a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Paul Combal , 2017
-# Aestan , 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Aestan , 2018\n"
-"Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Cliquez-moi!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Un nouveau QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "ViewStep Factice PythonQt"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Tâche Factice PythonQt"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Ceci est la tâche factice PythonQt. La tâche factice dit : {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Un message d'état pour la tâche factice PythonQt."
diff --git a/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 9e8862d54..000000000
--- a/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: French (Switzerland) (https://www.transifex.com/calamares/teams/20061/fr_CH/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr_CH\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index c7917c72b..000000000
--- a/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Xosé, 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Xosé, 2018\n"
-"Language-Team: Galician (https://www.transifex.com/calamares/teams/20061/gl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Prémeme!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Unha QLabel nova."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "ViewStep parvo de PythonQt"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "A tarefa parva de PythonQt"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Esta é a tarefa parva de PythonQt. A tarefa parva di: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Unha mensaxe parva para Dummy PythonQt Job."
diff --git a/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 62b6d5560..000000000
--- a/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Gujarati (https://www.transifex.com/calamares/teams/20061/gu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/he/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/he/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 1d4c544a8..000000000
--- a/src/modules/dummypythonqt/lang/he/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Eli Shleifer , 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Eli Shleifer , 2017\n"
-"Language-Team: Hebrew (https://www.transifex.com/calamares/teams/20061/he/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: he\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "לחץ עליי!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "QLabel חדש."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "שלב הצפייה של משימת הדמה של PythonQt"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "משימת הדמה של PythonQt"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "זוהי משימת הדמה של PythonQt. משימת הדמה אומרת: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "הודעת מצב עבור משימת דמה של PythonQt."
diff --git a/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 4f43a75f8..000000000
--- a/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Panwar108 , 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Panwar108 , 2018\n"
-"Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "यहाँ क्लिक करें!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "नया QLabel।"
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "डमी पाइथन प्रक्रिया की चरण संख्या देखें"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "डमी पाइथन प्रक्रिया"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "यह डमी पाइथन प्रक्रिया है। डमी प्रक्रिया संबंधी संदेश : {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "डमी पाइथन प्रक्रिया की अवस्था संबंधी संदेश।"
diff --git a/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index a6e05ada6..000000000
--- a/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Lovro Kudelić , 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Lovro Kudelić , 2017\n"
-"Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Klikni me!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Novi QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Testni PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Testni PythonQt posao"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Ovo je testni PythonQt posao. Testni posao kaže: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Statusna poruka za testni PythonQt posao."
diff --git a/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index bae97b375..000000000
--- a/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Lajos Pasztor , 2016
-# miku84, 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: miku84, 2017\n"
-"Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Kattints ide!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Egy új QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Hamis PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Egy PythonQt Job teszt"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Ez egy PythonQt Job teszt. A teszt job azt mondja: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Sztátus üzenet egy PythonQt Job-hoz."
diff --git a/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 41a0444c0..000000000
--- a/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Kukuh Syafaat , 2016
-# Wantoyèk , 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-30 23:13+0200\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Wantoyèk , 2017\n"
-"Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Klik saya!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Sebuah QLabel baru."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Dummy PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Dummy PythonQt Job"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Ini adalah Dummy PythonQt Job. Dummy job mengatakan: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Sebuah pesan status untuk Dummy PythonQt Job."
diff --git a/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index ed89dbc18..000000000
--- a/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Kristján Magnússon, 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Kristján Magnússon, 2017\n"
-"Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Smelltu mig!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Nýtt QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Dummy PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Dummy PythonQt Job"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Þetta er Dummy PythonQt Job. Dummy job segir: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Stöðuskilaboð fyrir Dummy PythonQt Job."
diff --git a/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 211f9d9c2..000000000
--- a/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Teo Mrnjavac , 2016
-# Saverio , 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-22 07:09-0500\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Saverio , 2018\n"
-"Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it_IT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Clicca qui!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Una nuova QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "PythonQt ViewStep fittizio"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Il Job Dummy PythonQt"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Questo è il Job Dummy PythonQt. Il dummy job notifica: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Un messaggio di stato per il Job Dummy PythonQt."
diff --git a/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 6ed47ce1b..000000000
--- a/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Takefumi Nagata, 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Takefumi Nagata, 2017\n"
-"Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "クリックしてください!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "新しいQLabel"
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Dummy PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "The Dummy PythonQt Job"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "これはDummy PythonQtジョブです。Dummy ジョブの出力: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "ダミーのPythonQtジョブの状態"
diff --git a/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 1d941e24e..000000000
--- a/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Kazakh (https://www.transifex.com/calamares/teams/20061/kk/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: kk\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/kn/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/kn/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index ff9def1e0..000000000
--- a/src/modules/dummypythonqt/lang/kn/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Kannada (https://www.transifex.com/calamares/teams/20061/kn/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: kn\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/ko/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ko/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index e6dc4af27..000000000
--- a/src/modules/dummypythonqt/lang/ko/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# MarongHappy , 2019
-# 김지현 , 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-19 17:27+0100\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: 김지현 , 2020\n"
-"Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ko\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "여기를 클릭하세요!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "새로운 QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "더미 PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "더미 PythonQt 작업"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "더미 PythonQt 작업입니다. 이 더미 작업의 출력은 다음과 같습니다: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "더미 PythonQt 작업의 상태 메시지"
diff --git a/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 87614dc88..000000000
--- a/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Lao (https://www.transifex.com/calamares/teams/20061/lo/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: lo\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 443ab99d8..000000000
--- a/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Moo, 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Moo, 2017\n"
-"Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
-"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Spustelėkite mane!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Naujas QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Fiktyvi PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Fiktyvi PythonQt užduotis"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Tai yra fiktyvi PythonQt užduotis. Fiktyvi užduotis sako: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Fiktyvios PythonQt užduoties būsenos pranešimas."
diff --git a/src/modules/dummypythonqt/lang/lv/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/lv/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 651fe2fa4..000000000
--- a/src/modules/dummypythonqt/lang/lv/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-30 23:13+0200\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Latvian (https://www.transifex.com/calamares/teams/20061/lv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/mk/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/mk/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 82998bf47..000000000
--- a/src/modules/dummypythonqt/lang/mk/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Martin Ristovski , 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Martin Ristovski , 2018\n"
-"Language-Team: Macedonian (https://www.transifex.com/calamares/teams/20061/mk/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: mk\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Кликни ме!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Нов QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/ml/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ml/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index faf773770..000000000
--- a/src/modules/dummypythonqt/lang/ml/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Balasankar C , 2019
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-15 21:54+0200\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Balasankar C , 2019\n"
-"Language-Team: Malayalam (https://www.transifex.com/calamares/teams/20061/ml/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ml\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "എന്നെ ക്ലിക്ക് ചെയ്യൂ!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "ഒരു പുതിയ QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index eaafadeac..000000000
--- a/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Marathi (https://www.transifex.com/calamares/teams/20061/mr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: mr\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 4bf83c283..000000000
--- a/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Norwegian Bokmål (https://www.transifex.com/calamares/teams/20061/nb/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/ne_NP/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ne_NP/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 37f213df2..000000000
--- a/src/modules/dummypythonqt/lang/ne_NP/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Ghost Hackz , 2019
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-25 08:04-0500\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Ghost Hackz , 2019\n"
-"Language-Team: Nepali (Nepal) (https://www.transifex.com/calamares/teams/20061/ne_NP/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ne_NP\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "यहाँ क्लिक गर्नुहोस्!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "नयाँ QLabel।"
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "डमी पाइथन भ्यूस्टेप"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "डमी पाइथन प्रकृया"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "यो डमी पाइथन प्रकृया हो। डमी प्रकृया सम्बन्धित सन्देश: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "डमी पाइथन प्रकृयाको अवस्था सम्बन्धित सन्देश।"
diff --git a/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 7f17f9973..000000000
--- a/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# De Zeeappel , 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: De Zeeappel , 2017\n"
-"Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Klik mij!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Een nieuw QLabel"
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Dummy PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "De Dummy PythonQt opdracht"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Dit is de Dummy PythonQt opdracht. De opdracht zegt: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Een statusbericht voor de Dummy PythonQt opdracht."
diff --git a/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 8502113bd..000000000
--- a/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Marcin Mikołajczak , 2016
-# Piotr Strębski , 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-10 19:18-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Piotr Strębski , 2017\n"
-"Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Naciśnij mnie!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Nowy QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Podgląd kroków fikcyjnego PythonQt"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Zadanie fikcyjne PythonQt"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "To jest zadanie fikcyjne PythonQt mówiące: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Wiadomość o stanie zadania fikcyjnego PythonQt."
diff --git a/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 4e5391043..000000000
--- a/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Rodrigo de Almeida Sottomaior Macedo , 2017
-# Guilherme, 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-25 23:02+0100\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Guilherme, 2018\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Clique em mim!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Uma nova QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "ViewStep do Modelo PythonQt"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "A Tarefa de Modelo PythonQt"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Esta é a Tarefa Modelo PythonQt. A tarefa modelo diz: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Uma mensagem de status para a Tarefa Modelo PythonQt."
diff --git a/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 952413cfa..000000000
--- a/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Ricardo Simões , 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Ricardo Simões , 2017\n"
-"Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_PT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Clique-me!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Uma nova QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Dummy PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "A Tarefa Dummy PythonQt"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Esta é a tarefa Dummy PythonQt. A tarefa dummy diz: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Uma mensagem de estado para a Tarefa Dummy PythonQt."
diff --git a/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 3ac2bfcba..000000000
--- a/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Baadur Jobava , 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Baadur Jobava , 2018\n"
-"Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Clic aici!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Un nou QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Dummy PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Un job job fictiv PythonQt"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Acesta este jobul fictiv PythonQt. Descrierea jobului: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Un mesaj de stare pentru jobul fictiv PythonQt."
diff --git a/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index cedc4d483..000000000
--- a/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Вадим Сабынич , 2017
-# Simon Schwartz , 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Simon Schwartz , 2017\n"
-"Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Нажать здесь!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Новый QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "The Dummy PythonQt Job"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Сообщение состояния для Dummy PythonQt Job."
diff --git a/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 9c1d60dfd..000000000
--- a/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Dušan Kazik , 2016
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Dušan Kazik , 2016\n"
-"Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Kliknite sem!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Nová menovka QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Fiktívna úloha PythonQt"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Toto je fiktívna úloha PythonQt. Fiktívna úloha hovorí: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Stavová správa pre fiktívnu úlohu PythonQt."
diff --git a/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 178fc694a..000000000
--- a/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Slovenian (https://www.transifex.com/calamares/teams/20061/sl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/sq/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sq/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 6335e9c56..000000000
--- a/src/modules/dummypythonqt/lang/sq/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Besnik Bleta , 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-15 13:39+0200\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Besnik Bleta , 2017\n"
-"Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sq\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Klikomëni!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Një QLabel e re."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Dummy PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Akti PythonQt Dummy"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Ky është Akti PythonQt Dummy. Akti dummy thotë: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Një mesazh gjendjeje nga Akti PythonQt Dummy."
diff --git a/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 6660b1500..000000000
--- a/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Slobodan Simić , 2019
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-18 15:54+0200\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Slobodan Simić , 2019\n"
-"Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Кликни ме!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Нова КуОзнака"
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Провизорни ПитонКуТ корак прегледа"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Провизорни ПитонКуТ посао"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Ово је провизорни ПитонКуТ посао. Он каже: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Порука стања за провизорни ПитонКуТ посао."
diff --git a/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index b3e4fe47b..000000000
--- a/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-22 07:09-0500\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Serbian (Latin) (https://www.transifex.com/calamares/teams/20061/sr@latin/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 192ed25e6..000000000
--- a/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Luna Jernberg , 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-19 00:13+0100\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Luna Jernberg , 2020\n"
-"Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Klicka på mig!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "En ny QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Exempel PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Exempel PythonQt jobb"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Detta är ett exempel PythonQt jobb. Exempel jobbet säger: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Ett statusmeddelande för exempel PythonQt jobb."
diff --git a/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 22d304458..000000000
--- a/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Thai (https://www.transifex.com/calamares/teams/20061/th/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: th\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index fe0f567c5..000000000
--- a/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Demiray Muhterem , 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Demiray Muhterem , 2017\n"
-"Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: tr_TR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Buraya tıkla!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Yeni bir QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Sahte PythonQt görünümü"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Sahte PythonQt işleri"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Kukla PythonQt işleri. Sahte işleri şöyle diyor: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Kukla PythonQt Çalışması için bir durum mesajı."
diff --git a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index bcf3b814a..000000000
--- a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Yuri Chornoivan , 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-19 17:27+0100\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Yuri Chornoivan , 2020\n"
-"Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "Натисни мене!"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "Нова QLabel."
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "Фіктивний ViewStep PythonQt"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "Фіктивне завдання PythonQt"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "Це фіктивне завдання PythonQt. Фіктивне завдання повідомляє: {}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "Повідомлення щодо стану фіктивного завдання PythonQt."
diff --git a/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 54352d479..000000000
--- a/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Urdu (https://www.transifex.com/calamares/teams/20061/ur/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ur\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index 75584e15c..000000000
--- a/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-05 11:34-0400\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Language-Team: Uzbek (https://www.transifex.com/calamares/teams/20061/uz/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: uz\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr ""
diff --git a/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index d7baa50f2..000000000
--- a/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Mingcong Bai , 2017
-# soenggam , 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-22 07:09-0500\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: soenggam , 2018\n"
-"Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "按我按我！"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "一个新的QLabel。"
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "坠吼滴 PythonQt ViewStep"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "PythonQt 任务"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "我是个 PythonQt 任务。任务提示：{}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "来自 PythonQt 任务的状态消息。"
diff --git a/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.po
deleted file mode 100644
index bc2056e1e..000000000
--- a/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# 黃柏諺 , 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-06 01:16+0200\n"
-"PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: 黃柏諺 , 2017\n"
-"Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: src/modules/dummypythonqt/main.py:84
-msgid "Click me!"
-msgstr "點擊我！"
-
-#: src/modules/dummypythonqt/main.py:94
-msgid "A new QLabel."
-msgstr "一個新的 QLabel。"
-
-#: src/modules/dummypythonqt/main.py:97
-msgid "Dummy PythonQt ViewStep"
-msgstr "假的 PythonQt 檢視步驟"
-
-#: src/modules/dummypythonqt/main.py:183
-msgid "The Dummy PythonQt Job"
-msgstr "假的 PythonQt 工作"
-
-#: src/modules/dummypythonqt/main.py:186
-msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "這是一個假的 PythonQt 工作。假工作表示：{}"
-
-#: src/modules/dummypythonqt/main.py:190
-msgid "A status message for Dummy PythonQt Job."
-msgstr "假的 PythonQt 工作的狀態訊息。"
diff --git a/src/modules/dummypythonqt/main.py b/src/modules/dummypythonqt/main.py
deleted file mode 100644
index e33c20e6f..000000000
--- a/src/modules/dummypythonqt/main.py
+++ /dev/null
@@ -1,188 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# === This file is part of Calamares -  ===
-#
-#   SPDX-FileCopyrightText: 2016-2017 Teo Mrnjavac 
-#   SPDX-FileCopyrightText: 2017 Alf Gaida 
-#   SPDX-License-Identifier: GPL-3.0-or-later
-#
-#   Calamares is Free Software: see the License-Identifier above.
-#
-
-import platform
-
-from PythonQt.QtGui import *
-import PythonQt.calamares as calamares
-
-# WARNING: the Calamares PythonQt API is considered EXPERIMENTAL as of
-# Calamares 2.5. It comes with no promise or commitment to API stability.
-
-
-# Set up translations.
-# You may skip this if your Calamares module has no user visible strings.
-# DO NOT install _ into the builtin namespace because each module loads
-# its own catalog.
-# DO use the gettext class-based API and manually alias _ as described in:
-# https://docs.python.org/3.5/library/gettext.html#localizing-your-module
-import gettext
-import inspect
-import os
-_filename = inspect.getframeinfo(inspect.currentframe()).filename
-_path = os.path.dirname(os.path.abspath(_filename))
-
-_ = gettext.gettext
-
-# Example Python ViewModule.
-# A Python ViewModule is a Python program which defines a ViewStep class.
-# One UI module ==> one ViewStep.
-# This class must be marked with the @calamares_module decorator. A
-# ViewModule may define other classes, but only one may be decorated with
-# @calamares_module. Such a class must conform to the Calamares ViewStep
-# interface and functions as the entry point of the module.
-# A ViewStep manages one or more "wizard pages" through methods like
-# back/next, and reports its status through isNextEnabled/isBackEnabled/
-# isAtBeginning/isAtEnd. The whole UI, including all the pages, must be
-# exposed as a single QWidget, returned by the widget function.
-#
-# For convenience, both C++ and PythonQt ViewSteps are considered to be
-# implementations of ViewStep.h. Additionally, the Calamares PythonQt API
-# allows Python developers to keep their identifiers more Pythonic on the
-# Python side. Thus, all of the following are considered valid method
-# identifiers in a ViewStep implementation: isNextEnabled, isnextenabled,
-# is_next_enabled.
-
-
-@calamares_module
-class DummyPythonQtViewStep:
-    def __init__(self):
-        # Importing PythonQt.QtGui provides access to most Qt widget classes.
-        self.main_widget = QFrame()
-
-        self.main_widget.setLayout(QVBoxLayout())
-
-        label = QLabel()
-        self.main_widget.layout().addWidget(label)
-
-        accumulator = "\nCalamares+PythonQt running embedded Python " +\
-                      platform.python_version()
-        label.text = accumulator
-
-        btn = QPushButton()
-
-        # Python strings can be used wherever a method wants a QString. Python
-        # gettext translations can be used seamlessly as well.
-        btn.setText(_("Click me!"))
-        self.main_widget.layout().addWidget(btn)
-
-        # The syntax for signal-slot connections is very simple, though
-        # slightly different from the C++ equivalent. There are no SIGNAL and
-        # SLOT macros, and a signal can be connected to any Python method
-        # (without a special "slot" designation).
-        btn.connect("clicked(bool)", self.on_btn_clicked)
-
-    def on_btn_clicked(self):
-        self.main_widget.layout().addWidget(QLabel(_("A new QLabel.")))
-
-    def prettyName(self):
-        return _("Dummy PythonQt ViewStep")
-
-    def isNextEnabled(self):
-        return True  # The "Next" button should be clickable
-
-    def isBackEnabled(self):
-        return True  # The "Back" button should be clickable
-
-    def isAtBeginning(self):
-        # True means the currently shown UI page is the first page of this
-        # module, thus a "Back" button click will not be handled by this
-        # module and will cause a skip to the previous ViewStep instead
-        # (if any). False means that the present ViewStep provides other UI
-        # pages placed logically "before" the current one, thus a "Back" button
-        # click will be handled by this module instead of skipping to another
-        # ViewStep. A module (ViewStep) with only one page will always return
-        # True here.
-        return True
-
-    def isAtEnd(self):
-        # True means the currently shown UI page is the last page of this
-        # module, thus a "Next" button click will not be handled by this
-        # module and will cause a skip to the next ViewStep instead (if any).
-        # False means that the present ViewStep provides other UI pages placed
-        # logically "after" the current one, thus a "Next" button click will
-        # be handled by this module instead of skipping to another ViewStep.
-        # A module (ViewStep) with only one page will always return True here.
-        return True
-
-    def jobs(self):
-        # Returns a list of objects that implement Calamares::Job.
-        return [DummyPQJob("Dummy PythonQt job reporting for duty")]
-
-    def widget(self):
-        # Returns the base QWidget of this module's UI.
-        return self.main_widget
-
-    def retranslate(self, locale_name):
-        # This is where it gets slightly weird. In most desktop applications we
-        # shouldn't need this kind of mechanism, because we could assume that
-        # the operating environment is configured to use a certain language.
-        # Usually the user would change the system-wide language in a settings
-        # UI, restart the application, done.
-        # Alas, Calamares runs on an unconfigured live system, and one of the
-        # core features of Calamares is to allow the user to pick a language.
-        # Unfortunately, strings in the UI do not automatically react to a
-        # runtime language change. To get UI strings in a new language, all
-        # user-visible strings must be retranslated (by calling tr() in C++ or
-        # _() in Python) and reapplied on the relevant widgets.
-        # When the user picks a new UI translation language, Qt raises a QEvent
-        # of type LanguageChange, which propagates through the QObject
-        # hierarchy. By catching and reacting to this event, we can show
-        # user-visible strings in the new language at the right time.
-        # The C++ side of the Calamares PythonQt API catches the LanguageChange
-        # event and calls the present method. It is then up to the module
-        # developer to add here all the needed code to load the module's
-        # translation catalog for the new language (which is separate from the
-        # main Calamares strings catalog) and reapply any user-visible strings.
-        calamares.utils.debug("PythonQt retranslation event "
-                              "for locale name: {}".format(locale_name))
-
-        # First we load the catalog file for the new language...
-        try:
-            global _
-            _t = gettext.translation('dummypythonqt',
-                                     localedir=os.path.join(_path, 'lang'),
-                                     languages=[locale_name])
-            _ = _t.gettext
-        except OSError as e:
-            calamares.utils.debug(e)
-            pass
-
-        # ... and then we can call setText(_("foo")) and similar methods on
-        # the relevant widgets here to reapply the strings.
-
-# An example Job class. Implements Calamares::Job. For method identifiers, the
-# same rules apply as for ViewStep. No decorators are necessary here, because
-# only the ViewStep implementation is the unique entry point, and a module can
-# have any number of jobs.
-
-
-class DummyPQJob:
-    def __init__(self, my_msg):
-        self.my_msg = my_msg
-
-    def pretty_name(self):
-        return _("The Dummy PythonQt Job")
-
-    def pretty_description(self):
-        return _("This is the Dummy PythonQt Job. "
-                 "The dummy job says: {}").format(self.my_msg)
-
-    def pretty_status_message(self):
-        return _("A status message for Dummy PythonQt Job.")
-
-    def exec(self):
-        # As an example, we touch a file in the target root filesystem.
-        rmp = calamares.global_storage['rootMountPoint']
-        os.system("touch {}/calamares_dpqt_was_here".format(rmp))
-        calamares.utils.debug("the dummy job says {}".format(self.my_msg))
-        return {'ok': True}
diff --git a/src/modules/dummypythonqt/module.desc b/src/modules/dummypythonqt/module.desc
deleted file mode 100644
index a747daeaa..000000000
--- a/src/modules/dummypythonqt/module.desc
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-# Module metadata file for dummy pythonqt jobmodule
-# Syntax is YAML 1.2
----
-type:       "view"
-name:       "dummypythonqt"
-interface:  "pythonqt"
-script:     "main.py"   #assumed relative to the current directory
diff --git a/src/modules/finished/CMakeLists.txt b/src/modules/finished/CMakeLists.txt
index 619f6d8b0..ab435a9eb 100644
--- a/src/modules/finished/CMakeLists.txt
+++ b/src/modules/finished/CMakeLists.txt
@@ -3,11 +3,11 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network )
+find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network)
 
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
+include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
 
-calamares_add_plugin( finished
+calamares_add_plugin(finished
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
diff --git a/src/modules/finishedq/CMakeLists.txt b/src/modules/finishedq/CMakeLists.txt
index facc2d691..2e688c45d 100644
--- a/src/modules/finishedq/CMakeLists.txt
+++ b/src/modules/finishedq/CMakeLists.txt
@@ -3,21 +3,21 @@
 #   SPDX-FileCopyrightText: 2021 Anke Boersma 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-if( NOT WITH_QML )
+if(NOT WITH_QML)
     calamares_skip_module( "finishedq (QML is not supported in this build)" )
     return()
 endif()
 
-find_package( Qt5 ${QT_VERSION} CONFIG COMPONENTS DBus Network )
-if ( NOT TARGET Qt5::DBus OR NOT TARGET Qt5::Network )
+find_package(Qt5 ${QT_VERSION} CONFIG COMPONENTS DBus Network)
+if(NOT TARGET Qt5::DBus OR NOT TARGET Qt5::Network)
     calamares_skip_module( "finishedq (missing DBus or Network)" )
     return()
 endif()
 
-set( _finished ${CMAKE_CURRENT_SOURCE_DIR}/../finished )
-include_directories( ${_finished} )
+set(_finished ${CMAKE_CURRENT_SOURCE_DIR}/../finished)
+include_directories(${_finished})
 
-calamares_add_plugin( finishedq
+calamares_add_plugin(finishedq
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
diff --git a/src/modules/fsresizer/CMakeLists.txt b/src/modules/fsresizer/CMakeLists.txt
index e721d7f6b..189e7c1dc 100644
--- a/src/modules/fsresizer/CMakeLists.txt
+++ b/src/modules/fsresizer/CMakeLists.txt
@@ -3,18 +3,18 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-find_package( KF5Config CONFIG )
-find_package( KF5I18n CONFIG )
-find_package( KF5WidgetsAddons CONFIG )
+find_package(KF5Config CONFIG)
+find_package(KF5I18n CONFIG)
+find_package(KF5WidgetsAddons CONFIG)
 
-include( KPMcoreHelper )
+include(KPMcoreHelper)
 
-if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND )
-    include_directories( ${KPMCORE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src/modules/partition )
+if(KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND)
+    include_directories(${KPMCORE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src/modules/partition)
 
     # The PartitionIterator is a small class, and it's easiest -- but also a
     # gross hack -- to just compile it again from the partition module tree.
-    calamares_add_plugin( fsresizer
+    calamares_add_plugin(fsresizer
         TYPE job
         EXPORT_MACRO PLUGINDLLEXPORT_PRO
         SOURCES
@@ -27,15 +27,14 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND
 
     calamares_add_test(
         fsresizertest
-        SOURCES
-            Tests.cpp
+        SOURCES Tests.cpp
         LIBRARIES
-            calamares_job_fsresizer  # From above
+            calamares_job_fsresizer # From above
             yamlcpp::yamlcpp
         DEFINITIONS ${KPMcore_API_DEFINITIONS}
     )
 else()
-    if ( NOT KPMcore_FOUND )
+    if(NOT KPMcore_FOUND)
         calamares_skip_module( "fsresizer (missing suitable KPMcore)" )
     else()
         calamares_skip_module( "fsresizer (missing dependencies for KPMcore)" )
diff --git a/src/modules/fsresizer/ResizeFSJob.cpp b/src/modules/fsresizer/ResizeFSJob.cpp
index f972b9fa4..562644594 100644
--- a/src/modules/fsresizer/ResizeFSJob.cpp
+++ b/src/modules/fsresizer/ResizeFSJob.cpp
@@ -49,12 +49,8 @@ ResizeFSJob::PartitionMatch
 ResizeFSJob::findPartition()
 {
     using DeviceList = QList< Device* >;
-#if defined( WITH_KPMCORE4API )
     DeviceList devices
         = m_kpmcore.backend()->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag( 0 ) );
-#else
-    DeviceList devices = m_kpmcore.backend()->scanDevices( /* excludeReadOnly */ true );
-#endif
 
     cDebug() << "ResizeFSJob found" << devices.count() << "devices.";
     for ( DeviceList::iterator dev_it = devices.begin(); dev_it != devices.end(); ++dev_it )
diff --git a/src/modules/fstab/fstab.conf b/src/modules/fstab/fstab.conf
index be43db99a..6965493a6 100644
--- a/src/modules/fstab/fstab.conf
+++ b/src/modules/fstab/fstab.conf
@@ -5,8 +5,7 @@
 # Also creates mount points for all the filesystems.
 #
 # When creating fstab entries for a filesystem, this module
-# uses the options for the filesystem type to write to the
-# options field of the file.
+# uses the options previously defined in the mount module
 ---
 # Mount options to use for all filesystems. If a specific filesystem
 # is listed here, use those options, otherwise use the *default*
diff --git a/src/modules/fstab/fstab.schema.yaml b/src/modules/fstab/fstab.schema.yaml
index f70d22c42..62d55c180 100644
--- a/src/modules/fstab/fstab.schema.yaml
+++ b/src/modules/fstab/fstab.schema.yaml
@@ -10,9 +10,9 @@ properties:
         type: object
         additionalProperties: true  # we don't know which FS exist
         properties:
-            default: { type: string }
+            "default": { type: string }
             btrfs: { type: string }
-        required: [ default ]
+        required: [ "default" ]
     ssdExtraMountOptions:
         type: object
         additionalProperties: true  # we don't know which FS exist
@@ -29,18 +29,19 @@ properties:
         type: object
         additionalProperties: false
         properties:
-            default:
+            "default":
                 type: object
                 additionalProperties: false
                 properties:
-                    tmpfs: { type: bool }
+                    tmpfs: { type: boolean }
                     options: { type: string }
             ssd:
                 type: object
                 additionalProperties: false
                 properties:
-                    tmpfs: { type: bool }
+                    tmpfs: { type: boolean }
                     options: { type: string }
+        required: [ "default" ]
 required:
     - mountOptions
-    - tmpOptions: default
+    - tmpOptions
diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py
index fc0649e2a..97e7e7486 100755
--- a/src/modules/fstab/main.py
+++ b/src/modules/fstab/main.py
@@ -99,21 +99,11 @@ def disk_name_for_partition(partition):
 
 
 class FstabGenerator(object):
-    """ Class header
-
-    :param partitions:
-    :param root_mount_point:
-    :param mount_options:
-    :param ssd_extra_mount_options:
-    :param crypttab_options:
-    :param tmp_options:
-    """
-    def __init__(self, partitions, root_mount_point, mount_options,
-                 ssd_extra_mount_options, crypttab_options, tmp_options):
+    def __init__(self, partitions, root_mount_point, mount_options_list,
+                 crypttab_options, tmp_options):
         self.partitions = partitions
         self.root_mount_point = root_mount_point
-        self.mount_options = mount_options
-        self.ssd_extra_mount_options = ssd_extra_mount_options
+        self.mount_options_list = mount_options_list
         self.crypttab_options = crypttab_options
         self.tmp_options = tmp_options
         self.ssd_disks = set()
@@ -268,17 +258,7 @@ class FstabGenerator(object):
             libcalamares.utils.debug("Ignoring foreign swap {!s} {!s}".format(disk_name, partition.get("uuid", None)))
             return None
 
-        # If this is btrfs subvol a dedicated to a swapfile, use different options than a normal btrfs subvol
-        if filesystem == "btrfs" and partition.get("subvol", None) == "/@swap":
-            options = self.get_mount_options("btrfs_swap", mount_point)
-        else:
-            options = self.get_mount_options(filesystem, mount_point)
-
-        if is_ssd:
-            extra = self.ssd_extra_mount_options.get(filesystem)
-
-            if extra:
-                options += "," + extra
+        options = self.get_mount_options(mount_point)
 
         if mount_point == "/" and filesystem != "btrfs":
             check = 1
@@ -330,15 +310,18 @@ class FstabGenerator(object):
             if partition["mountPoint"]:
                 mkdir_p(self.root_mount_point + partition["mountPoint"])
 
-    def get_mount_options(self, filesystem, mount_point):
-        efiMountPoint = libcalamares.globalstorage.value("efiSystemPartition")
-        job_config = libcalamares.job.configuration
+    def get_mount_options(self, mountpoint):
+        """
+        Returns the mount options for a given mountpoint
 
-        if (mount_point == efiMountPoint and "efiMountOptions" in job_config):
-            return job_config["efiMountOptions"]
-
-        return self.mount_options.get(filesystem,
-                                      self.mount_options["default"])
+        :param mountpoint: A string containing the mountpoint for the fstab entry
+        :return: A string containing the mount options for the entry or "defaults" if nothing is found
+        """
+        mount_options_item = next((x for x in self.mount_options_list if x.get("mountpoint") == mountpoint), None)
+        if mount_options_item:
+            return mount_options_item.get("option_string", "defaults")
+        else:
+            return "defaults"
 
 
 def create_swapfile(root_mount_point, root_btrfs):
@@ -417,22 +400,21 @@ def run():
             swap_choice = None
 
     libcalamares.job.setprogress(0.1)
-    mount_options = conf.get("mountOptions", {})
-    ssd_extra_mount_options = conf.get("ssdExtraMountOptions", {})
+    mount_options_list = global_storage.value("mountOptionsList")
     crypttab_options = conf.get("crypttabOptions", "luks")
     tmp_options = conf.get("tmpOptions", {})
 
     # We rely on mount_options having a default; if there wasn't one,
     # bail out with a meaningful error.
-    if not mount_options:
+    if not mount_options_list:
+        libcalamares.utils.warning("No mount options defined, {!s} partitions".format(len(partitions)))
         return (_("Configuration Error"),
                 _("No 
{!s}
 configuration is given for 
{!s}
 to use.")
                 .format("mountOptions", "fstab"))
 
     generator = FstabGenerator(partitions,
                                root_mount_point,
-                               mount_options,
-                               ssd_extra_mount_options,
+                               mount_options_list,
                                crypttab_options,
                                tmp_options)
 
diff --git a/src/modules/grubcfg/grubcfg.conf b/src/modules/grubcfg/grubcfg.conf
index afc5e89b8..2d58e5dc2 100644
--- a/src/modules/grubcfg/grubcfg.conf
+++ b/src/modules/grubcfg/grubcfg.conf
@@ -9,7 +9,7 @@
 #
 # Calculated values are:
 #   - GRUB_DISTRIBUTOR,   branding module, *bootloaderEntryName* (this
-#     string is sanitized, and see also setting *keepDistributor*)
+#     string is sanitized, and see also setting *keep_distributor*)
 #   - GRUB_ENABLE_CRYPTODISK, based on the presence of filesystems
 #     that use LUKS
 #   - GRUB_CMDLINE_LINUX_DEFAULT, adding LUKS setup and plymouth
@@ -29,9 +29,7 @@ prefer_grub_d: false
 # kept, not updated to the *bootloaderEntryName* from the branding file.
 # Use this if the GRUB_DISTRIBUTOR setting in the file is "smart" in
 # some way (e.g. uses shell-command substitution).
-#
-# TODO:3.3:snake-case this key
-keepDistributor: false
+keep_distributor: false
 
 # The default kernel params that should always be applied.
 # This is an array of strings. If it is unset, the default is
diff --git a/src/modules/grubcfg/grubcfg.schema.yaml b/src/modules/grubcfg/grubcfg.schema.yaml
index 35d63c063..f10b03a83 100644
--- a/src/modules/grubcfg/grubcfg.schema.yaml
+++ b/src/modules/grubcfg/grubcfg.schema.yaml
@@ -7,8 +7,7 @@ additionalProperties: false
 type: object
 properties:
     overwrite: { type: boolean, default: false }
-    # TODO:3.3:snake-case this key
-    keepDistributor: { type: boolean, default: false }
+    keep_istributor: { type: boolean, default: false }
     prefer_grub_d: { type: boolean, default: false }
     kernel_params: { type: array, items: { type: string } }
     defaults:
diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py
index 45018642c..623ccf472 100644
--- a/src/modules/grubcfg/main.py
+++ b/src/modules/grubcfg/main.py
@@ -48,8 +48,12 @@ def get_grub_config_path(root_mount_point):
     if not os.path.exists(default_dir):
         try:
             os.mkdir(default_dir)
-        except:
-            libcalamares.utils.debug("Failed to create '%r'" % default_dir)
+        except Exception as error:
+            # exception as error is still redundant, but it print out the error
+            # identify a solution for each exception and
+            # if possible and code it within.
+            libcalamares.utils.debug(f"Failed to create {default_dir}")
+            libcalamares.utils.debug(f"{error}")
             raise
 
     return os.path.join(default_dir, default_config_file)
@@ -91,10 +95,10 @@ def modify_grub_default(partitions, root_mount_point, distributor):
     :param root_mount_point:
     :param distributor: name of the distributor to fill in for
         GRUB_DISTRIBUTOR. Must be a string. If the job setting
-        *keepDistributor* is set, then this is only used if no
-        GRUB_DISTRIBUTOR is found at all (otherwise, when *keepDistributor*
+        *keep_distributor* is set, then this is only used if no
+        GRUB_DISTRIBUTOR is found at all (otherwise, when *keep_distributor*
         is set, the GRUB_DISTRIBUTOR lines are left unchanged).
-        If *keepDistributor* is unset or false, then GRUB_DISTRIBUTOR
+        If *keep_distributor* is unset or false, then GRUB_DISTRIBUTOR
         is always updated to set this value.
     :return:
     """
@@ -141,14 +145,12 @@ def modify_grub_default(partitions, root_mount_point, distributor):
             if partition["fs"] == "linuxswap" and not has_luks:
                 swap_uuid = partition["uuid"]
 
-            if (partition["fs"] == "linuxswap" and has_luks):
+            if partition["fs"] == "linuxswap" and has_luks:
                 swap_outer_uuid = partition["luksUuid"]
                 swap_outer_mappername = partition["luksMapperName"]
 
-            if (partition["mountPoint"] == "/" and has_luks):
-                cryptdevice_params = [
-                    "rd.luks.uuid={!s}".format(partition["luksUuid"])
-                    ]
+            if partition["mountPoint"] == "/" and has_luks:
+                cryptdevice_params = [f"rd.luks.uuid={partition['luksUuid']}"]
     else:
         for partition in partitions:
             if partition["fs"] == "linuxswap" and not partition.get("claimed", None):
@@ -158,17 +160,13 @@ def modify_grub_default(partitions, root_mount_point, distributor):
             if partition["fs"] == "linuxswap" and not has_luks:
                 swap_uuid = partition["uuid"]
 
-            if (partition["fs"] == "linuxswap" and has_luks):
+            if partition["fs"] == "linuxswap" and has_luks:
                 swap_outer_mappername = partition["luksMapperName"]
 
-            if (partition["mountPoint"] == "/" and has_luks):
+            if partition["mountPoint"] == "/" and has_luks:
                 cryptdevice_params = [
-                    "cryptdevice=UUID={!s}:{!s}".format(
-                        partition["luksUuid"], partition["luksMapperName"]
-                        ),
-                    "root=/dev/mapper/{!s}".format(
-                        partition["luksMapperName"]
-                        )
+                    f"cryptdevice=UUID={partition['luksUuid']}:{partition['luksMapperName']}",
+                    f"root=/dev/mapper/{partition['luksMapperName']}"
                 ]
 
             if partition["fs"] == "zfs" and partition["mountPoint"] == "/":
@@ -192,33 +190,28 @@ def modify_grub_default(partitions, root_mount_point, distributor):
         kernel_params.append(set_security)
 
     if swap_uuid:
-        kernel_params.append("resume=UUID={!s}".format(swap_uuid))
+        kernel_params.append(f"resume=UUID={swap_uuid}")
 
     if have_dracut and swap_outer_uuid:
-        kernel_params.append("rd.luks.uuid={!s}".format(swap_outer_uuid))
+        kernel_params.append(f"rd.luks.uuid={swap_outer_uuid}")
     if swap_outer_mappername:
-        kernel_params.append("resume=/dev/mapper/{!s}".format(
-            swap_outer_mappername))
-
-    distributor_line = "GRUB_DISTRIBUTOR='{!s}'".format(distributor_replace)
-
-    have_kernel_cmd = False
-    have_distributor_line = False
+        kernel_params.append(f"resume=/dev/mapper/{swap_outer_mappername}")
 
     if "overwrite" in libcalamares.job.configuration:
         overwrite = libcalamares.job.configuration["overwrite"]
     else:
         overwrite = False
 
+    distributor_line = f"GRUB_DISTRIBUTOR='{distributor_replace}'"
+    kernel_cmd = f'GRUB_CMDLINE_LINUX_DEFAULT="{" ".join(kernel_params)}"'
+    have_kernel_cmd = False
+    have_distributor_line = False
     if os.path.exists(default_grub) and not overwrite:
         with open(default_grub, 'r') as grub_file:
             lines = [x.strip() for x in grub_file.readlines()]
 
         for i in range(len(lines)):
             if lines[i].startswith("#GRUB_CMDLINE_LINUX_DEFAULT"):
-                kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(
-                    " ".join(kernel_params)
-                    )
                 lines[i] = kernel_cmd
                 have_kernel_cmd = True
             elif lines[i].startswith("GRUB_CMDLINE_LINUX_DEFAULT"):
@@ -240,18 +233,15 @@ def modify_grub_default(partitions, root_mount_point, distributor):
                             "quiet", "resume", "splash"]:
                         kernel_params.append(existing_param)
 
-                kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(
-                    " ".join(kernel_params)
-                    )
                 lines[i] = kernel_cmd
                 have_kernel_cmd = True
             elif (lines[i].startswith("#GRUB_DISTRIBUTOR")
                   or lines[i].startswith("GRUB_DISTRIBUTOR")):
-                if libcalamares.job.configuration.get("keepDistributor", False):
+                if libcalamares.job.configuration.get("keep_distributor", False):
                     lines[i] = distributor_line
                     have_distributor_line = True
                 else:
-                    # We're not updating because of *keepDistributor*, but if
+                    # We're not updating because of *keep_distributor*, but if
                     # this was a comment line, then it's still not been set.
                     have_distributor_line = have_distributor_line or not lines[i].startswith("#")
             # If btrfs or f2fs is used, don't save default
@@ -271,12 +261,9 @@ def modify_grub_default(partitions, root_mount_point, distributor):
                 else:
                     escaped_value = str(value).replace("'", "'\\''")
 
-                lines.append("{!s}='{!s}'".format(key, escaped_value))
+                lines.append(f"{key}='{escaped_value}'")
 
     if not have_kernel_cmd:
-        kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(
-            " ".join(kernel_params)
-            )
         lines.append(kernel_cmd)
 
     if not have_distributor_line:
@@ -297,28 +284,23 @@ def run():
 
     :return:
     """
-
     fw_type = libcalamares.globalstorage.value("firmwareType")
-
-    if (libcalamares.globalstorage.value("bootLoader") is None
-            and fw_type != "efi"):
-        return None
-
     partitions = libcalamares.globalstorage.value("partitions")
+    root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
+    branding = libcalamares.globalstorage.value("branding")
+    distributor = branding["bootloaderEntryName"]
+
+    if libcalamares.globalstorage.value("bootLoader") is None and fw_type != "efi":
+        return None
 
     if fw_type == "efi":
         esp_found = False
 
         for partition in partitions:
-            if (partition["mountPoint"]
-                    == libcalamares.globalstorage.value("efiSystemPartition")):
+            if partition["mountPoint"] == libcalamares.globalstorage.value("efiSystemPartition"):
                 esp_found = True
 
         if not esp_found:
             return None
 
-    root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
-    branding = libcalamares.globalstorage.value("branding")
-    distributor = branding["bootloaderEntryName"]
-
     return modify_grub_default(partitions, root_mount_point, distributor)
diff --git a/src/modules/grubcfg/tests/2.job b/src/modules/grubcfg/tests/2.job
index 92e598394..5265ef5c8 100644
--- a/src/modules/grubcfg/tests/2.job
+++ b/src/modules/grubcfg/tests/2.job
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: CC0-1.0
 ---
 overwrite: true
-keepDistributor: false
+keep_distributor: false
 defaults:
     GRUB_TIMEOUT: 5
     GRUB_DEFAULT: "saved"
diff --git a/src/modules/grubcfg/tests/3.job b/src/modules/grubcfg/tests/3.job
index 7d579839c..94f394373 100644
--- a/src/modules/grubcfg/tests/3.job
+++ b/src/modules/grubcfg/tests/3.job
@@ -3,7 +3,7 @@
 ---
 overwrite: true
 prefer_grub_d: true  # But it doesn't exist
-keepDistributor: false
+keep_distributor: false
 defaults:
     GRUB_TIMEOUT: 5
     GRUB_DEFAULT: "saved"
diff --git a/src/modules/grubcfg/tests/4.job b/src/modules/grubcfg/tests/4.job
index 58fd8bcb7..4fdc2e25c 100644
--- a/src/modules/grubcfg/tests/4.job
+++ b/src/modules/grubcfg/tests/4.job
@@ -3,7 +3,7 @@
 ---
 overwrite: true
 prefer_grub_d: true
-keepDistributor: false
+keep_distributor: false
 defaults:
     GRUB_TIMEOUT: 5
     GRUB_DEFAULT: "saved"
diff --git a/src/modules/grubcfg/tests/CMakeTests.txt b/src/modules/grubcfg/tests/CMakeTests.txt
index 54a0721e4..7ecfffceb 100644
--- a/src/modules/grubcfg/tests/CMakeTests.txt
+++ b/src/modules/grubcfg/tests/CMakeTests.txt
@@ -8,12 +8,10 @@
 
 add_test(
     NAME make-grubcfg-dirs
-    COMMAND ${CMAKE_COMMAND} -E make_directory
-        /tmp/calamares/grubcfg-test-2/etc/default
-        /tmp/calamares/grubcfg-test-3/etc/default
-        /tmp/calamares/grubcfg-test-4/etc/default/grub.d
-    )
+    COMMAND
+        ${CMAKE_COMMAND} -E make_directory /tmp/calamares/grubcfg-test-2/etc/default
+        /tmp/calamares/grubcfg-test-3/etc/default /tmp/calamares/grubcfg-test-4/etc/default/grub.d
+)
 set_tests_properties(load-grubcfg-2 PROPERTIES DEPENDS make-grubcfg-dirs)
 set_tests_properties(load-grubcfg-3 PROPERTIES DEPENDS make-grubcfg-dirs)
 set_tests_properties(load-grubcfg-4 PROPERTIES DEPENDS make-grubcfg-dirs)
-
diff --git a/src/modules/hostinfo/CMakeLists.txt b/src/modules/hostinfo/CMakeLists.txt
index 55be66f81..af1b3ff45 100644
--- a/src/modules/hostinfo/CMakeLists.txt
+++ b/src/modules/hostinfo/CMakeLists.txt
@@ -23,7 +23,7 @@
 #   - *hostCPU* the make (brand) of the CPU, if it can be determined.
 #       Values are "Intel" or "AMD" or blank.
 
-calamares_add_plugin( hostinfo
+calamares_add_plugin(hostinfo
     TYPE job
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
@@ -32,15 +32,9 @@ calamares_add_plugin( hostinfo
     NO_CONFIG
 )
 
-if ( KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58 )
-    target_compile_definitions( calamares_job_hostinfo PRIVATE WITH_KOSRelease )
+if(KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58)
+    target_compile_definitions(calamares_job_hostinfo PRIVATE WITH_KOSRelease)
+    target_link_libraries(calamares_job_hostinfo PRIVATE KF5::CoreAddons)
 endif()
 
-calamares_add_test(
-    hostinfotest
-    SOURCES
-        Tests.cpp
-        HostInfoJob.cpp
-    LIBRARIES
-        yamlcpp::yamlcpp
-)
+calamares_add_test(hostinfotest SOURCES Tests.cpp HostInfoJob.cpp LIBRARIES yamlcpp::yamlcpp)
diff --git a/src/modules/initcpio/CMakeLists.txt b/src/modules/initcpio/CMakeLists.txt
index 48fd09371..1bbb9fdd9 100644
--- a/src/modules/initcpio/CMakeLists.txt
+++ b/src/modules/initcpio/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-calamares_add_plugin( initcpio
+calamares_add_plugin(initcpio
     TYPE job
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
@@ -13,8 +13,7 @@ calamares_add_plugin( initcpio
 
 calamares_add_test(
     initcpiotest
-    SOURCES
-        Tests.cpp
+    SOURCES Tests.cpp
     LIBRARIES
         calamares_job_initcpio # From above
         yamlcpp::yamlcpp
diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index 1fd4af714..744287cf6 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -11,7 +11,6 @@
 #
 #   Calamares is Free Software: see the License-Identifier above.
 #
-
 import libcalamares
 from libcalamares.utils import debug, target_env_call
 import os
@@ -102,7 +101,7 @@ def get_host_initcpio():
         with open(hostfile, "r") as mkinitcpio_file:
             mklins = [x.strip() for x in mkinitcpio_file.readlines()]
     except FileNotFoundError:
-        libcalamares.utils.debug("Could not open host file '%s'" % hostfile)
+        libcalamares.utils.debug(f"Could not open host file {hostfile}")
         mklins = []
 
     return mklins
@@ -125,11 +124,11 @@ def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
             # Replace HOOKS, MODULES and FILES lines with what we
             # have found via find_initcpio_features()
             if line.startswith("HOOKS"):
-                line = "HOOKS=\"{!s}\"".format(' '.join(hooks))
+                line = 'HOOKS="{!s}"'.format(' '.join(hooks))
             elif line.startswith("MODULES"):
-                line = "MODULES=\"{!s}\"".format(' '.join(modules))
+                line = 'MODULES="{!s}"'.format(' '.join(modules))
             elif line.startswith("FILES"):
-                line = "FILES=\"{!s}\"".format(' '.join(files))
+                line = 'FILES="{!s}"'.format(' '.join(files))
             mkinitcpio_file.write(line + "\n")
 
 
@@ -144,7 +143,16 @@ def find_initcpio_features(partitions, root_mount_point):
 
     :return 3-tuple of lists
     """
-    hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard", "keymap", "consolefont"]
+    hooks = [
+        "base",
+        "udev",
+        "autodetect",
+        "modconf",
+        "block",
+        "keyboard",
+        "keymap",
+        "consolefont",
+    ]
     modules = []
     files = []
 
@@ -168,6 +176,8 @@ def find_initcpio_features(partitions, root_mount_point):
              hooks.append("bootsplash-{!s}".format(bootsplash_theme))
 
     for partition in partitions:
+        hooks.extend(["filesystems"])
+
         if partition["fs"] == "linuxswap" and not partition.get("claimed", None):
             # Skip foreign swap
             continue
@@ -201,11 +211,12 @@ def find_initcpio_features(partitions, root_mount_point):
             hooks.append("plymouth-encrypt")
         else:
             hooks.append("encrypt")
+        crypto_file = "crypto_keyfile.bin"
         if not unencrypted_separate_boot and \
            os.path.isfile(
-               os.path.join(root_mount_point, "crypto_keyfile.bin")
+               os.path.join(root_mount_point, crypto_file)
                ):
-            files.append("/crypto_keyfile.bin")
+            files.append(f"/{crypto_file}")
 
     if uses_lvm2:
         hooks.append("lvm2")
@@ -214,11 +225,9 @@ def find_initcpio_features(partitions, root_mount_point):
         hooks.append("zfs")
 
     if swap_uuid != "":
+        hooks.extend(["resume"])
         if encrypt_hook and openswap_hook:
             hooks.extend(["openswap"])
-        hooks.extend(["resume", "filesystems"])
-    else:
-        hooks.extend(["filesystems"])
 
     if uses_btrfs:
         modules.append("crc32c-intel" if cpuinfo().is_intel else "crc32c")
@@ -230,7 +239,7 @@ def find_initcpio_features(partitions, root_mount_point):
 
 def run():
     """
-    Calls routine with given parameters to modify '/etc/mkinitcpio.conf'.
+    Calls routine with given parameters to modify "/etc/mkinitcpio.conf".
 
     :return:
     """
@@ -238,13 +247,13 @@ def run():
     root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
 
     if not partitions:
-        libcalamares.utils.warning("partitions is empty, {!s}".format(partitions))
+        libcalamares.utils.warning(f"partitions are empty, {partitions}")
         return (_("Configuration Error"),
-                _("No partitions are defined for 
{!s}
 to use." ).format("initcpiocfg"))
+                _("No partitions are defined for 
initcpiocfg
."))
     if not root_mount_point:
-        libcalamares.utils.warning("rootMountPoint is empty, {!s}".format(root_mount_point))
+        libcalamares.utils.warning(f"rootMountPoint is empty, {root_mount_point}")
         return (_("Configuration Error"),
-                _("No root mount point is given for 
{!s}
 to use." ).format("initcpiocfg"))
+                _("No root mount point for 
initcpiocfg
."))
 
     hooks, modules, files = find_initcpio_features(partitions, root_mount_point)
     write_mkinitcpio_lines(hooks, modules, files, root_mount_point)
diff --git a/src/modules/initramfs/CMakeLists.txt b/src/modules/initramfs/CMakeLists.txt
index 2dec41cba..45f29c387 100644
--- a/src/modules/initramfs/CMakeLists.txt
+++ b/src/modules/initramfs/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-calamares_add_plugin( initramfs
+calamares_add_plugin(initramfs
     TYPE job
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
@@ -13,8 +13,7 @@ calamares_add_plugin( initramfs
 
 calamares_add_test(
     initramfstest
-    SOURCES
-        Tests.cpp
+    SOURCES Tests.cpp
     LIBRARIES
         calamares_job_initramfs # From above
         yamlcpp::yamlcpp
diff --git a/src/modules/interactiveterminal/CMakeLists.txt b/src/modules/interactiveterminal/CMakeLists.txt
index 20aee8257..8ade23dbd 100644
--- a/src/modules/interactiveterminal/CMakeLists.txt
+++ b/src/modules/interactiveterminal/CMakeLists.txt
@@ -5,21 +5,15 @@
 #
 find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
 
-set( kf5_ver 5.41 )
+set(kf5_ver 5.41)
 
-find_package( KF5Service ${kf5_ver} )
-find_package( KF5Parts ${kf5_ver} )
-set_package_properties(
-    KF5Service PROPERTIES
-    PURPOSE "For finding KDE services at runtime"
-)
-set_package_properties(
-    KF5Parts PROPERTIES
-    PURPOSE "For finding KDE parts at runtime"
-)
+find_package(KF5Service ${kf5_ver})
+find_package(KF5Parts ${kf5_ver})
+set_package_properties(KF5Service PROPERTIES PURPOSE "For finding KDE services at runtime")
+set_package_properties(KF5Parts PROPERTIES PURPOSE "For finding KDE parts at runtime")
 
-if ( KF5Parts_FOUND AND KF5Service_FOUND )
-    calamares_add_plugin( interactiveterminal
+if(KF5Parts_FOUND AND KF5Service_FOUND)
+    calamares_add_plugin(interactiveterminal
         TYPE viewmodule
         EXPORT_MACRO PLUGINDLLEXPORT_PRO
         SOURCES
diff --git a/src/modules/keyboard/CMakeLists.txt b/src/modules/keyboard/CMakeLists.txt
index fe341cef0..a2e09dc41 100644
--- a/src/modules/keyboard/CMakeLists.txt
+++ b/src/modules/keyboard/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-calamares_add_plugin( keyboard
+calamares_add_plugin(keyboard
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
@@ -21,11 +21,4 @@ calamares_add_plugin( keyboard
     SHARED_LIB
 )
 
-calamares_add_test(
-    keyboardtest
-    SOURCES
-        Tests.cpp
-        SetKeyboardLayoutJob.cpp
-    RESOURCES
-        keyboard.qrc
-)
+calamares_add_test(keyboardtest SOURCES Tests.cpp SetKeyboardLayoutJob.cpp RESOURCES keyboard.qrc)
diff --git a/src/modules/keyboardq/CMakeLists.txt b/src/modules/keyboardq/CMakeLists.txt
index 2b0577aa7..9c7922d86 100644
--- a/src/modules/keyboardq/CMakeLists.txt
+++ b/src/modules/keyboardq/CMakeLists.txt
@@ -3,16 +3,16 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-if( NOT WITH_QML )
+if(NOT WITH_QML)
     calamares_skip_module( "keyboardq (QML is not supported in this build)" )
     return()
 endif()
 
-set( _keyboard ${CMAKE_CURRENT_SOURCE_DIR}/../keyboard )
+set(_keyboard ${CMAKE_CURRENT_SOURCE_DIR}/../keyboard)
 
-include_directories( ${_keyboard} )
+include_directories(${_keyboard})
 
-calamares_add_plugin( keyboardq
+calamares_add_plugin(keyboardq
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
diff --git a/src/modules/keyboardq/keyboardq.qrc b/src/modules/keyboardq/keyboardq.qrc
index d2473a8ec..6fd2a317b 100644
--- a/src/modules/keyboardq/keyboardq.qrc
+++ b/src/modules/keyboardq/keyboardq.qrc
@@ -2,7 +2,27 @@
     
         ../keyboard/kbd-model-map
         ../keyboard/images/restore.png
-        keyboardq.qml
         ../keyboard/non-ascii-layouts
+        keyboardq.qml
+        data/Keyboard.qml
+        data/Key.qml
+        data/backspace.svg
+        data/enter.svg
+        data/shift.svg
+        data/afgani.xml
+        data/ar.xml
+        data/de.xml
+        data/en.xml
+        data/empty.xml
+        data/es.xml
+        data/fr.xml
+        data/generic_qz.xml
+        data/generic.xml
+        data/pt.xml
+        data/ru.xml
+        data/scan.xml
+        data/button_bkg_center.png
+        data/button_bkg_left.png
+        data/button_bkg_right.png
     
 
diff --git a/src/modules/license/CMakeLists.txt b/src/modules/license/CMakeLists.txt
index 0cd838799..d214d6ca7 100644
--- a/src/modules/license/CMakeLists.txt
+++ b/src/modules/license/CMakeLists.txt
@@ -3,9 +3,9 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
+include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
 
-calamares_add_plugin( license
+calamares_add_plugin(license
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
diff --git a/src/modules/license/LicensePage.cpp b/src/modules/license/LicensePage.cpp
index 8700aad60..eb609b2da 100644
--- a/src/modules/license/LicensePage.cpp
+++ b/src/modules/license/LicensePage.cpp
@@ -98,7 +98,12 @@ LicensePage::LicensePage( QWidget* parent )
     CalamaresUtils::unmarginLayout( ui->verticalLayout );
 
     ui->acceptFrame->setStyleSheet( mustAccept );
-    ui->acceptFrame->layout()->setMargin( CalamaresUtils::defaultFontHeight() / 2 );
+    {
+        // The inner frame was unmargined (above), reinstate margins so all are
+        // the same *x* (an x-height, approximately).
+        const auto x = CalamaresUtils::defaultFontHeight() / 2;
+        ui->acceptFrame->layout()->setContentsMargins( x, x, x, x );
+    }
 
     updateGlobalStorage( false );  // Have not agreed yet
 
@@ -110,7 +115,11 @@ LicensePage::LicensePage( QWidget* parent )
 void
 LicensePage::setEntries( const QList< LicenseEntry >& entriesList )
 {
-    CalamaresUtils::clearLayout( ui->licenseEntriesLayout );
+    for ( QWidget* w : m_entries )
+    {
+        ui->licenseEntriesLayout->removeWidget( w );
+        w->deleteLater();
+    }
 
     m_allLicensesOptional = true;
 
@@ -123,7 +132,6 @@ LicensePage::setEntries( const QList< LicenseEntry >& entriesList )
         m_entries.append( w );
         m_allLicensesOptional &= !entry.isRequired();
     }
-    ui->licenseEntriesLayout->addSpacerItem( new QSpacerItem( 10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
 
     ui->acceptCheckBox->setChecked( false );
     checkAcceptance( false );
diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt
index 272dea3de..bad6042a6 100644
--- a/src/modules/locale/CMakeLists.txt
+++ b/src/modules/locale/CMakeLists.txt
@@ -7,14 +7,14 @@
 # When debugging the timezone widget, add this debugging definition
 # to have a debugging-friendly timezone widget, debug logging,
 # and no intrusive timezone-setting while clicking around.
-option( DEBUG_TIMEZONES "Debug-friendly timezone widget." OFF )
-if( DEBUG_TIMEZONES )
-    add_definitions( -DDEBUG_TIMEZONES )
+option(DEBUG_TIMEZONES "Debug-friendly timezone widget." OFF)
+if(DEBUG_TIMEZONES)
+    add_definitions(-DDEBUG_TIMEZONES)
 endif()
 
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
+include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
 
-calamares_add_plugin( locale
+calamares_add_plugin(locale
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
@@ -39,15 +39,7 @@ calamares_add_plugin( locale
 
 calamares_add_test(
     localetest
-    SOURCES
-        Tests.cpp
-        Config.cpp
-        LocaleConfiguration.cpp
-        SetTimezoneJob.cpp
-        timezonewidget/TimeZoneImage.cpp
-    DEFINITIONS
-        SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images"
-        DEBUG_TIMEZONES=1
-    LIBRARIES
-        Qt5::Gui
+    SOURCES Tests.cpp Config.cpp LocaleConfiguration.cpp SetTimezoneJob.cpp timezonewidget/TimeZoneImage.cpp
+    DEFINITIONS SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images" DEBUG_TIMEZONES=1
+    LIBRARIES Qt5::Gui
 )
diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp
index 2145ad201..03d1d4f5e 100644
--- a/src/modules/locale/LocaleViewStep.cpp
+++ b/src/modules/locale/LocaleViewStep.cpp
@@ -11,7 +11,6 @@
 #include "LocaleViewStep.h"
 
 #include "LocalePage.h"
-#include "widgets/WaitingWidget.h"
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
diff --git a/src/modules/localeq/CMakeLists.txt b/src/modules/localeq/CMakeLists.txt
index ee3f07314..f086676e6 100644
--- a/src/modules/localeq/CMakeLists.txt
+++ b/src/modules/localeq/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-if( NOT WITH_QML )
+if(NOT WITH_QML)
     calamares_skip_module( "localeq (QML is not supported in this build)" )
     return()
 endif()
@@ -11,28 +11,22 @@ endif()
 # When debugging the timezone widget, add this debugging definition
 # to have a debugging-friendly timezone widget, debug logging,
 # and no intrusive timezone-setting while clicking around.
-option( DEBUG_TIMEZONES "Debug-friendly timezone widget." OFF )
-if( DEBUG_TIMEZONES )
-    add_definitions( -DDEBUG_TIMEZONES )
+option(DEBUG_TIMEZONES "Debug-friendly timezone widget." OFF)
+if(DEBUG_TIMEZONES)
+    add_definitions(-DDEBUG_TIMEZONES)
 endif()
 
 find_package(Qt5Location CONFIG)
-set_package_properties(Qt5Location PROPERTIES
-    DESCRIPTION "Used for rendering the map"
-    TYPE RUNTIME
-)
+set_package_properties(Qt5Location PROPERTIES DESCRIPTION "Used for rendering the map" TYPE RUNTIME)
 find_package(Qt5Positioning CONFIG)
-set_package_properties(Qt5Positioning PROPERTIES
-    DESCRIPTION "Used for GeoLocation and GeoCoding"
-    TYPE RUNTIME
-)
+set_package_properties(Qt5Positioning PROPERTIES DESCRIPTION "Used for GeoLocation and GeoCoding" TYPE RUNTIME)
 
 # Because we're sharing sources with the regular locale module
-set( _locale ${CMAKE_CURRENT_SOURCE_DIR}/../locale )
+set(_locale ${CMAKE_CURRENT_SOURCE_DIR}/../locale)
 
-include_directories( ${_locale} )
+include_directories(${_locale})
 
-calamares_add_plugin( localeq
+calamares_add_plugin(localeq
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
diff --git a/src/modules/luksopenswaphookcfg/CMakeLists.txt b/src/modules/luksopenswaphookcfg/CMakeLists.txt
index caede06a7..f186fbdc6 100644
--- a/src/modules/luksopenswaphookcfg/CMakeLists.txt
+++ b/src/modules/luksopenswaphookcfg/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 # Because LUKS Open Swap Hook (Job) is such a mouthful, we'll
 # use LOSH all over the place as a shorthand.
-calamares_add_plugin( luksopenswaphookcfg
+calamares_add_plugin(luksopenswaphookcfg
     TYPE job
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
@@ -14,9 +14,4 @@ calamares_add_plugin( luksopenswaphookcfg
     SHARED_LIB
 )
 
-calamares_add_test(
-    luksopenswaphooktest
-    SOURCES
-        LOSHJob.cpp
-        Tests.cpp
-)
+calamares_add_test(luksopenswaphooktest SOURCES LOSHJob.cpp Tests.cpp)
diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.cpp b/src/modules/luksopenswaphookcfg/LOSHJob.cpp
index 42f160460..ad3b0abea 100644
--- a/src/modules/luksopenswaphookcfg/LOSHJob.cpp
+++ b/src/modules/luksopenswaphookcfg/LOSHJob.cpp
@@ -163,7 +163,7 @@ globalStoragePartitionInfo( Calamares::GlobalStorage* gs, LOSHInfo& info )
     QString btrfsRootSubvolume = gs->value( "btrfsRootSubvolume" ).toString();
     if ( !btrfsRootSubvolume.isEmpty() )
     {
-        CalamaresUtils::removeLeading( btrfsRootSubvolume, '/' );
+        Calamares::String::removeLeading( btrfsRootSubvolume, '/' );
         info.keyfile_device_mount_options
             = QStringLiteral( "keyfile_device_mount_options=--options=subvol=" ) + btrfsRootSubvolume;
     }
diff --git a/src/modules/machineid/CMakeLists.txt b/src/modules/machineid/CMakeLists.txt
index 0ab035ab4..869d11387 100644
--- a/src/modules/machineid/CMakeLists.txt
+++ b/src/modules/machineid/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-calamares_add_plugin( machineid
+calamares_add_plugin(machineid
     TYPE job
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
@@ -12,10 +12,4 @@ calamares_add_plugin( machineid
     SHARED_LIB
 )
 
-calamares_add_test(
-    machineidtest
-    SOURCES
-        Tests.cpp
-        MachineIdJob.cpp
-        Workers.cpp
-)
+calamares_add_test(machineidtest SOURCES Tests.cpp MachineIdJob.cpp Workers.cpp)
diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
index a3318d1a0..49ffc9627 100644
--- a/src/modules/mount/main.py
+++ b/src/modules/mount/main.py
@@ -16,6 +16,7 @@
 import tempfile
 import subprocess
 import os
+import re
 
 import libcalamares
 
@@ -42,6 +43,79 @@ def pretty_name():
     return _("Mounting partitions.")
 
 
+def disk_name_for_partition(partition):
+    """ Returns disk name for each found partition.
+
+    :param partition:
+    :return:
+    """
+    name = os.path.basename(partition["device"])
+
+    if name.startswith("/dev/mmcblk") or name.startswith("/dev/nvme"):
+        return re.sub("p[0-9]+$", "", name)
+
+    return re.sub("[0-9]+$", "", name)
+
+
+def is_ssd_disk(partition):
+    """ Checks if given partition is on an ssd disk.
+
+    :param partition: A dict containing the partition information
+    :return: True is the partition in on an ssd, False otherwise
+    """
+
+    try:
+        disk_name = disk_name_for_partition(partition)
+        filename = os.path.join("/sys/block", disk_name, "queue/rotational")
+
+        with open(filename) as sysfile:
+            return sysfile.read() == "0\n"
+    except:
+        return False
+
+
+def get_mount_options(filesystem, mount_options, partition):
+    """
+    Returns the mount options for the partition object and filesystem
+
+    :param filesystem: A string containing the filesystem
+    :param mount_options: A list of dicts that descripes the mount options for each mountpoint
+    :param partition: A dict containing information about the partition
+    :return: A comma seperated string containing the mount options suitable for passing to mount
+    """
+
+    # Extra mounts can optionally have "options" set, in this case, they override other all other settings
+    if "options" in partition:
+        return ",".join(partition["options"])
+
+    # If there are no mount options defined then we use the defaults
+    if mount_options is None:
+        return "defaults"
+
+    options = next((x for x in mount_options if x["filesystem"] == filesystem), None)
+
+    # If there is no match then check for default options
+    if options is None:
+        options = next((x for x in mount_options if x["filesystem"] == "default"), None)
+
+    # If it is still None, then fallback to returning defaults
+    if options is None:
+        return "defaults"
+
+    option_items = options.get("options", []).copy()
+
+    # Append the appropriate options for ssd or hdd if set
+    if is_ssd_disk(partition):
+        option_items.extend(options.get("ssdOptions", []))
+    else:
+        option_items.extend(options.get("hddOptions", []))
+
+    if option_items:
+        return ",".join(option_items)
+    else:
+        return "defaults"
+
+
 def get_btrfs_subvolumes(partitions):
     """
     Gets the job-configuration for btrfs subvolumes, or if there is
@@ -69,7 +143,9 @@ def get_btrfs_subvolumes(partitions):
     # If we have a swap **file**, give it a separate subvolume.
     swap_choice = libcalamares.globalstorage.value("partitionChoices")
     if swap_choice and swap_choice.get("swap", None) == "file":
-        btrfs_subvolumes.append({'mountPoint': '/swap', 'subvolume': '/@swap'})
+        swap_subvol = libcalamares.job.configuration.get("btrfsSwapSubvol", "/@swap")
+        btrfs_subvolumes.append({'mountPoint': '/swap', 'subvolume': swap_subvol})
+        libcalamares.globalstorage.insert("btrfsSwapSubvol", swap_subvol)
 
     return btrfs_subvolumes
 
@@ -138,9 +214,16 @@ def mount_zfs(root_mount_point, partition):
             raise ZfsException(_("Failed to set zfs mountpoint"))
 
 
-def mount_partition(root_mount_point, partition, partitions):
+def mount_partition(root_mount_point, partition, partitions, mount_options, mount_options_list):
     """
     Do a single mount of @p partition inside @p root_mount_point.
+
+    :param root_mount_point: A string containing the root of the install
+    :param partition: A dict containing information about the partition
+    :param partitions: The full list of partitions used to filter out btrfs subvols which have duplicate mountpoints
+    :param mount_options: The mount options from the config file
+    :param mount_options_list: A list of options for each mountpoint to be placed in global storage for future modules
+    :return:
     """
     # Create mount point with `+` rather than `os.path.join()` because
     # `partition["mountPoint"]` starts with a '/'.
@@ -176,11 +259,13 @@ def mount_partition(root_mount_point, partition, partitions):
     if fstype == "zfs":
         mount_zfs(root_mount_point, partition)
     else:  # fstype == "zfs"
+        mount_options_string = get_mount_options(fstype, mount_options, partition)
         if libcalamares.utils.mount(device,
                                     mount_point,
                                     fstype,
-                                    partition.get("options", "")) != 0:
+                                    mount_options_string) != 0:
             libcalamares.utils.warning("Cannot mount {}".format(device))
+        mount_options_list.append({"mountpoint": raw_mount_point, "option_string": mount_options_string})
 
     # Special handling for btrfs subvolumes. Create the subvolumes listed in mount.conf
     if fstype == "btrfs" and partition["mountPoint"] == '/':
@@ -207,13 +292,19 @@ def mount_partition(root_mount_point, partition, partitions):
             device = os.path.join("/dev/mapper", partition["luksMapperName"])
 
         # Mount the subvolumes
+        swap_subvol = libcalamares.job.configuration.get("btrfsSwapSubvol", "/@swap")
         for s in btrfs_subvolumes:
             mount_option = "subvol={}".format(s['subvolume'])
+            if s['subvolume'] == swap_subvol:
+                mount_option += "," + get_mount_options("btrfs_swap", mount_options, partition)
+            else:
+                mount_option += "," + get_mount_options(fstype, mount_options, partition)
             subvolume_mountpoint = mount_point[:-1] + s['mountPoint']
+            mount_options_list.append({"mountpoint": s['mountPoint'], "option_string": mount_option})
             if libcalamares.utils.mount(device,
                                         subvolume_mountpoint,
                                         fstype,
-                                        ",".join([mount_option, partition.get("options", "")])) != 0:
+                                        mount_option) != 0:
                 libcalamares.utils.warning("Cannot mount {}".format(device))
 
 
@@ -222,6 +313,7 @@ def run():
     Mount all the partitions from GlobalStorage and from the job configuration.
     Partitions are mounted in-lexical-order of their mountPoint.
     """
+
     partitions = libcalamares.globalstorage.value("partitions")
 
     if not partitions:
@@ -231,14 +323,18 @@ def run():
 
     root_mount_point = tempfile.mkdtemp(prefix="calamares-root-")
 
+    # Get the mountOptions, if this is None, that is OK and will be handled later
+    mount_options = libcalamares.job.configuration.get("mountOptions")
+
     # Guard against missing keys (generally a sign that the config file is bad)
     extra_mounts = libcalamares.job.configuration.get("extraMounts") or []
-    extra_mounts_efi = libcalamares.job.configuration.get("extraMountsEfi") or []
-    if not extra_mounts and not extra_mounts_efi:
+    if not extra_mounts:
         libcalamares.utils.warning("No extra mounts defined. Does mount.conf exist?")
 
-    if libcalamares.globalstorage.value("firmwareType") == "efi":
-        extra_mounts.extend(extra_mounts_efi)
+    if libcalamares.globalstorage.value("firmwareType") != "efi":
+        for mount in extra_mounts:
+            if mount.get("efi", None) is True:
+                extra_mounts.remove(mount)
 
     # Add extra mounts to the partitions list and sort by mount points.
     # This way, we ensure / is mounted before the rest, and every mount point
@@ -246,13 +342,20 @@ def run():
     # under /tmp, we make sure /tmp is mounted before the partition)
     mountable_partitions = [p for p in partitions + extra_mounts if "mountPoint" in p and p["mountPoint"]]
     mountable_partitions.sort(key=lambda x: x["mountPoint"])
+
+    # mount_options_list will be inserted into global storage for use in fstab later
+    mount_options_list = []
     try:
         for partition in mountable_partitions:
-            mount_partition(root_mount_point, partition, partitions)
+            mount_partition(root_mount_point, partition, partitions, mount_options, mount_options_list)
     except ZfsException as ze:
         return _("zfs mounting error"), ze.message
 
+    if not mount_options_list:
+        libcalamares.utils.warning("No mount options defined, {!s} partitions, {!s} mountable".format(len(partitions), len(mountable_partitions)))
+
     libcalamares.globalstorage.insert("rootMountPoint", root_mount_point)
+    libcalamares.globalstorage.insert("mountOptionsList", mount_options_list)
 
     # Remember the extra mounts for the unpackfs module
     libcalamares.globalstorage.insert("extraMounts", extra_mounts)
diff --git a/src/modules/mount/mount.conf b/src/modules/mount/mount.conf
index 84dca05a7..97e512846 100644
--- a/src/modules/mount/mount.conf
+++ b/src/modules/mount/mount.conf
@@ -5,16 +5,15 @@
 # target as a usable chroot / "live" system). Filesystems are
 # automatically mounted from the partitioning module. Filesystems
 # listed here are **extra**. The filesystems listed in *extraMounts*
-# are mounted in all target systems. The filesystems listed in
-# *extraMountsEfi* are mounted in the target system **only** if
-# the host machine uses UEFI.
+# are mounted in all target systems.
 ---
 # Extra filesystems to mount. The key's value is a list of entries; each
-# entry has four keys:
+# entry has five keys:
 #   - device    The device node to mount
 #   - fs (optional) The filesystem type to use
 #   - mountPoint Where to mount the filesystem
-#   - options (optional) Extra options to pass to mount(8)
+#   - options (optional) An array of options to pass to mount
+#   - efi (optional) A boolean that when true is only mounted for UEFI installs
 #
 # The device is not mounted if the mountPoint is unset or if the fs is
 # set to unformatted.
@@ -28,18 +27,17 @@ extraMounts:
       mountPoint: /sys
     - device: /dev
       mountPoint: /dev
-      options: bind
+      options: [ bind ]
     - device: tmpfs
       fs: tmpfs
       mountPoint: /run
     - device: /run/udev
       mountPoint: /run/udev
-      options: bind
-
-extraMountsEfi:
+      options: [ bind ]
     - device: efivarfs
       fs: efivarfs
       mountPoint: /sys/firmware/efi/efivars
+      efi: true
 
 # Btrfs subvolumes to create if root filesystem is on btrfs volume.
 # If *mountpoint* is mounted already to another partition, it is ignored.
@@ -47,10 +45,8 @@ extraMountsEfi:
 #
 # It is possible to prevent subvolume creation -- this is likely only relevant
 # for the root (/) subvolume -- by giving an empty string as a subvolume
-# name. In this case no subvolume will be created. When using snapper as
-# a rollback mechanism, it is recommended to **not** create a subvolume
-# for root.
-
+# name. In this case no subvolume will be created.
+#
 btrfsSubvolumes:
     - mountPoint: /
       subvolume: /@
@@ -63,3 +59,67 @@ btrfsSubvolumes:
       subvolume: /@cache
     - mountPoint: /var/log
       subvolume: /@log
+
+# The name of the btrfs subvolume holding the swapfile.  This only used when
+# a swapfile is selected and the root filesystem is btrfs
+#
+btrfsSwapSubvol: /@swap
+
+# The mount options used to mount each filesystem.
+#
+# filesystem contains the name of the filesystem or on of three special
+# values, "default", efi" and "btrfs_swap".  The logic is applied in this manner:
+#   - If the partition is the EFI partition, the "efi" entry will be used
+#   - If the fs is btrfs and the subvolume is for the swapfile,
+#     the "btrfs_swap" entry is used
+#   - If the  filesystem is an exact match for filesystem, that entry is used
+#   - If no match is found in the above, the default entry is used
+#   - If there is no match and no default entry, "defaults" is used
+#   - If the mountOptions key is not present, "defaults" is used
+#
+# Each filesystem entry contains 3 keys, all of which are optional
+#   options - An array of mount options that is used on all disk types
+#   ssdOptions - An array of mount options combined with options for ssds
+#   hddOptions - An array of mount options combined with options for hdds
+# If combining these options results in an empty array, "defaults" is used
+#
+# Example 1
+# In this example, there are specific options for ext4 and btrfs filesystems,
+# the EFI partition and the subvolume holding the btrfs swapfile.  All other
+# filesystems use the default entry.  For the btrfs filesystem, there are
+# additional options specific to hdds and ssds
+#
+# mountOptions:
+#    - filesystem: default
+#      options: [ defaults ]
+#    - filesystem: efi
+#      options: [ defaults, umask=0077 ]
+#    - filesystem: ext4
+#      options: [ defaults, noatime ]
+#    - filesystem: btrfs
+#      options: [ defaults, noatime, compress=zstd:1 ]
+#      ssdOptions: [ discard=async ]
+#      hddOptions: [ autodefrag ]
+#    - filesystem: btrfs_swap
+#      options: [ defaults, noatime ]
+#
+# Example 2
+# In this example there is a single default used by all filesystems
+#
+# mountOptions:
+#    - filesystem: default
+#      options: [ defaults, noatime ]
+#
+mountOptions:
+    - filesystem: default
+      options: [ defaults, noatime ]
+    - filesystem: efi
+      options: [ defaults, umask=0077 ]
+    - filesystem: btrfs
+      options: [ defaults, noatime, compress=lzo ]
+    - filesystem: btrfs_swap
+      options: [ defaults, noatime ]
+
+
+
+
diff --git a/src/modules/mount/mount.schema.yaml b/src/modules/mount/mount.schema.yaml
index fb5dfb69c..a083ed75a 100644
--- a/src/modules/mount/mount.schema.yaml
+++ b/src/modules/mount/mount.schema.yaml
@@ -6,7 +6,6 @@ $id: https://calamares.io/schemas/mount
 additionalProperties: false
 type: object
 properties:
-    # TODO: share the schema definition, since these are identical
     extraMounts:
         type: array
         items:
@@ -16,18 +15,8 @@ properties:
                 device: { type: string }
                 fs: { type: string }
                 mountPoint: { type: string }
-                options: { type: string }
-            required: [ device, mountPoint ]
-    extraMountsEfi:
-        type: array
-        items:
-            type: object
-            additionalProperties: false
-            properties:
-                device: { type: string }
-                fs: { type: string }
-                mountPoint: { type: string }
-                options: { type: string }
+                options: { type: array, items: { type: string } }
+                efi: { type: boolean, default: false }
             required: [ device, mountPoint ]
     btrfsSubvolumes:
         type: array
@@ -38,3 +27,17 @@ properties:
                 mountPoint: { type: string }
                 subvolume: { type: string }
             required: [ subvolume, mountPoint ]
+    btrfsSwapSubvol: { type: string }
+    mountOptions:
+        type: array
+        items:
+            type: object
+            additionalProperties: false
+            properties:
+                filesystem: { type: string }
+                options: { type: array, items: { type: string } }
+                ssdOptions: { type: array, items: { type: string } }
+                hddOptions: { type: array, items: { type: string } }
+            required: [ filesystem ]
+
+
diff --git a/src/modules/netinstall/CMakeLists.txt b/src/modules/netinstall/CMakeLists.txt
index 13c6fa0ce..e605905c4 100644
--- a/src/modules/netinstall/CMakeLists.txt
+++ b/src/modules/netinstall/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-calamares_add_plugin( netinstall
+calamares_add_plugin(netinstall
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
@@ -21,15 +21,10 @@ calamares_add_plugin( netinstall
     SHARED_LIB
 )
 
-calamares_add_test(
-    netinstalltest
-    SOURCES
-        Tests.cpp
-        Config.cpp
-        LoaderQueue.cpp
-        PackageTreeItem.cpp
-        PackageModel.cpp
-    LIBRARIES
-        Qt5::Gui
-)
-
+if(KF5CoreAddons_FOUND)
+    calamares_add_test(
+        netinstalltest
+        SOURCES Tests.cpp Config.cpp LoaderQueue.cpp PackageTreeItem.cpp PackageModel.cpp
+        LIBRARIES Qt5::Gui Qt5::Network KF5::CoreAddons
+    )
+endif()
diff --git a/src/modules/notesqml/CMakeLists.txt b/src/modules/notesqml/CMakeLists.txt
index 5eab06663..c76ab5179 100644
--- a/src/modules/notesqml/CMakeLists.txt
+++ b/src/modules/notesqml/CMakeLists.txt
@@ -3,12 +3,12 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-if( NOT WITH_QML )
+if(NOT WITH_QML)
     calamares_skip_module( "notesqml (QML is not supported in this build)" )
     return()
 endif()
 
-calamares_add_plugin( notesqml
+calamares_add_plugin(notesqml
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
diff --git a/src/modules/oemid/CMakeLists.txt b/src/modules/oemid/CMakeLists.txt
index af7fe1ff7..45825c85e 100644
--- a/src/modules/oemid/CMakeLists.txt
+++ b/src/modules/oemid/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-calamares_add_plugin( oemid
+calamares_add_plugin(oemid
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
diff --git a/src/modules/packagechooser/CMakeLists.txt b/src/modules/packagechooser/CMakeLists.txt
index d2e6ff118..e565fd05e 100644
--- a/src/modules/packagechooser/CMakeLists.txt
+++ b/src/modules/packagechooser/CMakeLists.txt
@@ -3,45 +3,46 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-find_package( Qt5 COMPONENTS Core Gui Widgets REQUIRED )
-set( _extra_libraries "" )
-set( _extra_src "" )
+find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
+set(_extra_libraries "")
+set(_extra_src "")
 
 ### OPTIONAL AppData XML support in PackageModel
 #
 #
 # TODO:3.3:WITH->BUILD (this doesn't affect the ABI offered by Calamares)
-option( WITH_APPDATA "Support appdata: items in PackageChooser (requires QtXml)" ON )
-if ( WITH_APPDATA )
+option(WITH_APPDATA "Support appdata: items in PackageChooser (requires QtXml)" ON)
+if(WITH_APPDATA)
     find_package(Qt5 COMPONENTS Xml)
-    if ( Qt5Xml_FOUND )
-        add_definitions( -DHAVE_APPDATA )
-        list( APPEND _extra_libraries Qt5::Xml )
-        list( APPEND _extra_src ItemAppData.cpp )
+    if(Qt5Xml_FOUND)
+        add_definitions(-DHAVE_APPDATA)
+        list(APPEND _extra_libraries Qt5::Xml)
+        list(APPEND _extra_src ItemAppData.cpp)
     endif()
 endif()
 
 ### OPTIONAL AppStream support in PackageModel
 #
 #
-option( WITH_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON )
-if ( WITH_APPSTREAM )
+option(WITH_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON)
+if(WITH_APPSTREAM)
     find_package(AppStreamQt)
     set_package_properties(
-        AppStreamQt PROPERTIES
+        AppStreamQt
+        PROPERTIES
         DESCRIPTION "Support for AppStream (cache) data"
         URL "https://github.com/ximion/appstream"
         PURPOSE "AppStream provides package data"
         TYPE OPTIONAL
     )
-    if ( AppStreamQt_FOUND )
-        add_definitions( -DHAVE_APPSTREAM )
-        list( APPEND _extra_libraries AppStreamQt )
-        list( APPEND _extra_src ItemAppStream.cpp )
+    if(AppStreamQt_FOUND)
+        add_definitions(-DHAVE_APPSTREAM)
+        list(APPEND _extra_libraries AppStreamQt)
+        list(APPEND _extra_src ItemAppStream.cpp)
     endif()
 endif()
 
-calamares_add_plugin( packagechooser
+calamares_add_plugin(packagechooser
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
@@ -62,9 +63,6 @@ calamares_add_plugin( packagechooser
 calamares_add_test(
     packagechoosertest
     GUI
-    SOURCES
-        Tests.cpp
-    LIBRARIES
-        calamares_viewmodule_packagechooser
-        ${_extra_libraries}
+    SOURCES Tests.cpp
+    LIBRARIES calamares_viewmodule_packagechooser ${_extra_libraries}
 )
diff --git a/src/modules/packagechooserq/CMakeLists.txt b/src/modules/packagechooserq/CMakeLists.txt
index 51a17e215..0b2c4b23a 100644
--- a/src/modules/packagechooserq/CMakeLists.txt
+++ b/src/modules/packagechooserq/CMakeLists.txt
@@ -4,55 +4,56 @@
 #   SPDX-FileCopyrightText: 2021 Anke Boersma 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-if( NOT WITH_QML )
+if(NOT WITH_QML)
     calamares_skip_module( "packagechooserq (QML is not supported in this build)" )
     return()
 endif()
 
-find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core )
+find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Core)
 
 # Add optional libraries here
-set( USER_EXTRA_LIB )
+set(USER_EXTRA_LIB)
 
 # include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../packagechooser )
-set( _packagechooser ${CMAKE_CURRENT_SOURCE_DIR}/../packagechooser )
-include_directories( ${_packagechooser} )
+set(_packagechooser ${CMAKE_CURRENT_SOURCE_DIR}/../packagechooser)
+include_directories(${_packagechooser})
 
 ### OPTIONAL AppData XML support in PackageModel
 #
 #
 # TODO:3.3:WITH->BUILD (this doesn't affect the ABI offered by Calamares)
-option( WITH_APPDATA "Support appdata: items in PackageChooser (requires QtXml)" ON )
-if ( WITH_APPDATA )
+option(WITH_APPDATA "Support appdata: items in PackageChooser (requires QtXml)" ON)
+if(WITH_APPDATA)
     find_package(Qt5 COMPONENTS Xml)
-    if ( Qt5Xml_FOUND )
-        add_definitions( -DHAVE_APPDATA )
-        list( APPEND _extra_libraries Qt5::Xml )
-        list( APPEND _extra_src ${_packagechooser}/ItemAppData.cpp )
+    if(Qt5Xml_FOUND)
+        add_definitions(-DHAVE_APPDATA)
+        list(APPEND _extra_libraries Qt5::Xml)
+        list(APPEND _extra_src ${_packagechooser}/ItemAppData.cpp)
     endif()
 endif()
 
 ### OPTIONAL AppStream support in PackageModel
 #
 #
-option( WITH_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON )
-if ( WITH_APPSTREAM )
+option(WITH_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON)
+if(WITH_APPSTREAM)
     find_package(AppStreamQt)
     set_package_properties(
-        AppStreamQt PROPERTIES
+        AppStreamQt
+        PROPERTIES
         DESCRIPTION "Support for AppStream (cache) data"
         URL "https://github.com/ximion/appstream"
         PURPOSE "AppStream provides package data"
         TYPE OPTIONAL
     )
-    if ( AppStreamQt_FOUND )
-        add_definitions( -DHAVE_APPSTREAM )
-        list( APPEND _extra_libraries AppStreamQt )
-        list( APPEND _extra_src ${_packagechooser}/ItemAppStream.cpp )
+    if(AppStreamQt_FOUND)
+        add_definitions(-DHAVE_APPSTREAM)
+        list(APPEND _extra_libraries AppStreamQt)
+        list(APPEND _extra_src ${_packagechooser}/ItemAppStream.cpp)
     endif()
 endif()
 
-calamares_add_plugin( packagechooserq
+calamares_add_plugin(packagechooserq
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
diff --git a/src/modules/packages/tests/CMakeTests.txt b/src/modules/packages/tests/CMakeTests.txt
index 4f7d6185f..66da86b5a 100644
--- a/src/modules/packages/tests/CMakeTests.txt
+++ b/src/modules/packages/tests/CMakeTests.txt
@@ -14,29 +14,33 @@ add_test(
 )
 add_test(
     NAME configure-packages-${_pm}-ops-1
-    COMMAND env PYTHONPATH=.: python3 ${CMAKE_CURRENT_LIST_DIR}/test-pm-${_pm}.py ${CMAKE_CURRENT_LIST_DIR}/pm-pacman-1.yaml 4 1 1
+    COMMAND
+        env PYTHONPATH=.: python3 ${CMAKE_CURRENT_LIST_DIR}/test-pm-${_pm}.py ${CMAKE_CURRENT_LIST_DIR}/pm-pacman-1.yaml
+        4 1 1
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 add_test(
     NAME configure-packages-${_pm}-ops-2
-    COMMAND env PYTHONPATH=.: python3 ${CMAKE_CURRENT_LIST_DIR}/test-pm-${_pm}.py ${CMAKE_CURRENT_LIST_DIR}/pm-pacman-2.yaml 3 0 0
+    COMMAND
+        env PYTHONPATH=.: python3 ${CMAKE_CURRENT_LIST_DIR}/test-pm-${_pm}.py ${CMAKE_CURRENT_LIST_DIR}/pm-pacman-2.yaml
+        3 0 0
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 
-if ( BUILD_TESTING AND BUILD_SCHEMA_TESTING AND PYTHONINTERP_FOUND AND PYTHON_EXECUTABLE )
-    set( _module packages )
-    set( _schema_file "${CMAKE_CURRENT_SOURCE_DIR}/${_module}/${_module}.schema.yaml" )
+if(BUILD_TESTING AND BUILD_SCHEMA_TESTING AND Python_Interpreter_FOUND)
+    set(_module packages)
+    set(_schema_file "${CMAKE_CURRENT_SOURCE_DIR}/${_module}/${_module}.schema.yaml")
     message(STATUS "Schema ${_schema_file}")
-    foreach( _cf pm-pacman-1.yaml pm-pacman-2.yaml )
-        set( _conf_file "${CMAKE_CURRENT_SOURCE_DIR}/${_module}/tests/${_cf}" )
-        if ( EXISTS "${_schema_file}" AND EXISTS "${_conf_file}" )
+    foreach(_cf pm-pacman-1.yaml pm-pacman-2.yaml)
+        set(_conf_file "${CMAKE_CURRENT_SOURCE_DIR}/${_module}/tests/${_cf}")
+        if(EXISTS "${_schema_file}" AND EXISTS "${_conf_file}")
             add_test(
                 NAME validate-packages-${_cf}
-                COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" "${_schema_file}" "${_conf_file}"
+                COMMAND
+                    ${Python_EXECUTABLE} "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" "${_schema_file}" "${_conf_file}"
             )
         else()
             message(FATAL_ERROR "Missing ${_conf_file}")
         endif()
     endforeach()
 endif()
-
diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt
index 940aacdd8..6d07ec281 100644
--- a/src/modules/partition/CMakeLists.txt
+++ b/src/modules/partition/CMakeLists.txt
@@ -23,19 +23,19 @@ option( DEBUG_PARTITION_BAIL_OUT "Unsafe partitioning will error out on exec." O
 option( DEBUG_PARTITION_SKIP "Don't actually do any partitioning." OFF)
 
 # This is very chatty, useful mostly if you don't know what KPMCore offers.
-option( DEBUG_FILESYSTEMS      "Log all available Filesystems from KPMCore." OFF )
+option(DEBUG_FILESYSTEMS "Log all available Filesystems from KPMCore." OFF)
 
-include_directories( ${CMAKE_SOURCE_DIR} )  # For 3rdparty
+include_directories(${CMAKE_SOURCE_DIR}) # For 3rdparty
 
 set( _partition_defs )
 if( DEBUG_PARTITION_UNSAFE )
     if( DEBUG_PARTITION_BAIL_OUT )
         list( APPEND _partition_defs DEBUG_PARTITION_BAIL_OUT )
     endif()
-    list( APPEND _partition_defs DEBUG_PARTITION_UNSAFE )
+    list(APPEND _partition_defs DEBUG_PARTITION_UNSAFE)
 endif()
-if ( DEBUG_FILESYSTEMS )
-    list( APPEND _partition_defs DEBUG_FILESYSTEMS )
+if(DEBUG_FILESYSTEMS)
+    list(APPEND _partition_defs DEBUG_FILESYSTEMS)
 endif()
 if( DEBUG_PARTITION_SKIP )
     list( APPEND _partition_defs DEBUG_PARTITION_SKIP )
@@ -43,20 +43,20 @@ endif()
 
 find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
 
-include( KPMcoreHelper )
+include(KPMcoreHelper)
 
-find_package( KF5Config CONFIG )
-find_package( KF5I18n CONFIG )
-find_package( KF5WidgetsAddons CONFIG )
+find_package(KF5Config CONFIG)
+find_package(KF5I18n CONFIG)
+find_package(KF5WidgetsAddons CONFIG)
 
-if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND )
-    list( APPEND _partition_defs ${KPMcore_API_DEFINITIONS} )
-    include_directories( ${KPMCORE_INCLUDE_DIR} )
-    include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
+if(KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND)
+    list(APPEND _partition_defs ${KPMcore_API_DEFINITIONS})
+    include_directories(${KPMCORE_INCLUDE_DIR})
+    include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
 
-    add_subdirectory( tests )
+    add_subdirectory(tests)
 
-    calamares_add_plugin( partition
+    calamares_add_plugin(partition
         TYPE viewmodule
         EXPORT_MACRO PLUGINDLLEXPORT_PRO
         SOURCES
@@ -124,10 +124,9 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND
         SHARED_LIB
     )
 else()
-    if ( NOT KPMcore_FOUND )
+    if(NOT KPMcore_FOUND)
         calamares_skip_module( "partition (missing suitable KPMcore)" )
     else()
         calamares_skip_module( "partition (missing dependencies for KPMcore)" )
     endif()
 endif()
-
diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index 66817bab5..fe77bee3a 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -233,7 +233,7 @@ PartitionViewStep::createSummaryWidget() const
     QWidget* widget = new QWidget;
     QVBoxLayout* mainLayout = new QVBoxLayout;
     widget->setLayout( mainLayout );
-    mainLayout->setMargin( 0 );
+    CalamaresUtils::unmarginLayout( mainLayout );
 
     Config::InstallChoice choice = m_config->installChoice();
 
@@ -508,11 +508,6 @@ PartitionViewStep::onLeave()
         {
             const QString espMountPoint
                 = Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString();
-#ifdef WITH_KPMCORE4API
-            const auto espFlag = PartitionTable::Flag::Boot;
-#else
-            const auto espFlag = PartitionTable::FlagEsp;
-#endif
             Partition* esp = m_core->findPartitionByMountPoint( espMountPoint );
 
             QString message;
@@ -567,7 +562,7 @@ PartitionViewStep::onLeave()
                 cDebug() << o << "ESP missing flag";
                 description.append( ' ' );
                 description.append( tr( "The filesystem must have flag %1 set." )
-                                        .arg( PartitionTable::flagName( espFlag ) ) );
+                                        .arg( PartitionTable::flagName( PartitionTable::Flag::Boot ) ) );
             }
             if ( !description.isEmpty() )
             {
diff --git a/src/modules/partition/core/BootLoaderModel.cpp b/src/modules/partition/core/BootLoaderModel.cpp
index fd66c8514..f659fc593 100644
--- a/src/modules/partition/core/BootLoaderModel.cpp
+++ b/src/modules/partition/core/BootLoaderModel.cpp
@@ -3,6 +3,7 @@
  *   SPDX-FileCopyrightText: 2014 Aurélien Gâteau 
  *   SPDX-FileCopyrightText: 2015 Teo Mrnjavac 
  *   SPDX-FileCopyrightText: 2019 Adriaan de Groot 
+ *   SPDX-FileCopyrightText: 2021 Anubhav Choudhary 
  *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is Free Software: see the License-Identifier above.
@@ -79,7 +80,7 @@ BootLoaderModel::updateInternal()
     clear();
     createMbrItems();
 
-    // An empty model is possible if you don't havee permissions: don't crash though.
+    // An empty model is possible if you don't have permissions: don't crash though.
     if ( rowCount() < 1 )
     {
         return;
@@ -124,10 +125,10 @@ BootLoaderModel::updateInternal()
         {
             appendRow( createBootLoaderItem( partitionText, PartitionInfo::mountPoint( partition ), true ) );
         }
-
-        // Create "don't install bootloader" item
-        appendRow( createBootLoaderItem( tr( "Do not install a boot loader" ), QString(), false ) );
     }
+    // Create "don't install bootloader" item. This is always available,
+    // also if there was no /boot or / partition found.
+    appendRow( createBootLoaderItem( tr( "Do not install a boot loader" ), QString(), false ) );
 }
 
 
diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp
index b3a10dde7..321827876 100644
--- a/src/modules/partition/core/DeviceList.cpp
+++ b/src/modules/partition/core/DeviceList.cpp
@@ -127,11 +127,7 @@ getDevices( DeviceType which )
         cWarning() << "No KPM backend found.";
         return {};
     }
-#if defined( WITH_KPMCORE4API )
     DeviceList devices = backend->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag( 0 ) );
-#else
-    DeviceList devices = backend->scanDevices( /* excludeReadOnly */ true );
-#endif
 
     /* The list of devices is cleaned up for use:
      *  - some devices can **never** be used (e.g. floppies, nullptr)
diff --git a/src/modules/partition/core/KPMHelpers.cpp b/src/modules/partition/core/KPMHelpers.cpp
index 6cc188e67..e3985bc40 100644
--- a/src/modules/partition/core/KPMHelpers.cpp
+++ b/src/modules/partition/core/KPMHelpers.cpp
@@ -25,6 +25,8 @@
 #include 
 #include 
 
+#include 
+
 using CalamaresUtils::Partition::PartitionIterator;
 
 namespace KPMHelpers
@@ -133,45 +135,6 @@ clonePartition( Device* device, Partition* partition )
                           partition->activeFlags() );
 }
 
-#ifndef WITH_KPMCORE4API
-// This function was added in KPMCore 4, implementation copied from src/fs/luks.cpp
-/*
-    SPDX-FileCopyrightText: 2010 Volker Lanz 
-    SPDX-FileCopyrightText: 2012-2019 Andrius Štikonas 
-    SPDX-FileCopyrightText: 2015-2016 Teo Mrnjavac 
-    SPDX-FileCopyrightText: 2016 Chantara Tith 
-    SPDX-FileCopyrightText: 2017 Christian Morlok 
-    SPDX-FileCopyrightText: 2018 Caio Jordão Carvalho 
-    SPDX-FileCopyrightText: 2020 Arnaud Ferraris 
-    SPDX-FileCopyrightText: 2020 Gaël PORTAY 
-
-    SPDX-License-Identifier: GPL-3.0-or-later
-*/
-static bool
-testPassphrase( FS::luks* fs, const QString& deviceNode, const QString& passphrase )
-{
-    ExternalCommand cmd( QStringLiteral( "cryptsetup" ),
-                         { QStringLiteral( "open" ),
-                           QStringLiteral( "--tries" ),
-                           QStringLiteral( "1" ),
-                           QStringLiteral( "--test-passphrase" ),
-                           deviceNode } );
-    if ( cmd.write( passphrase.toLocal8Bit() + '\n' ) && cmd.start( -1 ) && cmd.exitCode() == 0 )
-    {
-        return true;
-    }
-
-    return false;
-}
-#else
-static bool
-testPassphrase( FS::luks* fs, const QString& deviceNode, const QString& passphrase )
-{
-    return fs->testPassphrase( deviceNode, passphrase );
-}
-#endif
-
-// Adapted from src/fs/luks.cpp cryptOpen which always opens a dialog to ask for a passphrase
 SavePassphraseValue
 savePassphrase( Partition* partition, const QString& passphrase )
 {
@@ -181,57 +144,161 @@ savePassphrase( Partition* partition, const QString& passphrase )
         return SavePassphraseValue::EmptyPassphrase;
     }
 
-    if ( partition->fileSystem().type() != FileSystem::Luks )
+    FS::luks* luksFs = dynamic_cast< FS::luks* >( &partition->fileSystem() );
+    if ( luksFs == nullptr )
     {
+        // No luks device
         return SavePassphraseValue::NotLuksPartition;
     }
 
-    FS::luks* luksFs = dynamic_cast< FS::luks* >( &partition->fileSystem() );
-    const QString deviceNode = partition->partitionPath();
-
     // Test the given passphrase
-    if ( !testPassphrase( luksFs, deviceNode, passphrase ) )
+    if ( !luksFs->testPassphrase( partition->partitionPath(), passphrase ) )
+    {
+        // Save the existing passphrase
+        luksFs->setPassphrase( passphrase );
+    }
+    else
     {
         return SavePassphraseValue::IncorrectPassphrase;
     }
+    return SavePassphraseValue::NoError;
+}
+
+// Adapted from src/fs/luks.cpp cryptOpen which always opens a dialog to ask for a passphrase
+QString
+cryptOpen( Partition* partition )
+{
+    FS::luks* luksFs = dynamic_cast< FS::luks* >( &partition->fileSystem() );
+    if ( luksFs == nullptr )
+    {
+        // No luks device
+        return QString();
+    }
 
     if ( luksFs->isCryptOpen() )
     {
         if ( !luksFs->mapperName().isEmpty() )
         {
-            return SavePassphraseValue::NoError;
+            // Already decrypted
+            return luksFs->mapperName();
         }
         else
         {
-            cDebug() << Logger::SubEntry << "No mapper node found";
+            cDebug() << Logger::SubEntry << "No mapper node found - reset cryptOpen";
             luksFs->setCryptOpen( false );
         }
     }
 
+    if ( luksFs->passphrase().isEmpty() )
+    {
+        // No passphrase for decryption
+        return QString();
+    }
+
+    // Decrypt the partition
+    const QString deviceNode = partition->partitionPath();
     ExternalCommand openCmd( QStringLiteral( "cryptsetup" ),
                              { QStringLiteral( "open" ), deviceNode, luksFs->suggestedMapperName( deviceNode ) } );
-    if ( !( openCmd.write( passphrase.toLocal8Bit() + '\n' ) && openCmd.start( -1 ) && openCmd.exitCode() == 0 ) )
+    if ( ( openCmd.write( luksFs->passphrase().toLocal8Bit() + '\n' ) && openCmd.start( -1 ) && openCmd.exitCode() == 0 ) )
     {
-        cWarning() << Logger::SubEntry << openCmd.exitCode() << ": cryptsetup command failed";
-        return SavePassphraseValue::CryptsetupError;
+        luksFs->scan( deviceNode );
+        if ( luksFs->mapperName().isEmpty() )
+        {
+            return QString();
+        }
+        luksFs->loadInnerFileSystem( luksFs->mapperName() );
+        luksFs->setCryptOpen( luksFs->innerFS() != nullptr );
+        if ( !luksFs->isCryptOpen() )
+        {
+            return QString();
+        }
+        return luksFs->mapperName();
+    }
+    return QString();
+}
+
+void
+cryptClose( Partition* partition )
+{
+    FS::luks* luksFs = dynamic_cast< FS::luks* >( &partition->fileSystem() );
+    if ( luksFs == nullptr )
+    {
+        // No luks device
+        return;
     }
 
-    // Save the existing passphrase
-    luksFs->setPassphrase( passphrase );
-    luksFs->scan( deviceNode );
     if ( luksFs->mapperName().isEmpty() )
     {
-        return SavePassphraseValue::NoMapperNode;
+        // Not opened
+        return;
     }
 
-    luksFs->loadInnerFileSystem( luksFs->mapperName() );
-    luksFs->setCryptOpen( luksFs->innerFS() != nullptr );
-    if ( !luksFs->isCryptOpen() )
+    // Close the partition
+    luksFs->cryptClose( partition->partitionPath() );
+}
+
+bool
+cryptLabel( Partition* partition, const QString& label )
+{
+    int version = cryptVersion( partition );
+    if ( version == 0 || label.isEmpty() )
     {
-        return SavePassphraseValue::DeviceNotDecrypted;
+        return false;
     }
 
-    return SavePassphraseValue::NoError;
+    if ( version == 1 )
+    {
+        QString mappedDevice = cryptOpen( partition );
+        if ( !mappedDevice.isEmpty() )
+        {
+            // Label mapped device
+            ExternalCommand openCmd( QStringLiteral( "e2label" ),
+                                     { mappedDevice,
+                                     label } );
+            openCmd.start( -1 );
+            cryptClose( partition );
+            return true;
+        }
+    }
+    else
+    {
+        ExternalCommand openCmd( QStringLiteral( "cryptsetup" ),
+                                 { QStringLiteral( "config" ),
+                                 partition->partitionPath(),
+                                 QStringLiteral( "--label" ),
+                                 label } );
+        if ( openCmd.start( -1 ) && openCmd.exitCode() == 0 )
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+int
+cryptVersion( Partition* partition )
+{
+    if ( partition->fileSystem().type() != FileSystem::Luks )
+    {
+        return 0;
+    }
+
+    // Get luks version from header information
+    int luksVersion = 1;
+    ExternalCommand openCmd( QStringLiteral( "cryptsetup" ),
+                             { QStringLiteral( "luksDump" ),
+                             partition->partitionPath() } );
+    if ( openCmd.start( -1 ) && openCmd.exitCode() == 0 )
+    {
+        QRegularExpression re( QStringLiteral( R"(version:\s+(\d))" ),
+                               QRegularExpression::CaseInsensitiveOption );
+        QRegularExpressionMatch rem = re.match( openCmd.output() );
+        if ( rem.hasMatch() )
+        {
+            luksVersion = rem.captured( 1 ).toInt();
+        }
+    }
+    return luksVersion;
 }
 
 Calamares::JobResult
@@ -247,7 +314,7 @@ execute( Operation& operation, const QString& failureMessage )
 
     // Remove the === lines from the report by trimming them to empty
     QStringList l = report.toText().split( '\n' );
-    std::for_each( l.begin(), l.end(), []( QString& s ) { CalamaresUtils::removeLeading( s, '=' ); } );
+    std::for_each( l.begin(), l.end(), []( QString& s ) { Calamares::String::removeLeading( s, '=' ); } );
 
     return Calamares::JobResult::error( failureMessage, l.join( '\n' ) );
 }
diff --git a/src/modules/partition/core/KPMHelpers.h b/src/modules/partition/core/KPMHelpers.h
index e059c934a..2b2da6b14 100644
--- a/src/modules/partition/core/KPMHelpers.h
+++ b/src/modules/partition/core/KPMHelpers.h
@@ -27,15 +27,10 @@ class Partition;
 class PartitionNode;
 class PartitionRole;
 
-#if defined( WITH_KPMCORE4API )
+// TODO:3.3: Remove defines, expand in-place
 #define KPM_PARTITION_FLAG( x ) PartitionTable::Flag::x
 #define KPM_PARTITION_STATE( x ) Partition::State::x
 #define KPM_PARTITION_FLAG_ESP PartitionTable::Flag::Boot
-#else
-#define KPM_PARTITION_FLAG( x ) PartitionTable::Flag##x
-#define KPM_PARTITION_STATE( x ) Partition::State##x
-#define KPM_PARTITION_FLAG_ESP PartitionTable::FlagEsp
-#endif
 
 /**
  * Helper functions to manipulate partitions
@@ -103,6 +98,27 @@ Partition* clonePartition( Device* device, Partition* partition );
  */
 SavePassphraseValue savePassphrase( Partition* partition, const QString& passphrase );
 
+/** @brief Decrypt an encrypted partition.
+ *
+ * Uses @p partition to decrypt the partition.
+ * The passphrase saved in @p partition is used.
+ * Returns the mapped device path or an empty string if it fails.
+ */
+QString cryptOpen( Partition* partition );
+void cryptClose( Partition* partition );
+
+/** @brief Set label of luks encrypted partition.
+ *
+ * Returns true on success or false if it fails.
+ */
+bool cryptLabel( Partition* partition, const QString& label );
+
+/** @brief Returns the luks version used to encrypt the partition.
+ *
+ * Used by cryptLabel
+ */
+int cryptVersion( Partition* partition );
+
 /** @brief Return a result for an @p operation
  *
  * Executes the operation, and if successful, returns a success result.
diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index cb7c8a01d..3d5e1e762 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -457,9 +457,7 @@ isEfiFilesystemSuitableType( const Partition* candidate )
     {
     case FileSystem::Type::Fat32:
         return true;
-#ifdef WITH_KPMCORE4API
     case FileSystem::Type::Fat12:
-#endif
     case FileSystem::Type::Fat16:
         cWarning() << "FAT12 and FAT16 are probably not supported by EFI";
         return false;
@@ -479,7 +477,7 @@ isEfiFilesystemSuitableSize( const Partition* candidate )
         return false;
     }
 
-    if ( size_t( size ) >= efiFilesystemMinimumSize() )
+    if ( size >= efiFilesystemMinimumSize() )
     {
         return true;
     }
@@ -496,40 +494,18 @@ isEfiBootable( const Partition* candidate )
 {
     const auto flags = PartitionInfo::flags( candidate );
 
-#if defined( WITH_KPMCORE4API )
     // In KPMCore4, the flags are remapped, and the ESP flag is the same as Boot.
     static_assert( KPM_PARTITION_FLAG_ESP == KPM_PARTITION_FLAG( Boot ), "KPMCore API enum changed" );
     return flags.testFlag( KPM_PARTITION_FLAG_ESP );
-#else
-    // In KPMCore3, bit 17 is the old-style Esp flag, and it's OK
-    if ( flags.testFlag( KPM_PARTITION_FLAG_ESP ) )
-    {
-        return true;
-    }
-
-    /* Otherwise, if it's a GPT table, Boot (bit 0) is the same as Esp */
-    const PartitionTable* table = CalamaresUtils::Partition::getPartitionTable( candidate );
-    if ( !table )
-    {
-        cWarning() << "Root of partition table is not a PartitionTable object";
-        return false;
-    }
-    if ( table->type() == PartitionTable::TableType::gpt )
-    {
-        const auto bootFlag = KPM_PARTITION_FLAG( Boot );
-        return flags.testFlag( bootFlag );
-    }
-    return false;
-#endif
 }
 
 // TODO: this is configurable via the config file **already**
-size_t
+qint64
 efiFilesystemMinimumSize()
 {
     using CalamaresUtils::Units::operator""_MiB;
 
-    size_t uefisys_part_sizeB = 300_MiB;
+    qint64 uefisys_part_sizeB = 300_MiB;
 
     // The default can be overridden; the key used here comes
     // from the partition module Config.cpp
@@ -537,7 +513,7 @@ efiFilesystemMinimumSize()
     if ( gs->contains( "efiSystemPartitionSize_i" ) )
     {
         qint64 v = gs->value( "efiSystemPartitionSize_i" ).toLongLong();
-        uefisys_part_sizeB = v > 0 ? static_cast< size_t >( v ) : 0;
+        uefisys_part_sizeB = v > 0 ? v : 0;
     }
     // There is a lower limit of what can be configured
     if ( uefisys_part_sizeB < 32_MiB )
diff --git a/src/modules/partition/core/PartUtils.h b/src/modules/partition/core/PartUtils.h
index 31b4cde84..f3c51df45 100644
--- a/src/modules/partition/core/PartUtils.h
+++ b/src/modules/partition/core/PartUtils.h
@@ -107,7 +107,7 @@ bool isEfiFilesystemSuitableSize( const Partition* candidate );
  *
  * A minimum of 32MiB (which is bonkers-small) is enforced.
  */
-size_t efiFilesystemMinimumSize();
+qint64 efiFilesystemMinimumSize();
 
 /**
  * @brief Is the given @p partition bootable in EFI? Depending on
diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
index 0ce9ff4ed..0ceff4324 100644
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -30,11 +30,8 @@
 
 using namespace CalamaresUtils::Units;
 
-namespace PartitionActions
-{
-
-qint64
-swapSuggestion( const qint64 availableSpaceB, Config::SwapChoice swap )
+static quint64
+swapSuggestion( const quint64 availableSpaceB, Config::SwapChoice swap )
 {
     if ( ( swap != Config::SwapChoice::SmallSwap ) && ( swap != Config::SwapChoice::FullSwap ) )
     {
@@ -42,10 +39,8 @@ swapSuggestion( const qint64 availableSpaceB, Config::SwapChoice swap )
     }
 
     // See partition.conf for explanation
-    qint64 suggestedSwapSizeB = 0;
-    auto memory = CalamaresUtils::System::instance()->getTotalMemoryB();
-    qint64 availableRamB = memory.first;
-    qreal overestimationFactor = memory.second;
+    quint64 suggestedSwapSizeB = 0;
+    auto [ availableRamB, overestimationFactor ] = CalamaresUtils::System::instance()->getTotalMemoryB();
 
     bool ensureSuspendToDisk = swap == Config::SwapChoice::FullSwap;
 
@@ -66,12 +61,13 @@ swapSuggestion( const qint64 availableSpaceB, Config::SwapChoice swap )
     // .. top out at 8GiB if we don't care about suspend
     if ( !ensureSuspendToDisk )
     {
-        suggestedSwapSizeB = qMin( 8_GiB, suggestedSwapSizeB );
+        // TODO: make the _GiB operator return unsigned
+        suggestedSwapSizeB = qMin( quint64( 8_GiB ), suggestedSwapSizeB );
     }
 
 
     // Allow for a fudge factor
-    suggestedSwapSizeB = qRound64( suggestedSwapSizeB * overestimationFactor );
+    suggestedSwapSizeB = quint64( qRound64( qreal( suggestedSwapSizeB ) * overestimationFactor ) );
 
     // don't use more than 10% of available space
     if ( !ensureSuspendToDisk )
@@ -79,11 +75,15 @@ swapSuggestion( const qint64 availableSpaceB, Config::SwapChoice swap )
         suggestedSwapSizeB = qMin( suggestedSwapSizeB, availableSpaceB / 10 /* 10% is 0.1 */ );
     }
 
+    // TODO: make Units functions work on unsigned
     cDebug() << "Suggested swap size:" << CalamaresUtils::BytesToGiB( suggestedSwapSizeB ) << "GiB";
 
     return suggestedSwapSizeB;
 }
 
+namespace PartitionActions
+{
+
 void
 doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionOptions o )
 {
@@ -118,7 +118,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
 
     if ( isEfi )
     {
-        size_t uefisys_part_sizeB = PartUtils::efiFilesystemMinimumSize();
+        qint64 uefisys_part_sizeB = PartUtils::efiFilesystemMinimumSize();
         qint64 efiSectorCount = CalamaresUtils::bytesToSectors( uefisys_part_sizeB, dev->logicalSize() );
         Q_ASSERT( efiSectorCount > 0 );
 
@@ -147,16 +147,17 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
     const bool mayCreateSwap
         = ( o.swap == Config::SwapChoice::SmallSwap ) || ( o.swap == Config::SwapChoice::FullSwap );
     bool shouldCreateSwap = false;
-    qint64 suggestedSwapSizeB = 0;
+    quint64 suggestedSwapSizeB = 0;
 
+    const quint64 sectorSize = quint64( dev->logicalSize() );
     if ( mayCreateSwap )
     {
-        qint64 availableSpaceB = ( dev->totalLogical() - firstFreeSector ) * dev->logicalSize();
+        quint64 availableSpaceB = quint64( dev->totalLogical() - firstFreeSector ) * sectorSize;
         suggestedSwapSizeB = swapSuggestion( availableSpaceB, o.swap );
         // Space required by this installation is what the distro claims is needed
         // (via global configuration) plus the swap size plus a fudge factor of
         // 0.6GiB (this was 2.1GiB up to Calamares 3.2.2).
-        qint64 requiredSpaceB = o.requiredSpaceB + 600_MiB + suggestedSwapSizeB;
+        quint64 requiredSpaceB = o.requiredSpaceB + 600_MiB + suggestedSwapSizeB;
 
         // If there is enough room for ESP + root + swap, create swap, otherwise don't.
         shouldCreateSwap = availableSpaceB > requiredSpaceB;
@@ -165,7 +166,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
     qint64 lastSectorForRoot = dev->totalLogical() - 1;  //last sector of the device
     if ( shouldCreateSwap )
     {
-        lastSectorForRoot -= suggestedSwapSizeB / dev->logicalSize() + 1;
+        lastSectorForRoot -= suggestedSwapSizeB / sectorSize + 1;
     }
 
     core->layoutApply( dev, firstFreeSector, lastSectorForRoot, o.luksPassphrase );
diff --git a/src/modules/partition/core/PartitionActions.h b/src/modules/partition/core/PartitionActions.h
index efe8b2456..d6b86a6cd 100644
--- a/src/modules/partition/core/PartitionActions.h
+++ b/src/modules/partition/core/PartitionActions.h
@@ -44,7 +44,7 @@ struct ReplacePartitionOptions
 struct AutoPartitionOptions : ReplacePartitionOptions
 {
     QString efiPartitionMountPoint;  // optional, e.g. "/boot"
-    qint64 requiredSpaceB;  // estimated required space for root partition
+    quint64 requiredSpaceB;  // estimated required space for root partition
     Config::SwapChoice swap;
 
     AutoPartitionOptions( const QString& pt,
@@ -55,7 +55,7 @@ struct AutoPartitionOptions : ReplacePartitionOptions
                           Config::SwapChoice s )
         : ReplacePartitionOptions( pt, fs, luks )
         , efiPartitionMountPoint( efi )
-        , requiredSpaceB( requiredBytes > 0 ? requiredBytes : 0 )
+        , requiredSpaceB( requiredBytes > 0 ? quint64( requiredBytes ) : 0U )
         , swap( s )
     {
     }
diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index f7d1e8278..78af2abf7 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -553,6 +553,11 @@ PartitionCoreModule::formatPartition( Device* device, Partition* partition )
 void
 PartitionCoreModule::setFilesystemLabel( Device* device, Partition* partition, const QString& newLabel )
 {
+    if ( newLabel.isEmpty() )
+    {
+        // Don't bother
+        return;
+    }
     auto deviceInfo = infoForDevice( device );
     Q_ASSERT( deviceInfo );
 
@@ -842,13 +847,8 @@ PartitionCoreModule::scanForLVMPVs()
         }
     }
 
-#if defined( WITH_KPMCORE4API )
     VolumeManagerDevice::scanDevices( physicalDevices );
     for ( auto p : LVM::pvList::list() )
-#else
-    LvmDevice::scanSystemLVM( physicalDevices );
-    for ( auto p : LVM::pvList )
-#endif
     {
         m_lvmPVs << p.partition().data();
 
@@ -885,7 +885,6 @@ PartitionCoreModule::scanForLVMPVs()
                         m_lvmPVs << p;
                     }
                 }
-#if defined( WITH_KPMCORE4API )
                 else if ( p->fileSystem().type() == FileSystem::Type::Luks2 )
                 {
                     // Encrypted LVM PVs
@@ -896,7 +895,6 @@ PartitionCoreModule::scanForLVMPVs()
                         m_lvmPVs << p;
                     }
                 }
-#endif
             }
         }
     }
diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 765d9fffa..a8aae61ff 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -154,11 +154,9 @@ PartitionLayout::setDefaultFsType( FileSystem::Type defaultFsType )
     case FileSystem::Lvm2_PV:
     case FileSystem::Udf:
     case FileSystem::Iso9660:
-#ifdef WITH_KPMCORE4API
     case FileSystem::Luks2:
     case FileSystem::LinuxRaidMember:
     case FileSystem::BitLocker:
-#endif
         // bad bad
         cWarning() << "The selected default FS" << defaultFsType << "is not suitable."
                    << "Using ext4 instead.";
@@ -185,11 +183,9 @@ PartitionLayout::setDefaultFsType( FileSystem::Type defaultFsType )
     case FileSystem::Hpfs:
     case FileSystem::Zfs:
     case FileSystem::Nilfs2:
-#ifdef WITH_KPMCORE4API
     case FileSystem::Fat12:
     case FileSystem::Apfs:
     case FileSystem::Minix:
-#endif
         // weird
         cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong.";
         break;
@@ -355,30 +351,18 @@ PartitionLayout::createPartitions( Device* dev,
         }
         if ( !entry.partType.isEmpty() )
         {
-#if defined( WITH_KPMCORE42API )
             part->setType( entry.partType );
-#else
-            cWarning() << "Ignoring type; requires KPMcore >= 4.2.0.";
-#endif
         }
         if ( entry.partAttributes )
         {
-#if defined( WITH_KPMCORE42API )
             part->setAttributes( entry.partAttributes );
-#else
-            cWarning() << "Ignoring attributes; requires KPMcore >= 4.2.0.";
-#endif
         }
         if ( !entry.partFeatures.isEmpty() )
         {
-#if defined( WITH_KPMCORE42API )
             for ( const auto& k : entry.partFeatures.keys() )
             {
                 part->fileSystem().addFeature( k, entry.partFeatures.value( k ) );
             }
-#else
-            cWarning() << "Ignoring features; requires KPMcore >= 4.2.0.";
-#endif
         }
         // Some buggy (legacy) BIOSes test if the bootflag of at least one partition is set.
         // Otherwise they ignore the device in boot-order, so add it here.
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 882be1022..2730e069f 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -3,6 +3,7 @@
  *   SPDX-FileCopyrightText: 2014-2017 Teo Mrnjavac 
  *   SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot 
  *   SPDX-FileCopyrightText: 2019 Collabora Ltd
+ *   SPDX-FileCopyrightText: 2021 Anubhav Choudhary 
  *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is Free Software: see the License-Identifier above.
@@ -42,9 +43,7 @@
 #include "widgets/PrettyRadioButton.h"
 
 #include 
-#ifdef WITH_KPMCORE4API
 #include 
-#endif
 
 #include 
 #include 
@@ -55,7 +54,7 @@
 #include 
 #include 
 
-using Calamares::PrettyRadioButton;
+using Calamares::Widgets::PrettyRadioButton;
 using CalamaresUtils::Partition::findPartitionByPath;
 using CalamaresUtils::Partition::isPartitionFreeSpace;
 using CalamaresUtils::Partition::PartitionIterator;
@@ -1038,6 +1037,12 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
         QLabel* sizeLabel = new QLabel( m_previewAfterFrame );
         layout->addWidget( sizeLabel );
         sizeLabel->setWordWrap( true );
+
+        if ( !m_isEfi )
+        {
+            layout->addWidget( createBootloaderPanel() );
+        }
+
         connect( m_afterPartitionSplitterWidget,
                  &PartitionSplitterWidget::partitionResized,
                  this,
@@ -1096,51 +1101,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
 
         if ( !m_isEfi )
         {
-            QWidget* eraseWidget = new QWidget;
-
-            QHBoxLayout* eraseLayout = new QHBoxLayout;
-            eraseWidget->setLayout( eraseLayout );
-            eraseLayout->setContentsMargins( 0, 0, 0, 0 );
-            QLabel* eraseBootloaderLabel = new QLabel( eraseWidget );
-            eraseLayout->addWidget( eraseBootloaderLabel );
-            eraseBootloaderLabel->setText( tr( "Boot loader location:" ) );
-
-            m_bootloaderComboBox = createBootloaderComboBox( eraseWidget );
-            connect( m_core->bootLoaderModel(),
-                     &QAbstractItemModel::modelReset,
-                     [ this ]()
-                     {
-                         if ( !m_bootloaderComboBox.isNull() )
-                         {
-                             Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox,
-                                                                   m_core->bootLoaderInstallPath() );
-                         }
-                     } );
-            connect(
-                m_core,
-                &PartitionCoreModule::deviceReverted,
-                this,
-                [ this ]( Device* dev )
-                {
-                    Q_UNUSED( dev )
-                    if ( !m_bootloaderComboBox.isNull() )
-                    {
-                        if ( m_bootloaderComboBox->model() != m_core->bootLoaderModel() )
-                        {
-                            m_bootloaderComboBox->setModel( m_core->bootLoaderModel() );
-                        }
-
-                        m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex );
-                    }
-                },
-                Qt::QueuedConnection );
-            // ^ Must be Queued so it's sure to run when the widget is already visible.
-
-            eraseLayout->addWidget( m_bootloaderComboBox );
-            eraseBootloaderLabel->setBuddy( m_bootloaderComboBox );
-            eraseLayout->addStretch();
-
-            layout->addWidget( eraseWidget );
+            layout->addWidget( createBootloaderPanel() );
         }
 
         m_previewAfterFrame->show();
@@ -1254,35 +1215,6 @@ ChoicePage::setupEfiSystemPartitionSelector()
     }
 }
 
-
-QComboBox*
-ChoicePage::createBootloaderComboBox( QWidget* parent )
-{
-    QComboBox* comboForBootloader = new QComboBox( parent );
-    comboForBootloader->setModel( m_core->bootLoaderModel() );
-
-    // When the chosen bootloader device changes, we update the choice in the PCM
-    connect( comboForBootloader,
-             QOverload< int >::of( &QComboBox::currentIndexChanged ),
-             this,
-             [ this ]( int newIndex )
-             {
-                 QComboBox* bootloaderCombo = qobject_cast< QComboBox* >( sender() );
-                 if ( bootloaderCombo )
-                 {
-                     QVariant var = bootloaderCombo->itemData( newIndex, BootLoaderModel::BootLoaderPathRole );
-                     if ( !var.isValid() )
-                     {
-                         return;
-                     }
-                     m_core->setBootLoaderInstallPath( var.toString() );
-                 }
-             } );
-
-    return comboForBootloader;
-}
-
-
 static inline void
 force_uncheck( QButtonGroup* grp, PrettyRadioButton* button )
 {
@@ -1361,14 +1293,12 @@ ChoicePage::setupActions()
     bool isInactiveRAID = false;
     bool matchTableType = false;
 
-#ifdef WITH_KPMCORE4API
     if ( currentDevice->type() == Device::Type::SoftwareRAID_Device
          && static_cast< SoftwareRAID* >( currentDevice )->status() == SoftwareRAID::Status::Inactive )
     {
         cDebug() << Logger::SubEntry << "part of an inactive RAID device";
         isInactiveRAID = true;
     }
-#endif
 
     PartitionTable::TableType tableType = PartitionTable::unknownTableType;
     if ( currentDevice->partitionTable() )
@@ -1746,3 +1676,72 @@ ChoicePage::setLastSelectedDeviceIndex( int index )
     m_lastSelectedDeviceIndex = index;
     m_drivesCombo->setCurrentIndex( m_lastSelectedDeviceIndex );
 }
+
+QWidget*
+ChoicePage::createBootloaderPanel()
+{
+    QWidget* panelWidget = new QWidget;
+
+    QHBoxLayout* mainLayout = new QHBoxLayout;
+    panelWidget->setLayout( mainLayout );
+    mainLayout->setContentsMargins( 0, 0, 0, 0 );
+    QLabel* widgetLabel = new QLabel( panelWidget );
+    mainLayout->addWidget( widgetLabel );
+    widgetLabel->setText( tr( "Boot loader location:" ) );
+
+    QComboBox* comboForBootloader = new QComboBox( panelWidget );
+    comboForBootloader->setModel( m_core->bootLoaderModel() );
+
+    // When the chosen bootloader device changes, we update the choice in the PCM
+    connect( comboForBootloader,
+             QOverload< int >::of( &QComboBox::currentIndexChanged ),
+             this,
+             [ this ]( int newIndex )
+             {
+                 QComboBox* bootloaderCombo = qobject_cast< QComboBox* >( sender() );
+                 if ( bootloaderCombo )
+                 {
+                     QVariant var = bootloaderCombo->itemData( newIndex, BootLoaderModel::BootLoaderPathRole );
+                     if ( !var.isValid() )
+                     {
+                         return;
+                     }
+                     m_core->setBootLoaderInstallPath( var.toString() );
+                 }
+             } );
+    m_bootloaderComboBox = comboForBootloader;
+
+    connect( m_core->bootLoaderModel(),
+             &QAbstractItemModel::modelReset,
+             [ this ]()
+             {
+                 if ( !m_bootloaderComboBox.isNull() )
+                 {
+                     Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() );
+                 }
+             } );
+    connect(
+        m_core,
+        &PartitionCoreModule::deviceReverted,
+        this,
+        [ this ]( Device* )
+        {
+            if ( !m_bootloaderComboBox.isNull() )
+            {
+                if ( m_bootloaderComboBox->model() != m_core->bootLoaderModel() )
+                {
+                    m_bootloaderComboBox->setModel( m_core->bootLoaderModel() );
+                }
+
+                m_bootloaderComboBox->setCurrentIndex( m_lastSelectedDeviceIndex );
+            }
+        },
+        Qt::QueuedConnection );
+    // ^ Must be Queued so it's sure to run when the widget is already visible.
+
+    mainLayout->addWidget( m_bootloaderComboBox );
+    widgetLabel->setBuddy( m_bootloaderComboBox );
+    mainLayout->addStretch();
+
+    return panelWidget;
+}
diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h
index 12222ac63..ea346f5ad 100644
--- a/src/modules/partition/gui/ChoicePage.h
+++ b/src/modules/partition/gui/ChoicePage.h
@@ -30,8 +30,11 @@ class QListView;
 
 namespace Calamares
 {
+namespace Widgets
+{
 class PrettyRadioButton;
 }
+}  // namespace Calamares
 
 class Config;
 class DeviceInfoWidget;
@@ -108,7 +111,12 @@ private:
     void updateNextEnabled();
     void setupChoices();
     void checkInstallChoiceRadioButton( Config::InstallChoice choice );  ///< Sets the chosen button to "on"
-    QComboBox* createBootloaderComboBox( QWidget* parentButton );
+    /** @brief Create a panel with "boot loader location:"
+     *
+     * Panel + dropdown and handling for model updates. Returns a pointer
+     * to the panel's widget.
+     */
+    QWidget* createBootloaderPanel();
     Device* selectedDevice();
 
     /* Change the UI depending on the device selected. */
@@ -137,10 +145,10 @@ private:
     QComboBox* m_drivesCombo;
 
     QButtonGroup* m_grp;
-    Calamares::PrettyRadioButton* m_alongsideButton;
-    Calamares::PrettyRadioButton* m_eraseButton;
-    Calamares::PrettyRadioButton* m_replaceButton;
-    Calamares::PrettyRadioButton* m_somethingElseButton;
+    Calamares::Widgets::PrettyRadioButton* m_alongsideButton;
+    Calamares::Widgets::PrettyRadioButton* m_eraseButton;
+    Calamares::Widgets::PrettyRadioButton* m_replaceButton;
+    Calamares::Widgets::PrettyRadioButton* m_somethingElseButton;
     QComboBox* m_eraseSwapChoiceComboBox = nullptr;  // UI, see also Config's swap choice
     QComboBox* m_eraseFsTypesChoiceComboBox = nullptr;  // UI, see also Config's erase-mode FS
 
diff --git a/src/modules/partition/gui/DeviceInfoWidget.cpp b/src/modules/partition/gui/DeviceInfoWidget.cpp
index 39d9413e1..05a8c4b63 100644
--- a/src/modules/partition/gui/DeviceInfoWidget.cpp
+++ b/src/modules/partition/gui/DeviceInfoWidget.cpp
@@ -100,9 +100,7 @@ DeviceInfoWidget::retranslateUi()
                             "that makes a file accessible as a block device. "
                             "This kind of setup usually only contains a single filesystem." );
         break;
-#if defined( WITH_KPMCORE42API )
     case PartitionTable::none:
-#endif
     case PartitionTable::unknownTableType:
         typeString = " ? ";
         toolTipString = tr( "This installer cannot detect a partition table on the "
diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index 0ed18a96e..f02c5607d 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -260,7 +260,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
                 QString description = tr( "Partition %1 could not be decrypted "
                                           "with the given passphrase."
                                           "

"
-                                          "Edit the partition again and give the correct passphrase"
+                                          "Edit the partition again and give the correct passphrase "
                                           "or delete and create a new encrypted partition." )
                                           .arg( m_partition->partitionPath() );
 
diff --git a/src/modules/partition/gui/PartitionLabelsView.cpp b/src/modules/partition/gui/PartitionLabelsView.cpp
index e3a50c576..66b1ba62a 100644
--- a/src/modules/partition/gui/PartitionLabelsView.cpp
+++ b/src/modules/partition/gui/PartitionLabelsView.cpp
@@ -29,7 +29,7 @@
 using namespace CalamaresUtils::Units;
 
 static const int LAYOUT_MARGIN = 4;
-static const int LABEL_PARTITION_SQUARE_MARGIN = qMax( QFontMetrics( CalamaresUtils::defaultFont() ).ascent() - 2, 18 );
+static const int LABEL_PARTITION_SQUARE_MARGIN = qMax( CalamaresUtils::defaultFontHeight() - 2, 18 );
 static const int LABELS_MARGIN = LABEL_PARTITION_SQUARE_MARGIN;
 static const int CORNER_RADIUS = 2;
 
diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp
index 0b3cf2478..25e6a27ab 100644
--- a/src/modules/partition/gui/PartitionPage.cpp
+++ b/src/modules/partition/gui/PartitionPage.cpp
@@ -42,9 +42,7 @@
 // KPMcore
 #include 
 #include 
-#ifdef WITH_KPMCORE4API
 #include 
-#endif
 #include 
 #include 
 
@@ -179,14 +177,12 @@ PartitionPage::updateButtons()
         {
             allow_create_table = true;
 
-#ifdef WITH_KPMCORE4API
             if ( device->type() == Device::Type::SoftwareRAID_Device
                  && static_cast< SoftwareRAID* >( device )->status() == SoftwareRAID::Status::Inactive )
             {
                 allow_create_table = false;
                 allow_create = false;
             }
-#endif
         }
         else
         {
diff --git a/src/modules/partition/gui/PartitionSplitterWidget.cpp b/src/modules/partition/gui/PartitionSplitterWidget.cpp
index e52afaa74..139eef168 100644
--- a/src/modules/partition/gui/PartitionSplitterWidget.cpp
+++ b/src/modules/partition/gui/PartitionSplitterWidget.cpp
@@ -35,6 +35,48 @@ static const int VIEW_HEIGHT
 static const int CORNER_RADIUS = 3;
 static const int EXTENDED_PARTITION_MARGIN = qMax( 4, VIEW_HEIGHT / 6 );
 
+/** @brief Applies @p operation to each item
+ *
+ * A PartitionSplitterItem can contain a tree of items (each item has its
+ * own list of children) so recurse over all the children. Returns a count
+ * of how many items were affected.
+ */
+static int
+countTransform( QVector< PartitionSplitterItem >& items,
+                const std::function< bool( PartitionSplitterItem& ) >& operation )
+{
+    int opCount = 0;
+    for ( auto it = items.begin(); it != items.end(); ++it )
+    {
+        if ( operation( *it ) )
+        {
+            opCount++;
+        }
+
+        opCount += countTransform( it->children, operation );
+    }
+    return opCount;
+}
+
+static PartitionSplitterItem
+findTransform( QVector< PartitionSplitterItem >& items, std::function< bool( PartitionSplitterItem& ) > condition )
+{
+    for ( auto it = items.begin(); it != items.end(); ++it )
+    {
+        if ( condition( *it ) )
+        {
+            return *it;
+        }
+
+        PartitionSplitterItem candidate = findTransform( it->children, condition );
+        if ( !candidate.isNull() )
+        {
+            return candidate;
+        }
+    }
+    return PartitionSplitterItem::null();
+}
+
 PartitionSplitterWidget::PartitionSplitterWidget( QWidget* parent )
     : QWidget( parent )
     , m_itemToResize( PartitionSplitterItem::null() )
@@ -159,16 +201,16 @@ PartitionSplitterWidget::setSplitPartition( const QString& path, qint64 minSize,
         m_itemToResizePath.clear();
     }
 
-    PartitionSplitterItem itemToResize = _findItem( m_items,
-                                                    [ path ]( PartitionSplitterItem& item ) -> bool
-                                                    {
-                                                        if ( path == item.itemPath )
+    PartitionSplitterItem itemToResize = findTransform( m_items,
+                                                        [ path ]( PartitionSplitterItem& item ) -> bool
                                                         {
-                                                            item.status = PartitionSplitterItem::Resizing;
-                                                            return true;
-                                                        }
-                                                        return false;
-                                                    } );
+                                                            if ( path == item.itemPath )
+                                                            {
+                                                                item.status = PartitionSplitterItem::Resizing;
+                                                                return true;
+                                                            }
+                                                            return false;
+                                                        } );
 
     if ( itemToResize.isNull() )
     {
@@ -186,16 +228,16 @@ PartitionSplitterWidget::setSplitPartition( const QString& path, qint64 minSize,
 
     qint64 newSize = m_itemToResize.size - preferredSize;
     m_itemToResize.size = preferredSize;
-    int opCount = _eachItem( m_items,
-                             [ preferredSize ]( PartitionSplitterItem& item ) -> bool
-                             {
-                                 if ( item.status == PartitionSplitterItem::Resizing )
-                                 {
-                                     item.size = preferredSize;
-                                     return true;
-                                 }
-                                 return false;
-                             } );
+    int opCount = countTransform( m_items,
+                                  [ preferredSize ]( PartitionSplitterItem& item ) -> bool
+                                  {
+                                      if ( item.status == PartitionSplitterItem::Resizing )
+                                      {
+                                          item.size = preferredSize;
+                                          return true;
+                                      }
+                                      return false;
+                                  } );
     cDebug() << "each splitter item opcount:" << opCount;
     m_itemMinSize = minSize;
     m_itemMaxSize = maxSize;
@@ -362,21 +404,21 @@ PartitionSplitterWidget::mouseMoveEvent( QMouseEvent* event )
 
         m_itemToResize.size = qRound64( span * percent );
         m_itemToResizeNext.size -= m_itemToResize.size - oldsize;
-        _eachItem( m_items,
-                   [ this ]( PartitionSplitterItem& item ) -> bool
-                   {
-                       if ( item.status == PartitionSplitterItem::Resizing )
-                       {
-                           item.size = m_itemToResize.size;
-                           return true;
-                       }
-                       else if ( item.status == PartitionSplitterItem::ResizingNext )
-                       {
-                           item.size = m_itemToResizeNext.size;
-                           return true;
-                       }
-                       return false;
-                   } );
+        countTransform( m_items,
+                        [ this ]( PartitionSplitterItem& item ) -> bool
+                        {
+                            if ( item.status == PartitionSplitterItem::Resizing )
+                            {
+                                item.size = m_itemToResize.size;
+                                return true;
+                            }
+                            else if ( item.status == PartitionSplitterItem::ResizingNext )
+                            {
+                                item.size = m_itemToResizeNext.size;
+                                return true;
+                            }
+                            return false;
+                        } );
 
         repaint();
 
@@ -553,46 +595,6 @@ PartitionSplitterWidget::drawPartitions( QPainter* painter,
     }
 }
 
-
-PartitionSplitterItem
-PartitionSplitterWidget::_findItem( QVector< PartitionSplitterItem >& items,
-                                    std::function< bool( PartitionSplitterItem& ) > condition ) const
-{
-    for ( auto it = items.begin(); it != items.end(); ++it )
-    {
-        if ( condition( *it ) )
-        {
-            return *it;
-        }
-
-        PartitionSplitterItem candidate = _findItem( it->children, condition );
-        if ( !candidate.isNull() )
-        {
-            return candidate;
-        }
-    }
-    return PartitionSplitterItem::null();
-}
-
-
-int
-PartitionSplitterWidget::_eachItem( QVector< PartitionSplitterItem >& items,
-                                    std::function< bool( PartitionSplitterItem& ) > operation ) const
-{
-    int opCount = 0;
-    for ( auto it = items.begin(); it != items.end(); ++it )
-    {
-        if ( operation( *it ) )
-        {
-            opCount++;
-        }
-
-        opCount += _eachItem( it->children, operation );
-    }
-    return opCount;
-}
-
-
 QPair< QVector< PartitionSplitterItem >, qreal >
 PartitionSplitterWidget::computeItemsVector( const QVector< PartitionSplitterItem >& originalItems ) const
 {
diff --git a/src/modules/partition/gui/PartitionSplitterWidget.h b/src/modules/partition/gui/PartitionSplitterWidget.h
index 474ea313e..53f5b0b37 100644
--- a/src/modules/partition/gui/PartitionSplitterWidget.h
+++ b/src/modules/partition/gui/PartitionSplitterWidget.h
@@ -72,12 +72,6 @@ private:
     void drawSection( QPainter* painter, const QRect& rect_, int x, int width, const PartitionSplitterItem& item );
     void drawResizeHandle( QPainter* painter, const QRect& rect_, int x );
 
-    PartitionSplitterItem _findItem( QVector< PartitionSplitterItem >& items,
-                                     std::function< bool( PartitionSplitterItem& ) > condition ) const;
-
-    int _eachItem( QVector< PartitionSplitterItem >& items,
-                   std::function< bool( PartitionSplitterItem& ) > operation ) const;
-
     QPair< QVector< PartitionSplitterItem >, qreal >
     computeItemsVector( const QVector< PartitionSplitterItem >& originalItems ) const;
 
diff --git a/src/modules/partition/gui/ScanningDialog.cpp b/src/modules/partition/gui/ScanningDialog.cpp
index 56133e21f..7dd85ff86 100644
--- a/src/modules/partition/gui/ScanningDialog.cpp
+++ b/src/modules/partition/gui/ScanningDialog.cpp
@@ -10,7 +10,7 @@
 
 #include "ScanningDialog.h"
 
-#include "3rdparty/waitingspinnerwidget.h"
+#include "widgets/waitingspinnerwidget.h"
 
 #include 
 #include 
diff --git a/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp
index 9541c000a..4cdb2532e 100644
--- a/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp
+++ b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp
@@ -9,6 +9,8 @@
 
 #include "ChangeFilesystemLabelJob.h"
 
+#include "core/KPMHelpers.h"
+
 #include "utils/Logger.h"
 
 #include 
@@ -58,6 +60,17 @@ ChangeFilesystemLabelJob::exec()
         return Calamares::JobResult::ok();
     }
 
+    // Check for luks device
+    if ( partition()->fileSystem().type() == FileSystem::Luks )
+    {
+        if ( KPMHelpers::cryptLabel( partition(), m_label ) )
+        {
+            return Calamares::JobResult::ok();
+        }
+        return Calamares::JobResult::error(
+            tr( "The installer failed to update partition table on disk '%1'." ).arg( m_device->name() ) );
+    }
+
     Report report( nullptr );
     SetFileSystemLabelOperation op( *partition(), m_label );
     op.setStatus( Operation::StatusRunning );
diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp
index fe7c6f350..19a04a2de 100644
--- a/src/modules/partition/jobs/CreatePartitionJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionJob.cpp
@@ -111,7 +111,6 @@ CreatePartitionJob::CreatePartitionJob( Device* device, Partition* partition )
 static QString
 prettyGptType( const Partition* partition )
 {
-#ifdef WITH_KPMCORE42API
     static const QMap< QString, QString > gptTypePrettyStrings = {
         { "44479540-f297-41b2-9af7-d131d5f0458a", "Linux Root Partition (x86)" },
         { "4f68bce3-e8cd-4db1-96e7-fbcaf984b709", "Linux Root Partition (x86-64)" },
@@ -146,9 +145,6 @@ prettyGptType( const Partition* partition )
 
     auto type = partition->type();
     return gptTypePrettyStrings.value( type.toLower(), type );
-#else
-    return QString();
-#endif
 }
 
 static QString
diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
index 5be353113..d734485f0 100644
--- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp
+++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
@@ -88,11 +88,9 @@ mapForPartition( Partition* partition, const QString& uuid )
     map[ "mountPoint" ] = PartitionInfo::mountPoint( partition );
     map[ "fsName" ] = userVisibleFS( partition->fileSystem() );
     map[ "fs" ] = untranslatedFS( partition->fileSystem() );
-#ifdef WITH_KPMCORE42API
     map[ "parttype" ] = partition->type();
     map[ "partattrs" ] = partition->attributes();
     map[ "features" ] = partition->fileSystem().features();
-#endif
     if ( partition->fileSystem().type() == FileSystem::Luks
          && dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() )
     {
diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt
index da017d96f..26a1d83f9 100644
--- a/src/modules/partition/tests/CMakeLists.txt
+++ b/src/modules/partition/tests/CMakeLists.txt
@@ -3,9 +3,9 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-find_package( Qt5 COMPONENTS Gui REQUIRED )
+find_package(Qt5 COMPONENTS Gui REQUIRED)
 
-set( PartitionModule_SOURCE_DIR .. )
+set(PartitionModule_SOURCE_DIR ..)
 
 include_directories(
     ${Qt5Gui_INCLUDE_DIRS}
@@ -25,22 +25,17 @@ calamares_add_test(
         ${PartitionModule_SOURCE_DIR}/jobs/DeletePartitionJob.cpp
         ${PartitionModule_SOURCE_DIR}/jobs/PartitionJob.cpp
         ${PartitionModule_SOURCE_DIR}/jobs/ResizePartitionJob.cpp
-    LIBRARIES
-        kpmcore
+    LIBRARIES kpmcore
     DEFINITIONS ${_partition_defs}
 )
 
 calamares_add_test(
     partitionclearmountsjobtest
-    SOURCES
-        ${PartitionModule_SOURCE_DIR}/jobs/ClearMountsJob.cpp
-        ClearMountsJobTests.cpp
-    LIBRARIES
-        kpmcore
+    SOURCES ${PartitionModule_SOURCE_DIR}/jobs/ClearMountsJob.cpp ClearMountsJobTests.cpp
+    LIBRARIES kpmcore
     DEFINITIONS ${_partition_defs}
 )
 
-
 calamares_add_test(
     partitioncreatelayoutstest
     SOURCES
@@ -50,26 +45,19 @@ calamares_add_test(
         ${PartitionModule_SOURCE_DIR}/core/PartitionLayout.cpp
         ${PartitionModule_SOURCE_DIR}/core/PartUtils.cpp
         ${PartitionModule_SOURCE_DIR}/core/DeviceModel.cpp
-    LIBRARIES
-        kpmcore
-        Calamares::calamaresui
+    LIBRARIES kpmcore Calamares::calamaresui
     DEFINITIONS ${_partition_defs}
 )
 
 calamares_add_test(
     partitionautomounttest
-    SOURCES
-        ${PartitionModule_SOURCE_DIR}/jobs/AutoMountManagementJob.cpp
-        AutoMountTests.cpp
+    SOURCES ${PartitionModule_SOURCE_DIR}/jobs/AutoMountManagementJob.cpp AutoMountTests.cpp
     DEFINITIONS ${_partition_defs}
 )
 
 calamares_add_test(
     partitiondevicestest
-    SOURCES
-        DevicesTests.cpp
-        ${PartitionModule_SOURCE_DIR}/core/DeviceList.cpp
-    LIBRARIES
-        kpmcore
+    SOURCES DevicesTests.cpp ${PartitionModule_SOURCE_DIR}/core/DeviceList.cpp
+    LIBRARIES kpmcore
     DEFINITIONS ${_partition_defs}
 )
diff --git a/src/modules/partition/tests/CreateLayoutsTests.cpp b/src/modules/partition/tests/CreateLayoutsTests.cpp
index 68b839e08..b83f71a26 100644
--- a/src/modules/partition/tests/CreateLayoutsTests.cpp
+++ b/src/modules/partition/tests/CreateLayoutsTests.cpp
@@ -125,7 +125,6 @@ CreateLayoutsTests::testMixedSizePartition()
     QCOMPARE( partitions[ 2 ]->length(), ( ( 5_GiB - 5_MiB ) / 2 ) / LOGICAL_SIZE );
 }
 
-#ifdef WITH_KPMCORE4API
 // TODO: Get a clean way to instantiate a test Device from KPMCore
 class DevicePrivate
 {
@@ -150,11 +149,5 @@ TestDevice::TestDevice( const QString& name, const qint64 logicalSectorSize, con
               Device::Type::Unknown_Device )
 {
 }
-#else
-TestDevice::TestDevice( const QString& name, const qint64 logicalSectorSize, const qint64 totalLogicalSectors )
-    : Device( name, QString( "node" ), logicalSectorSize, totalLogicalSectors, QString(), Device::Type::Unknown_Device )
-{
-}
-#endif
 
 TestDevice::~TestDevice() {}
diff --git a/src/modules/partition/tests/DevicesTests.cpp b/src/modules/partition/tests/DevicesTests.cpp
index c63d7476d..ec6bdadff 100644
--- a/src/modules/partition/tests/DevicesTests.cpp
+++ b/src/modules/partition/tests/DevicesTests.cpp
@@ -52,12 +52,7 @@ DevicesTests::testKPMScanDevices()
     cDebug() << "Getting devices via KPMCore";
     CoreBackend* backend = CoreBackendManager::self()->backend();
     QVERIFY( backend );
-#if defined( WITH_KPMCORE4API )
-    auto flags = ScanFlag( ~0 );
-#else
-    auto flags = true;
-#endif
-    auto devices = backend->scanDevices( flags );  // These flags try to get "all"
+    auto devices = backend->scanDevices( ScanFlag( ~0 ) );  // These flags try to get "all"
     cDebug() << Logger::SubEntry << "Done getting devices.";
 
     if ( !m_isRoot )
diff --git a/src/modules/plasmalnf/CMakeLists.txt b/src/modules/plasmalnf/CMakeLists.txt
index 8ae205aed..9e87b5fec 100644
--- a/src/modules/plasmalnf/CMakeLists.txt
+++ b/src/modules/plasmalnf/CMakeLists.txt
@@ -7,28 +7,19 @@ find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
 
 # Requires a sufficiently recent Plasma framework, but also
 # needs a runtime support component (which we don't test for).
-set( lnf_ver 5.41 )
+set(lnf_ver 5.41)
 
-find_package( KF5Config ${lnf_ver} )
-set_package_properties(
-    KF5Config PROPERTIES
-    PURPOSE "For finding default Plasma Look-and-Feel"
-)
+find_package(KF5Config ${lnf_ver})
+set_package_properties(KF5Config PROPERTIES PURPOSE "For finding default Plasma Look-and-Feel")
 
-find_package( KF5Plasma ${lnf_ver} )
-set_package_properties(
-    KF5Plasma PROPERTIES
-    PURPOSE "For Plasma Look-and-Feel selection"
-)
+find_package(KF5Plasma ${lnf_ver})
+set_package_properties(KF5Plasma PROPERTIES PURPOSE "For Plasma Look-and-Feel selection")
 
-find_package( KF5Package ${lnf_ver} )
-set_package_properties(
-    KF5Package PROPERTIES
-    PURPOSE "For Plasma Look-and-Feel selection"
-)
+find_package(KF5Package ${lnf_ver})
+set_package_properties(KF5Package PROPERTIES PURPOSE "For Plasma Look-and-Feel selection")
 
-if ( KF5Plasma_FOUND AND KF5Package_FOUND )
-    calamares_add_plugin( plasmalnf
+if(KF5Plasma_FOUND AND KF5Package_FOUND)
+    calamares_add_plugin(plasmalnf
         TYPE viewmodule
         EXPORT_MACRO PLUGINDLLEXPORT_PRO
         COMPILE_DEFINITIONS
@@ -48,7 +39,7 @@ if ( KF5Plasma_FOUND AND KF5Package_FOUND )
             KF5::Plasma
         SHARED_LIB
     )
-    if ( KF5Config_FOUND )
+    if(KF5Config_FOUND)
         target_compile_definitions(calamares_viewmodule_plasmalnf PRIVATE WITH_KCONFIG)
     endif()
 else()
diff --git a/src/modules/preservefiles/CMakeLists.txt b/src/modules/preservefiles/CMakeLists.txt
index 5df637321..b11b1310c 100644
--- a/src/modules/preservefiles/CMakeLists.txt
+++ b/src/modules/preservefiles/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-calamares_add_plugin( preservefiles
+calamares_add_plugin(preservefiles
     TYPE job
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
@@ -14,9 +14,4 @@ calamares_add_plugin( preservefiles
     EMERGENCY
 )
 
-calamares_add_test(
-    preservefilestest
-    SOURCES
-        Item.cpp
-        Tests.cpp
-)
+calamares_add_test(preservefilestest SOURCES Item.cpp Tests.cpp)
diff --git a/src/modules/removeuser/CMakeLists.txt b/src/modules/removeuser/CMakeLists.txt
index 7663b3472..eaaf20157 100644
--- a/src/modules/removeuser/CMakeLists.txt
+++ b/src/modules/removeuser/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-calamares_add_plugin( removeuser
+calamares_add_plugin(removeuser
     TYPE job
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
diff --git a/src/modules/shellprocess/CMakeLists.txt b/src/modules/shellprocess/CMakeLists.txt
index ac6630c6d..8ac444fb6 100644
--- a/src/modules/shellprocess/CMakeLists.txt
+++ b/src/modules/shellprocess/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-calamares_add_plugin( shellprocess
+calamares_add_plugin(shellprocess
     TYPE job
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
@@ -11,10 +11,4 @@ calamares_add_plugin( shellprocess
     SHARED_LIB
 )
 
-calamares_add_test(
-    shellprocesstest
-    SOURCES
-        Tests.cpp
-    LIBRARIES
-        yamlcpp::yamlcpp
-)
+calamares_add_test(shellprocesstest SOURCES Tests.cpp LIBRARIES yamlcpp::yamlcpp)
diff --git a/src/modules/shellprocess/Tests.cpp b/src/modules/shellprocess/Tests.cpp
index c1489c1ab..f8727ab36 100644
--- a/src/modules/shellprocess/Tests.cpp
+++ b/src/modules/shellprocess/Tests.cpp
@@ -146,14 +146,14 @@ script:
     QVariant plainScript = CalamaresUtils::yamlMapToVariant( doc ).value( "script" );
     QVariant rootScript = CalamaresUtils::yamlMapToVariant( YAML::Load( R"(---
 script:
-    - "ls @@ROOT@@"
+    - "ls ${ROOT}"
 )" ) )
                               .value( "script" );
     QVariant userScript = CalamaresUtils::yamlMapToVariant( YAML::Load( R"(---
 script:
-    - mktemp -d @@ROOT@@/calatestXXXXXXXX
-    - "chown @@USER@@ @@ROOT@@/calatest*"
-    - rm -rf @@ROOT@@/calatest*
+    - mktemp -d ${ROOT}/calatestXXXXXXXX
+    - "chown ${USER} ${ROOT}/calatest*"
+    - rm -rf ${ROOT}/calatest*
 )" ) )
                               .value( "script" );
 
@@ -167,13 +167,13 @@ script:
 
     qDebug() << "Expect WARNING, ERROR, WARNING";
 
-    // Doesn't use @@ROOT@@, so no failures
+    // Doesn't use ${ROOT}, so no failures
     QVERIFY( bool( CommandList( plainScript, false, 10s ).run() ) );
 
-    // Doesn't use @@ROOT@@, but does chroot, so fails
+    // Doesn't use ${ROOT}, but does chroot, so fails
     QVERIFY( !bool( CommandList( plainScript, true, 10s ).run() ) );
 
-    // Does use @@ROOT@@, which is not set, so fails
+    // Does use ${ROOT}, which is not set, so fails
     QVERIFY( !bool( CommandList( rootScript, false, 10s ).run() ) );
     // .. fails for two reasons
     QVERIFY( !bool( CommandList( rootScript, true, 10s ).run() ) );
@@ -190,7 +190,14 @@ script:
     // But no user set yet
     QVERIFY( !bool( CommandList( userScript, false, 10s ).run() ) );
 
-    // Now play dangerous games with shell expansion
+    // Show that shell expansion is now quoted.
     gs->insert( "username", "`id -u`" );
-    QVERIFY( bool( CommandList( userScript, false, 10s ).run() ) );
+    {
+        CalamaresUtils::CommandLine c { QStringLiteral( "chown ${USER}" ), std::chrono::seconds( 0 ) };
+        QCOMPARE( c.expand().command(), QStringLiteral( "chown '`id -u`'" ) );
+    }
+    // Now play dangerous games with shell expansion -- except the internal command is now
+    // quoted, so this fails because it's **highly** unlikely that the literal string
+    // "`id -u`" is a valid username.
+    QVERIFY( !bool( CommandList( userScript, false, 10s ).run() ) );
 }
diff --git a/src/modules/shellprocess/Tests.h b/src/modules/shellprocess/Tests.h
index cabeaada2..c44fa853b 100644
--- a/src/modules/shellprocess/Tests.h
+++ b/src/modules/shellprocess/Tests.h
@@ -31,7 +31,7 @@ private Q_SLOTS:
     void testProcessFromObject();
     // Create from a complex YAML list
     void testProcessListFromObject();
-    // Check @@ROOT@@ substitution
+    // Check variable substitution
     void testRootSubstitution();
 };
 
diff --git a/src/modules/shellprocess/shellprocess.conf b/src/modules/shellprocess/shellprocess.conf
index 07947f38f..9ff83221e 100644
--- a/src/modules/shellprocess/shellprocess.conf
+++ b/src/modules/shellprocess/shellprocess.conf
@@ -7,11 +7,13 @@
 # If the top-level key *dontChroot* is true, then the commands
 # are executed in the context of the live system, otherwise
 # in the context of the target system. In all of the commands,
-# the following substitutions will take place:
-#  - `@@ROOT@@` is replaced by the root mount point of the **target**
-#    system from the point of view of the command (for chrooted
-#    commands, that will be */*).
-#  - `@@USER@@` is replaced by the username, set on the user page.
+# the following variable expansions will take place:
+#  - `ROOT` is replaced by the root mount point of the **target**
+#    system from the point of view of the command (when run in the target
+#    system, e.g. when *dontChroot* is false, that will be `/`).
+#  - `USER` is replaced by the username, set on the user page.
+#
+# Variables are written as `${var}`, e.g. `${ROOT}`.
 #
 # The (global) timeout for the command list can be set with
 # the *timeout* key. The value is a time in seconds, default
@@ -72,7 +74,7 @@ dontChroot: false
 # ignored; the slowloris command has a different timeout from the
 # other commands in the list):
 script:
-    - "-touch @@ROOT@@/tmp/thingy"
+    - "-touch ${ROOT}/tmp/thingy"
     - "/usr/bin/true"
     - command: "/usr/local/bin/slowloris"
       timeout: 3600
diff --git a/src/modules/summary/CMakeLists.txt b/src/modules/summary/CMakeLists.txt
index e3c1a381c..16f98ebb4 100644
--- a/src/modules/summary/CMakeLists.txt
+++ b/src/modules/summary/CMakeLists.txt
@@ -3,8 +3,8 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
-calamares_add_plugin( summary
+include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
+calamares_add_plugin(summary
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
diff --git a/src/modules/summaryq/CMakeLists.txt b/src/modules/summaryq/CMakeLists.txt
index 8aac1bc2f..071c344ef 100644
--- a/src/modules/summaryq/CMakeLists.txt
+++ b/src/modules/summaryq/CMakeLists.txt
@@ -3,15 +3,15 @@
 #   SPDX-FileCopyrightText: 2021 Anke Boersma 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-if( NOT WITH_QML )
+if(NOT WITH_QML)
     calamares_skip_module( "summaryq (QML is not supported in this build)" )
     return()
 endif()
 
-set( _summary ${CMAKE_CURRENT_SOURCE_DIR}/../summary )
-include_directories( ${_summary} )
+set(_summary ${CMAKE_CURRENT_SOURCE_DIR}/../summary)
+include_directories(${_summary})
 
-calamares_add_plugin( summaryq
+calamares_add_plugin(summaryq
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
diff --git a/src/modules/tracking/CMakeLists.txt b/src/modules/tracking/CMakeLists.txt
index a878961b0..0dbbeb942 100644
--- a/src/modules/tracking/CMakeLists.txt
+++ b/src/modules/tracking/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-calamares_add_plugin( tracking
+calamares_add_plugin(tracking
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
@@ -16,11 +16,8 @@ calamares_add_plugin( tracking
     RESOURCES
         page_trackingstep.qrc
     SHARED_LIB
+    LINK_LIBRARIES
+        KF5::CoreAddons
 )
 
-calamares_add_test(
-    trackingtest
-    SOURCES
-        Tests.cpp
-        Config.cpp
-)
+calamares_add_test(trackingtest SOURCES Tests.cpp Config.cpp)
diff --git a/src/modules/umount/CMakeLists.txt b/src/modules/umount/CMakeLists.txt
index d72847007..09e6a085d 100644
--- a/src/modules/umount/CMakeLists.txt
+++ b/src/modules/umount/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2021 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-calamares_add_plugin( umount
+calamares_add_plugin(umount
     TYPE job
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
@@ -12,8 +12,4 @@ calamares_add_plugin( umount
     EMERGENCY
 )
 
-calamares_add_test(
-    umounttest
-    SOURCES
-        Tests.cpp
-)
+calamares_add_test(umounttest SOURCES Tests.cpp)
diff --git a/src/modules/umount/UmountJob.cpp b/src/modules/umount/UmountJob.cpp
index 99777d2d0..fa8f28e11 100644
--- a/src/modules/umount/UmountJob.cpp
+++ b/src/modules/umount/UmountJob.cpp
@@ -82,7 +82,7 @@ unmountTargetMounts( const QString& rootMountPoint )
 }
 
 static Calamares::JobResult
-exportZFSPools( const QString& rootMountPoint )
+exportZFSPools()
 {
     auto* gs = Calamares::JobQueue::instance()->globalStorage();
     QStringList poolNames;
@@ -142,7 +142,7 @@ UmountJob::exec()
     }
     // For ZFS systems, export the pools
     {
-        auto r = exportZFSPools( gs->value( "rootMountPoint" ).toString() );
+        auto r = exportZFSPools();
         if ( !r )
         {
             return r;
@@ -155,6 +155,7 @@ UmountJob::exec()
 void
 UmountJob::setConfigurationMap( const QVariantMap& map )
 {
+    Q_UNUSED( map )
 }
 
 CALAMARES_PLUGIN_FACTORY_DEFINITION( UmountJobFactory, registerPlugin< UmountJob >(); )
diff --git a/src/modules/unpackfs/tests/4.job b/src/modules/unpackfs/tests/4.job
index 8bc7de5ba..e6b067ddb 100644
--- a/src/modules/unpackfs/tests/4.job
+++ b/src/modules/unpackfs/tests/4.job
@@ -1,6 +1,10 @@
 # SPDX-FileCopyrightText: no
 # SPDX-License-Identifier: CC0-1.0
+#
+# Test that a "bogus" sourcefs (a filesystem kind that does not
+# exist) fails gracefully.
 ---
 unpack:
    - source: .
      sourcefs: bogus
+     destination: /
diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt
index 8203ecf08..060c9b691 100644
--- a/src/modules/users/CMakeLists.txt
+++ b/src/modules/users/CMakeLists.txt
@@ -3,39 +3,33 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus Network )
-find_package( Crypt REQUIRED )
+find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus Network)
+find_package(Crypt REQUIRED)
 
 # Add optional libraries here
-set( USER_EXTRA_LIB )
+set(USER_EXTRA_LIB)
 
-find_package( LibPWQuality )
-set_package_properties(
-    LibPWQuality PROPERTIES
-    PURPOSE "Extra checks of password quality"
-)
+find_package(LibPWQuality)
+set_package_properties(LibPWQuality PROPERTIES PURPOSE "Extra checks of password quality")
 
-if( LibPWQuality_FOUND )
-    list( APPEND USER_EXTRA_LIB ${LibPWQuality_LIBRARIES} )
-    include_directories( ${LibPWQuality_INCLUDE_DIRS} )
-    add_definitions( -DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY )
+if(LibPWQuality_FOUND)
+    list(APPEND USER_EXTRA_LIB ${LibPWQuality_LIBRARIES})
+    include_directories(${LibPWQuality_INCLUDE_DIRS})
+    add_definitions(-DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY)
 endif()
 
-find_package( ICU COMPONENTS uc i18n )
-set_package_properties(
-    ICU PROPERTIES
-    PURPOSE "Transliteration support for full name to username conversion"
-)
+find_package(ICU COMPONENTS uc i18n)
+set_package_properties(ICU PROPERTIES PURPOSE "Transliteration support for full name to username conversion")
 
-if( ICU_FOUND )
-    list( APPEND USER_EXTRA_LIB ICU::uc ICU::i18n )
-    include_directories( ${ICU_INCLUDE_DIRS} )
-    add_definitions( -DHAVE_ICU )
+if(ICU_FOUND)
+    list(APPEND USER_EXTRA_LIB ICU::uc ICU::i18n)
+    include_directories(${ICU_INCLUDE_DIRS})
+    add_definitions(-DHAVE_ICU)
 endif()
 
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
+include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
 
-set( _users_src
+set(_users_src
     # Jobs
     CreateUserJob.cpp
     MiscJobs.cpp
@@ -46,6 +40,7 @@ set( _users_src
     Config.cpp
 )
 
+# This part of the code is shared with the usersq module
 calamares_add_library(
     users_internal
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
@@ -55,11 +50,12 @@ calamares_add_library(
     SOURCES
         ${_users_src}
     LINK_LIBRARIES
+        KF5::CoreAddons
         Qt5::DBus
         ${CRYPT_LIBRARIES}
 )
 
-calamares_add_plugin( users
+calamares_add_plugin(users
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
@@ -76,42 +72,35 @@ calamares_add_plugin( users
     SHARED_LIB
 )
 
-calamares_add_test(
-    userspasswordtest
-    SOURCES
-        TestPasswordJob.cpp
-        SetPasswordJob.cpp
-    LIBRARIES
-        ${CRYPT_LIBRARIES}
-)
+calamares_add_test(userspasswordtest SOURCES TestPasswordJob.cpp SetPasswordJob.cpp LIBRARIES ${CRYPT_LIBRARIES})
 
 calamares_add_test(
     usersgroupstest
     SOURCES
         TestGroupInformation.cpp
-        ${_users_src}  # Build again with test-visibility
+        ${_users_src} # Build again with test-visibility
     LIBRARIES
-        Qt5::DBus  # HostName job can use DBus to systemd
-        ${CRYPT_LIBRARIES}  # SetPassword job uses crypt()
+        KF5::CoreAddons
+        Qt5::DBus # HostName job can use DBus to systemd
+        ${CRYPT_LIBRARIES} # SetPassword job uses crypt()
         ${USER_EXTRA_LIB}
 )
 
 calamares_add_test(
     usershostnametest
-    SOURCES
-        TestSetHostNameJob.cpp
-        SetHostNameJob.cpp
+    SOURCES TestSetHostNameJob.cpp SetHostNameJob.cpp
     LIBRARIES
-        Qt5::DBus  # HostName job can use DBus to systemd
+        Qt5::DBus # HostName job can use DBus to systemd
 )
 
 calamares_add_test(
     userstest
     SOURCES
         Tests.cpp
-        ${_users_src}  # Build again with test-visibility
+        ${_users_src} # Build again with test-visibility
     LIBRARIES
-        Qt5::DBus  # HostName job can use DBus to systemd
-        ${CRYPT_LIBRARIES}  # SetPassword job uses crypt()
+        KF5::CoreAddons
+        Qt5::DBus # HostName job can use DBus to systemd
+        ${CRYPT_LIBRARIES} # SetPassword job uses crypt()
         ${USER_EXTRA_LIB}
 )
diff --git a/src/modules/users/CheckPWQuality.h b/src/modules/users/CheckPWQuality.h
index 6d7fb56df..db2cba0af 100644
--- a/src/modules/users/CheckPWQuality.h
+++ b/src/modules/users/CheckPWQuality.h
@@ -67,9 +67,9 @@ using PasswordCheckList = QVector< PasswordCheck >;
  * may skip adding a check, and do nothing (it should log
  * an error, though).
  */
-#define _xDEFINE_CHECK_FUNC( x ) add_check_##x( PasswordCheckList& checks, const QVariant& value )
-#define DEFINE_CHECK_FUNC( x ) void _xDEFINE_CHECK_FUNC( x )
-#define DECLARE_CHECK_FUNC( x ) void _xDEFINE_CHECK_FUNC( x );
+#define DEFINE_CHECK_FUNC_impl( x ) add_check_##x( PasswordCheckList& checks, const QVariant& value )
+#define DEFINE_CHECK_FUNC( x ) void DEFINE_CHECK_FUNC_impl( x )
+#define DECLARE_CHECK_FUNC( x ) void DEFINE_CHECK_FUNC_impl( x );
 
 DECLARE_CHECK_FUNC( minLength )
 DECLARE_CHECK_FUNC( maxLength )
diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index c75e8a6e7..f55c4fd99 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -471,7 +471,7 @@ Config::setFullName( const QString& name )
         // Build login and hostname, if needed
         static QRegExp rx( "[^a-zA-Z0-9 ]", Qt::CaseInsensitive );
 
-        const QString cleanName = CalamaresUtils::removeDiacritics( transliterate( name ) )
+        const QString cleanName = Calamares::String::removeDiacritics( transliterate( name ) )
                                       .replace( QRegExp( "[-']" ), "" )
                                       .replace( rx, " " )
                                       .toLower()
@@ -874,25 +874,6 @@ either( T ( *f )( const QVariantMap&, const QString&, U ),
     }
 }
 
-// TODO:3.3: Remove
-static void
-copyLegacy( const QVariantMap& source, const QString& sourceKey, QVariantMap& target, const QString& targetKey )
-{
-    if ( source.contains( sourceKey ) )
-    {
-        if ( target.contains( targetKey ) )
-        {
-            cWarning() << "Legacy *users* key" << sourceKey << "ignored.";
-        }
-        else
-        {
-            const QVariant legacyValue = source.value( sourceKey );
-            cWarning() << "Legacy *users* key" << sourceKey << "overrides hostname-settings.";
-            target.insert( targetKey, legacyValue );
-        }
-    }
-}
-
 /** @brief Tidy up a list of names
  *
  * Remove duplicates, apply lowercase, sort.
@@ -913,9 +894,6 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
         bool ok = false;  // Ignored
         QVariantMap userSettings = CalamaresUtils::getSubMap( configurationMap, "user", ok );
 
-        // TODO:3.3: Remove calls to copyLegacy
-        copyLegacy( configurationMap, "userShell", userSettings, "shell" );
-
         QString shell( QLatin1String( "/bin/bash" ) );  // as if it's not set at all
         if ( userSettings.contains( "shell" ) )
         {
@@ -941,9 +919,6 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
         bool ok = false;  // Ignored
         QVariantMap hostnameSettings = CalamaresUtils::getSubMap( configurationMap, "hostname", ok );
 
-        // TODO:3.3: Remove calls to copyLegacy
-        copyLegacy( configurationMap, "setHostname", hostnameSettings, "location" );
-        copyLegacy( configurationMap, "writeHostsFile", hostnameSettings, "writeHostsFile" );
         m_hostnameAction = getHostNameAction( hostnameSettings );
         m_writeEtcHosts = CalamaresUtils::getBool( hostnameSettings, "writeHostsFile", true );
         m_hostnameTemplate
@@ -998,7 +973,7 @@ Config::finalizeGlobalStorage() const
     {
         gs->insert( "reuseRootPassword", reuseUserPasswordForRoot() );
     }
-    gs->insert( "password", CalamaresUtils::obscure( userPassword() ) );
+    gs->insert( "password", Calamares::String::obscure( userPassword() ) );
 }
 
 Calamares::JobList
diff --git a/src/modules/users/TestSetHostNameJob.cpp b/src/modules/users/TestSetHostNameJob.cpp
index 38b1f2cdb..218eaab7b 100644
--- a/src/modules/users/TestSetHostNameJob.cpp
+++ b/src/modules/users/TestSetHostNameJob.cpp
@@ -140,8 +140,7 @@ UsersTests::testHostnamed()
         // then this one should, also; or, if the previous one failed, then this
         // changes to whatever-the-hostname-is, and systemd dbus seems to call that
         // a success, as well (since nothing changes). So no failure-expectation here.
-        QEXPECT_FAIL( "", "Hostname changes are access-controlled (restore)", Continue );
-        QVERIFY( setSystemdHostname( m_originalHostName ) );
+        setSystemdHostname( m_originalHostName );
     }
 }
 
diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp
index b7835251f..ac27570ca 100644
--- a/src/modules/users/Tests.cpp
+++ b/src/modules/users/Tests.cpp
@@ -284,8 +284,10 @@ UserTests::testHostActions2()
     QCOMPARE( c.hostnameAction(), HostNameAction::EtcHostname );
     QCOMPARE( c.writeEtcHosts(), true );
 
-    legacy.insert( "writeHostsFile", false );
-    legacy.insert( "setHostname", "Hostnamed" );
+    QVariantMap hostSettings;
+    hostSettings.insert( "writeHostsFile", false );
+    hostSettings.insert( "location", "Hostnamed" );
+    legacy.insert( "hostname", hostSettings );
     c.setConfigurationMap( legacy );
     QCOMPARE( c.hostnameAction(), HostNameAction::SystemdHostname );
     QCOMPARE( c.writeEtcHosts(), false );
@@ -469,16 +471,14 @@ UserTests::testUserYAML_data()
     QTest::addColumn< QString >( "filename" );
     QTest::addColumn< QString >( "shell" );
 
-    QTest::newRow( "old, unset   " ) << "tests/7ao-shell.conf"
-                                     << "/bin/bash";
-    QTest::newRow( "old, empty   " ) << "tests/7bo-shell.conf"
-                                     << "";
-    QTest::newRow( "old, relative" ) << "tests/7co-shell.conf"
-                                     << "/bin/ls";  // Setting is ignored
-    QTest::newRow( "old, invalid " ) << "tests/7do-shell.conf"
-                                     << "";
-    QTest::newRow( "old, absolute" ) << "tests/7eo-shell.conf"
-                                     << "/usr/bin/dash";
+    const QString bash = QStringLiteral( "/bin/bash" );
+
+    // All the old settings are ignored
+    QTest::newRow( "old, unset   " ) << "tests/7ao-shell.conf" << bash;
+    QTest::newRow( "old, empty   " ) << "tests/7bo-shell.conf" << bash;
+    QTest::newRow( "old, relative" ) << "tests/7co-shell.conf" << bash;
+    QTest::newRow( "old, invalid " ) << "tests/7do-shell.conf" << bash;
+    QTest::newRow( "old, absolute" ) << "tests/7eo-shell.conf" << bash;
 
     QTest::newRow( "new, unset   " ) << "tests/7an-shell.conf"
                                      << "/bin/bash";
diff --git a/src/modules/users/users.conf b/src/modules/users/users.conf
index 779d1afdf..00a98ee7f 100644
--- a/src/modules/users/users.conf
+++ b/src/modules/users/users.conf
@@ -161,10 +161,6 @@ allowWeakPasswordsDefault: false
 user:
   shell: /bin/bash
   forbidden_names: [ root ]
-# TODO:3.3: Remove this setting
-#
-# This is the legacy setting for user.shell
-userShell: /bin/bash
 
 # Hostname settings
 #
@@ -212,17 +208,6 @@ hostname:
   template: "derp-${cpu}"
   forbidden_names: [ localhost ]
 
-# TODO:3.3: Remove this setting
-#
-# This is a legacy setting for hostname.location; if it is set
-# at all, and there is no setting for hostname.location, it is used.
-setHostname: EtcFile
-
-# TODO:3.3: Remove this setting
-#
-# This is a legacy setting for hostname.writeHostsFile
-writeHostsFile: true
-
 presets:
     fullName:
         # value: "OEM User"
diff --git a/src/modules/users/users.schema.yaml b/src/modules/users/users.schema.yaml
index 025f8a3d2..972306b80 100644
--- a/src/modules/users/users.schema.yaml
+++ b/src/modules/users/users.schema.yaml
@@ -6,13 +6,12 @@ $id: https://calamares.io/schemas/users
 additionalProperties: false
 type: object
 properties:
-    # User shell, should be path to /bin/sh or so
-    userShell: { type: string }
     user:
         additionalProperties: false
         type: object
         properties:
-            shell: { type: string }  # Overrides userShell
+            # User shell, should be path to /bin/sh or so
+            shell: { type: string }
             forbidden_names: { type: array, items: { type: string } }
     # Group settings
     defaultGroups:
@@ -54,9 +53,6 @@ properties:
             writeHostsFile: { type: boolean, default: true }
             template: { type: string, default: "${first}-${product}" }
             forbidden_names: { type: array, items: { type: string } }
-    # Legacy Hostname setting
-    setHostname: { type: string, enum: [ None, EtcFile, Hostnamed ] }
-    writeHostsFile: { type: boolean, default: true }
 
     # Presets
     #
diff --git a/src/modules/usersq/CMakeLists.txt b/src/modules/usersq/CMakeLists.txt
index 8465b0246..33133f439 100644
--- a/src/modules/usersq/CMakeLists.txt
+++ b/src/modules/usersq/CMakeLists.txt
@@ -3,45 +3,39 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-if( NOT WITH_QML )
+if(NOT WITH_QML)
     calamares_skip_module( "usersq (QML is not supported in this build)" )
     return()
 endif()
 
-find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus Network )
-find_package( Crypt REQUIRED )
+find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus Network)
+find_package(Crypt REQUIRED)
 
 # Add optional libraries here
-set( USER_EXTRA_LIB )
+set(USER_EXTRA_LIB)
 
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../users )
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../users)
 
-find_package( LibPWQuality )
-set_package_properties(
-    LibPWQuality PROPERTIES
-    PURPOSE "Extra checks of password quality"
-)
+find_package(LibPWQuality)
+set_package_properties(LibPWQuality PROPERTIES PURPOSE "Extra checks of password quality")
 
-if( LibPWQuality_FOUND )
-    list( APPEND USER_EXTRA_LIB ${LibPWQuality_LIBRARIES} )
-    include_directories( ${LibPWQuality_INCLUDE_DIRS} )
-    add_definitions( -DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY )
+if(LibPWQuality_FOUND)
+    list(APPEND USER_EXTRA_LIB ${LibPWQuality_LIBRARIES})
+    include_directories(${LibPWQuality_INCLUDE_DIRS})
+    add_definitions(-DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY)
 endif()
 
 #needed for ${_users}/Config.cpp
-find_package( ICU COMPONENTS uc i18n )
-set_package_properties(
-    ICU PROPERTIES
-    PURPOSE "Transliteration support for full name to username conversion"
-)
+find_package(ICU COMPONENTS uc i18n)
+set_package_properties(ICU PROPERTIES PURPOSE "Transliteration support for full name to username conversion")
 
-if( ICU_FOUND )
-    list( APPEND USER_EXTRA_LIB ICU::uc ICU::i18n )
-    include_directories( ${ICU_INCLUDE_DIRS} )
-    add_definitions( -DHAVE_ICU )
+if(ICU_FOUND)
+    list(APPEND USER_EXTRA_LIB ICU::uc ICU::i18n)
+    include_directories(${ICU_INCLUDE_DIRS})
+    add_definitions(-DHAVE_ICU)
 endif()
 
-calamares_add_plugin( usersq
+calamares_add_plugin(usersq
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
diff --git a/src/modules/webview/CMakeLists.txt b/src/modules/webview/CMakeLists.txt
index 54e1d18b0..b8ef5d7d4 100644
--- a/src/modules/webview/CMakeLists.txt
+++ b/src/modules/webview/CMakeLists.txt
@@ -3,52 +3,41 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-set( CALA_WEBVIEW_LINK_LIBRARIES "" )
+set(CALA_WEBVIEW_LINK_LIBRARIES "")
 
-option( WEBVIEW_FORCE_WEBKIT "Always build webview with WebKit instead of WebEngine regardless of Qt version." OFF)
+option(WEBVIEW_FORCE_WEBKIT "Always build webview with WebKit instead of WebEngine regardless of Qt version." OFF)
 
-set( _reason "" )
+set(_reason "")
 
-message( STATUS "Found Qt version ${Qt5Core_VERSION}")
-if ( Qt5Core_VERSION VERSION_LESS 5.6 OR WEBVIEW_FORCE_WEBKIT )
-    message( STATUS " .. using webkit")
-    find_package( Qt5 ${QT_VERSION} CONFIG COMPONENTS WebKit WebKitWidgets )
+message(STATUS "Found Qt version ${Qt5Core_VERSION}")
+if(Qt5Core_VERSION VERSION_LESS 5.6 OR WEBVIEW_FORCE_WEBKIT)
+    message(STATUS " .. using webkit")
+    find_package(Qt5 ${QT_VERSION} CONFIG COMPONENTS WebKit WebKitWidgets)
 
-    if ( Qt5WebKit_FOUND AND Qt5WebKitWidgets_FOUND )
-        list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES
-            ${QT_QTWEBKIT_INCLUDE_DIR}
-        )
-        list( APPEND CALA_WEBVIEW_LINK_LIBRARIES
-            Qt5::WebKit
-            Qt5::WebKitWidgets
-        )
-        set( WEBVIEW_WITH_WEBKIT 1 )
+    if(Qt5WebKit_FOUND AND Qt5WebKitWidgets_FOUND)
+        list(APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES ${QT_QTWEBKIT_INCLUDE_DIR})
+        list(APPEND CALA_WEBVIEW_LINK_LIBRARIES Qt5::WebKit Qt5::WebKitWidgets)
+        set(WEBVIEW_WITH_WEBKIT 1)
     else()
-        set( _reason "No suitable WebKit" )
+        set(_reason "No suitable WebKit")
     endif()
 else()
-    message( STATUS " .. using webengine")
-    find_package( Qt5 ${QT_VERSION} CONFIG COMPONENTS WebEngine WebEngineWidgets )
+    message(STATUS " .. using webengine")
+    find_package(Qt5 ${QT_VERSION} CONFIG COMPONENTS WebEngine WebEngineWidgets)
 
-    if ( Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND )
-        list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES
-            ${QT_QTWEBENGINE_INCLUDE_DIR}
-        )
-        list( APPEND CALA_WEBVIEW_LINK_LIBRARIES
-            Qt5::WebEngine
-            Qt5::WebEngineWidgets
-        )
-        set( WEBVIEW_WITH_WEBENGINE 1 )
+    if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
+        list(APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES ${QT_QTWEBENGINE_INCLUDE_DIR})
+        list(APPEND CALA_WEBVIEW_LINK_LIBRARIES Qt5::WebEngine Qt5::WebEngineWidgets)
+        set(WEBVIEW_WITH_WEBENGINE 1)
     else()
-        set( _reason "No suitable WebEngine" )
+        set(_reason "No suitable WebEngine")
     endif()
 endif()
 
-if ( NOT _reason )
-    configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/WebViewConfig.h.in
-                    ${CMAKE_CURRENT_BINARY_DIR}/WebViewConfig.h )
+if(NOT _reason)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/WebViewConfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/WebViewConfig.h)
 
-    calamares_add_plugin( webview
+    calamares_add_plugin(webview
         TYPE viewmodule
         EXPORT_MACRO PLUGINDLLEXPORT_PRO
         SOURCES
diff --git a/src/modules/webview/WebViewStep.cpp b/src/modules/webview/WebViewStep.cpp
index 8e7c48f1a..d787b8ec6 100644
--- a/src/modules/webview/WebViewStep.cpp
+++ b/src/modules/webview/WebViewStep.cpp
@@ -28,12 +28,11 @@ WebViewStep::WebViewStep( QObject* parent )
 #ifdef WEBVIEW_WITH_WEBENGINE
     QtWebEngine::initialize();
 #endif
-    m_view = new C_QWEBVIEW();
+    m_view = new WebViewWidget();
 #ifdef WEBVIEW_WITH_WEBKIT
     m_view->settings()->setFontFamily( QWebSettings::StandardFont,
                                        m_view->settings()->fontFamily( QWebSettings::SansSerifFont ) );
-    m_view->setRenderHints( QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::HighQualityAntialiasing
-                            | QPainter::SmoothPixmapTransform | QPainter::NonCosmeticDefaultPen );
+    m_view->setRenderHints( QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform );
 #endif
 }
 
diff --git a/src/modules/webview/WebViewStep.h b/src/modules/webview/WebViewStep.h
index 6fd71222e..700da2856 100644
--- a/src/modules/webview/WebViewStep.h
+++ b/src/modules/webview/WebViewStep.h
@@ -20,20 +20,21 @@
 
 #include 
 
-#ifdef WEBVIEW_WITH_WEBKIT
-#define C_QWEBVIEW QWebView
-#endif
-#ifdef WEBVIEW_WITH_WEBENGINE
-#ifdef C_QWEBVIEW
+#if defined( WEBVIEW_WITH_WEBKIT ) && defined( WEBVIEW_WITH_WEBENGINE )
 #error Both WEBENGINE and WEBKIT enabled
 #endif
-#define C_QWEBVIEW QWebEngineView
-#endif
-#ifndef C_QWEBVIEW
+#if !defined( WEBVIEW_WITH_WEBKIT ) && !defined( WEBVIEW_WITH_WEBENGINE )
 #error Neither WEBENGINE nor WEBKIT enabled
 #endif
 
-class C_QWEBVIEW;
+#ifdef WEBVIEW_WITH_WEBKIT
+class QWebView;
+using WebViewWidget = QWebView;
+#endif
+#ifdef WEBVIEW_WITH_WEBENGINE
+class QWebEngineView;
+using WebViewWidget = QWebEngineView;
+#endif
 
 class PLUGINDLLEXPORT WebViewStep : public Calamares::ViewStep
 {
@@ -60,7 +61,7 @@ public:
     void setConfigurationMap( const QVariantMap& configurationMap ) override;
 
 private:
-    C_QWEBVIEW* m_view;
+    WebViewWidget* m_view;
     QString m_url;
     QString m_prettyName;
 };
diff --git a/src/modules/welcome/CMakeLists.txt b/src/modules/welcome/CMakeLists.txt
index 01a89703a..0a8353084 100644
--- a/src/modules/welcome/CMakeLists.txt
+++ b/src/modules/welcome/CMakeLists.txt
@@ -3,25 +3,25 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network )
+find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network)
 
-find_package( LIBPARTED )
-if ( LIBPARTED_FOUND )
-    set( PARTMAN_SRC checker/partman_devices.c )
-    set( PARTMAN_LIB ${LIBPARTED_LIBRARY} )
+find_package(LIBPARTED)
+if(LIBPARTED_FOUND)
+    set(PARTMAN_SRC checker/partman_devices.c)
+    set(PARTMAN_LIB ${LIBPARTED_LIBRARY})
 else()
-    set( PARTMAN_SRC )
-    set( PARTMAN_LIB )
-    add_definitions( -DWITHOUT_LIBPARTED )
+    set(PARTMAN_SRC)
+    set(PARTMAN_LIB)
+    add_definitions(-DWITHOUT_LIBPARTED)
 endif()
 
-calamares_add_plugin( welcome
+calamares_add_plugin(welcome
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         checker/CheckerContainer.cpp
         checker/GeneralRequirements.cpp
-        checker/ResultWidget.cpp
+        checker/ResultDelegate.cpp
         checker/ResultsListWidget.cpp
         ${PARTMAN_SRC}
         WelcomeViewStep.cpp
@@ -41,15 +41,6 @@ calamares_add_plugin( welcome
 
 calamares_add_test(
     welcometest
-    SOURCES
-        checker/GeneralRequirements.cpp
-        ${PARTMAN_SRC}
-        Config.cpp
-        Tests.cpp
-    LIBRARIES
-        ${PARTMAN_LIB}
-        Qt5::DBus
-        Qt5::Network
-        Qt5::Widgets
-        Calamares::calamaresui
+    SOURCES checker/GeneralRequirements.cpp ${PARTMAN_SRC} Config.cpp Tests.cpp
+    LIBRARIES ${PARTMAN_LIB} Qt5::DBus Qt5::Network Qt5::Widgets Calamares::calamaresui
 )
diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp
index e5b2da211..0e692637b 100644
--- a/src/modules/welcome/Config.cpp
+++ b/src/modules/welcome/Config.cpp
@@ -55,12 +55,10 @@ Config::retranslate()
         {
             message = setup ? tr( "This computer does not satisfy the minimum "
                                   "requirements for setting up %1.
"
-                                  "Setup cannot continue. "
-                                  "Details..." )
+                                  "Setup cannot continue." )
                             : tr( "This computer does not satisfy the minimum "
                                   "requirements for installing %1.
"
-                                  "Installation cannot continue. "
-                                  "Details..." );
+                                  "Installation cannot continue." );
         }
         else
         {
@@ -130,7 +128,6 @@ Config::initLanguages()
     // Need to match by some other means than the exact translation Id
     if ( matchedLocaleIndex < 0 )
     {
-
         QLocale defaultLocale = defaultTranslation.locale();
 
         cDebug() << "Trying to match locale" << defaultLocale;
diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
index 5b26434a1..597317069 100644
--- a/src/modules/welcome/WelcomePage.cpp
+++ b/src/modules/welcome/WelcomePage.cpp
@@ -27,7 +27,6 @@
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
 #include "utils/Retranslator.h"
-#include "widgets/TranslationFix.h"
 
 #include 
 #include 
@@ -48,8 +47,6 @@ WelcomePage::WelcomePage( Config* config, QWidget* parent )
 
     const int defaultFontHeight = CalamaresUtils::defaultFontHeight();
     ui->setupUi( this );
-    ui->aboutButton->setIcon( CalamaresUtils::defaultPixmap(
-        CalamaresUtils::Information, CalamaresUtils::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) );
 
     // insert system-check widget below welcome text
     const int welcome_text_idx = ui->verticalLayout->indexOf( ui->mainText );
@@ -78,7 +75,6 @@ WelcomePage::WelcomePage( Config* config, QWidget* parent )
 
     CALAMARES_RETRANSLATE_SLOT( &WelcomePage::retranslate );
 
-    connect( ui->aboutButton, &QPushButton::clicked, this, &WelcomePage::showAboutBox );
     connect( Calamares::ModuleManager::instance(),
              &Calamares::ModuleManager::requirementsComplete,
              m_checkingWidget,
@@ -216,30 +212,6 @@ WelcomePage::retranslate()
     ui->supportButton->setText( tr( "%1 support" ).arg( Calamares::Branding::instance()->shortProductName() ) );
 }
 
-void
-WelcomePage::showAboutBox()
-{
-    QString title
-        = Calamares::Settings::instance()->isSetupMode() ? tr( "About %1 setup" ) : tr( "About %1 installer" );
-    QMessageBox mb( QMessageBox::Information,
-                    title.arg( CALAMARES_APPLICATION_NAME ),
-                    m_conf->aboutMessage().arg( Calamares::Branding::instance()->versionedName() ),
-                    QMessageBox::Ok,
-                    this );
-    Calamares::fixButtonLabels( &mb );
-    mb.setIconPixmap( CalamaresUtils::defaultPixmap(
-        CalamaresUtils::Squid,
-        CalamaresUtils::Original,
-        QSize( CalamaresUtils::defaultFontHeight() * 6, CalamaresUtils::defaultFontHeight() * 6 ) ) );
-    QGridLayout* layout = reinterpret_cast< QGridLayout* >( mb.layout() );
-    if ( layout )
-    {
-        layout->setColumnMinimumWidth( 2, CalamaresUtils::defaultFontHeight() * 24 );
-    }
-    mb.exec();
-}
-
-
 void
 LocaleTwoColumnDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
 {
diff --git a/src/modules/welcome/WelcomePage.h b/src/modules/welcome/WelcomePage.h
index dba1f6a28..d5741240d 100644
--- a/src/modules/welcome/WelcomePage.h
+++ b/src/modules/welcome/WelcomePage.h
@@ -53,7 +53,6 @@ public:
 
 public slots:
     void retranslate();
-    void showAboutBox();
 
 protected:
     void focusInEvent( QFocusEvent* e ) override;  //choose the child widget to focus
diff --git a/src/modules/welcome/WelcomePage.ui b/src/modules/welcome/WelcomePage.ui
index 9460a6c56..edd14c172 100644
--- a/src/modules/welcome/WelcomePage.ui
+++ b/src/modules/welcome/WelcomePage.ui
@@ -134,16 +134,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
        
        
         
-         
-          
-           
-            &About
-           
-           
-            true
-           
-          
-         
          
           
            
diff --git a/src/modules/welcome/checker/CheckerContainer.cpp b/src/modules/welcome/checker/CheckerContainer.cpp
index 23055c2e0..99b0f6375 100644
--- a/src/modules/welcome/checker/CheckerContainer.cpp
+++ b/src/modules/welcome/checker/CheckerContainer.cpp
@@ -65,13 +65,19 @@ CheckerContainer::requirementsComplete( bool ok )
         }
     }
 
-    layout()->removeWidget( m_waitingWidget );
-    m_waitingWidget->deleteLater();
-    m_waitingWidget = nullptr;  // Don't delete in destructor
-
-    m_checkerWidget = new ResultsListWidget( m_config, this );
-    m_checkerWidget->setObjectName( "requirementsChecker" );
-    layout()->addWidget( m_checkerWidget );
+    if ( m_waitingWidget )
+    {
+        layout()->removeWidget( m_waitingWidget );
+        m_waitingWidget->deleteLater();
+        m_waitingWidget = nullptr;  // Don't delete in destructor
+    }
+    if ( !m_checkerWidget )
+    {
+        m_checkerWidget = new ResultsListWidget( m_config, this );
+        m_checkerWidget->setObjectName( "requirementsChecker" );
+        layout()->addWidget( m_checkerWidget );
+    }
+    m_checkerWidget->requirementsComplete();
 
     m_verdict = ok;
 }
diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp
index 5950bd396..0c467124f 100644
--- a/src/modules/welcome/checker/GeneralRequirements.cpp
+++ b/src/modules/welcome/checker/GeneralRequirements.cpp
@@ -15,6 +15,9 @@
 #include "CheckerContainer.h"
 #include "partman_devices.h"
 
+#include "CalamaresVersion.h"  // For development-or-not
+#include "GlobalStorage.h"
+#include "JobQueue.h"
 #include "Settings.h"
 #include "modulesystem/Requirement.h"
 #include "network/Manager.h"
@@ -26,9 +29,6 @@
 #include "utils/Variant.h"
 #include "widgets/WaitingWidget.h"
 
-#include "GlobalStorage.h"
-#include "JobQueue.h"
-
 #include 
 #include 
 #include 
@@ -145,19 +145,25 @@ GeneralRequirements::checkRequirements()
              << TR( "hasInternet", hasInternet )
              << TR( "isRoot", isRoot );
     // clang-format on
+
     Calamares::RequirementsList checkEntries;
     foreach ( const QString& entry, m_entriesToCheck )
     {
+        const bool required = m_entriesToRequire.contains( entry );
         if ( entry == "storage" )
         {
             checkEntries.append(
                 { entry,
                   [ req = m_requiredStorageGiB ]
-                  { return tr( "has at least %1 GiB available drive space" ).arg( req ); },
+                  {
+                      return tr( "Please ensure the system has at least %1 GiB available drive space." ).arg( req )
+                          + QStringLiteral( "

" )
+                          + tr( "Available drive space is all of the hard disks and SSDs connected to the system." );
+                  },
                   [ req = m_requiredStorageGiB ]
                   { return tr( "There is not enough drive space. At least %1 GiB is required." ).arg( req ); },
                   enoughStorage,
-                  m_entriesToRequire.contains( entry ) } );
+                  required } );
         }
         else if ( entry == "ram" )
         {
@@ -169,7 +175,7 @@ GeneralRequirements::checkRequirements()
                           .arg( req );
                   },
                   enoughRam,
-                  m_entriesToRequire.contains( entry ) } );
+                  required } );
         }
         else if ( entry == "power" )
         {
@@ -177,7 +183,7 @@ GeneralRequirements::checkRequirements()
                                    [] { return tr( "is plugged in to a power source" ); },
                                    [] { return tr( "The system is not plugged in to a power source." ); },
                                    hasPower,
-                                   m_entriesToRequire.contains( entry ) } );
+                                   required } );
         }
         else if ( entry == "internet" )
         {
@@ -185,7 +191,7 @@ GeneralRequirements::checkRequirements()
                                    [] { return tr( "is connected to the Internet" ); },
                                    [] { return tr( "The system is not connected to the Internet." ); },
                                    hasInternet,
-                                   m_entriesToRequire.contains( entry ) } );
+                                   required } );
         }
         else if ( entry == "root" )
         {
@@ -198,7 +204,7 @@ GeneralRequirements::checkRequirements()
                                            : tr( "The installer is not running with administrator rights." );
                                    },
                                    isRoot,
-                                   m_entriesToRequire.contains( entry ) } );
+                                   required } );
         }
         else if ( entry == "screen" )
         {
@@ -211,8 +217,57 @@ GeneralRequirements::checkRequirements()
                                            : tr( "The screen is too small to display the installer." );
                                    },
                                    enoughScreen,
-                                   false } );
+                                   required } );
         }
+#ifdef CALAMARES_VERSION_RC
+        if ( entry == "false" )
+        {
+            checkEntries.append( { entry,
+                                   [] { return tr( "is always false" ); },
+                                   [] { return tr( "The computer says no." ); },
+                                   false,
+                                   required } );
+        }
+        if ( entry == "slow-false" )
+        {
+            sleep(3);
+            checkEntries.append( { entry,
+                                   [] { return tr( "is always false (slowly)" ); },
+                                   [] { return tr( "The computer says no (slowly)." ); },
+                                   false,
+                                   required } );
+        }
+        if ( entry == "true" )
+        {
+            checkEntries.append( { entry,
+                                   [] { return tr( "is always true" ); },
+                                   [] { return tr( "The computer says yes." ); },
+                                   true,
+                                   required } );
+        }
+        if ( entry == "slow-true" )
+        {
+            sleep(3);
+            checkEntries.append( { entry,
+                                   [] { return tr( "is always true (slowly)" ); },
+                                   [] { return tr( "The computer says yes (slowly)." ); },
+                                   true,
+                                   required } );
+        }
+        if ( entry == "snark" )
+        {
+            static unsigned int snark_count = 0;
+            checkEntries.append( { entry,
+                                   [] { return tr( "is checked three times." ); },
+                                   []
+                                   {
+                                       return tr( "The snark has not been checked three times.",
+                                                  "The (some mythological beast) has not been checked three times." );
+                                   },
+                                   ++snark_count > 3,
+                                   required } );
+        }
+#endif
     }
     return checkEntries;
 }
diff --git a/src/modules/welcome/checker/ResultDelegate.cpp b/src/modules/welcome/checker/ResultDelegate.cpp
new file mode 100644
index 000000000..420ece812
--- /dev/null
+++ b/src/modules/welcome/checker/ResultDelegate.cpp
@@ -0,0 +1,104 @@
+/* === This file is part of Calamares -  ===
+ *
+ *   SPDX-FileCopyrightText: 2022 Adriaan de Groot 
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#include "ResultDelegate.h"
+
+#include "modulesystem/RequirementsModel.h"
+#include "utils/CalamaresUtilsGui.h"
+
+#include 
+#include 
+
+static constexpr int const item_margin = 8;
+static inline int
+item_fontsize()
+{
+    return CalamaresUtils::defaultFontSize() + 4;
+}
+
+static void
+paintRequirement( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index, int role )
+{
+    const auto fontsize = item_fontsize();
+
+    QRect textRect = option.rect.adjusted( item_margin, item_margin, -item_margin, -item_margin );
+    QFont font = qApp->font();
+    font.setPointSize( fontsize );
+    font.setBold( false );
+    painter->setFont( font );
+
+    CalamaresUtils::ImageType statusImage = CalamaresUtils::StatusOk;
+
+    painter->setPen( QColorConstants::Black );
+    if ( index.data( Calamares::RequirementsModel::Satisfied ).toBool() )
+    {
+        painter->fillRect( textRect, option.palette.window().color() );
+    }
+    else
+    {
+        if ( index.data( Calamares::RequirementsModel::Mandatory ).toBool() )
+        {
+            QColor bgColor = option.palette.window().color();
+            bgColor.setHsv( 0, 64, bgColor.value() );
+            painter->fillRect( option.rect, bgColor );
+            statusImage = CalamaresUtils::StatusError;
+        }
+        else
+        {
+            QColor bgColor = option.palette.window().color();
+            bgColor.setHsv( 60, 64, bgColor.value() );
+            painter->fillRect( option.rect, bgColor );
+            statusImage = CalamaresUtils::StatusWarning;
+        }
+    }
+
+    auto image
+        = CalamaresUtils::defaultPixmap( statusImage, CalamaresUtils::Original, QSize( 2 * fontsize, 2 * fontsize ) )
+              .toImage();
+    painter->drawImage( textRect.topLeft(), image );
+
+    // Leave space for that image (already drawn)
+    textRect.moveLeft( 2 * fontsize + 2 * item_margin );
+    painter->drawText( textRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::TextSingleLine, index.data( role ).toString() );
+}
+
+QSize
+ResultDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    if ( !index.isValid() )
+    {
+        return option.rect.size();
+    }
+
+    QFont font = qApp->font();
+
+    font.setPointSize( item_fontsize() );
+    QFontMetrics fm( font );
+
+    const int height = fm.height() + 2 * item_margin;
+    int textwidth = fm.boundingRect( index.data( Calamares::RequirementsModel::NegatedText ).toString() ).width();
+
+    return QSize( qMax( option.rect.width(), textwidth ), height );
+}
+
+
+void
+ResultDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QStyleOptionViewItem opt = option;
+
+    painter->save();
+
+    initStyleOption( &opt, index );
+    opt.text.clear();
+
+    paintRequirement( painter, opt, index, m_textRole );
+
+    painter->restore();
+}
diff --git a/src/modules/welcome/checker/ResultDelegate.h b/src/modules/welcome/checker/ResultDelegate.h
new file mode 100644
index 000000000..db770502e
--- /dev/null
+++ b/src/modules/welcome/checker/ResultDelegate.h
@@ -0,0 +1,37 @@
+/* === This file is part of Calamares -  ===
+ *
+ *   SPDX-FileCopyrightText: 2022 Adriaan de Groot 
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#ifndef WELCOME_CHECKER_RESULTDELEGATE_HH
+#define WELCOME_CHECKER_RESULTDELEGATE_HH
+
+#include 
+
+#include "modulesystem/RequirementsModel.h"
+
+/**
+ * @brief Class for drawing (un)satisfied requirements
+ */
+class ResultDelegate : public QStyledItemDelegate
+{
+public:
+    using QStyledItemDelegate::QStyledItemDelegate;
+    ResultDelegate( QObject* parent, Calamares::RequirementsModel::Roles text )
+        : QStyledItemDelegate( parent )
+        , m_textRole( text )
+    {
+    }
+
+protected:
+    QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const override;
+    void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const override;
+
+    int m_textRole = Calamares::RequirementsModel::Name;
+};
+
+#endif  // PROGRESSTREEDELEGATE_H
diff --git a/src/modules/welcome/checker/ResultWidget.cpp b/src/modules/welcome/checker/ResultWidget.cpp
deleted file mode 100644
index 6e34a6c36..000000000
--- a/src/modules/welcome/checker/ResultWidget.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac 
- *   SPDX-FileCopyrightText: 2017 Adriaan de Groot 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#include "ResultWidget.h"
-
-#include "utils/CalamaresUtilsGui.h"
-#include "utils/Logger.h"
-
-#include 
-
-static inline void
-setCondition( QLabel* label, CalamaresUtils::ImageType t )
-{
-    label->setPixmap(
-        CalamaresUtils::defaultPixmap( t, CalamaresUtils::Original, QSize( label->height(), label->height() ) ) );
-}
-
-ResultWidget::ResultWidget( bool satisfied, bool required, QWidget* parent )
-    : QWidget( parent )
-{
-    QBoxLayout* mainLayout = new QHBoxLayout;
-    setLayout( mainLayout );
-
-    m_iconLabel = new QLabel( this );
-    m_iconLabel->setFixedSize( CalamaresUtils::defaultIconSize() );
-    m_iconLabel->setObjectName( "resultIcon" );
-    mainLayout->addWidget( m_iconLabel );
-
-    m_textLabel = new QLabel( this );
-    m_textLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
-    m_textLabel->setObjectName( "resultText" );
-    mainLayout->addWidget( m_textLabel );
-
-    if ( satisfied )
-    {
-        setCondition( m_iconLabel, CalamaresUtils::StatusOk );
-    }
-    else if ( required )
-    {
-        setCondition( m_iconLabel, CalamaresUtils::StatusError );
-    }
-    else
-    {
-        setCondition( m_iconLabel, CalamaresUtils::StatusWarning );
-    }
-}
-
-
-void
-ResultWidget::setText( const QString& text )
-{
-    m_textLabel->setText( text );
-}
diff --git a/src/modules/welcome/checker/ResultWidget.h b/src/modules/welcome/checker/ResultWidget.h
deleted file mode 100644
index d77c0d9bb..000000000
--- a/src/modules/welcome/checker/ResultWidget.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac 
- *   SPDX-FileCopyrightText: 2017 Adriaan de Groot 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#ifndef CHECKER_RESULTWIDGET_H
-#define CHECKER_RESULTWIDGET_H
-
-#include 
-
-/**
- * @brief Displays the results of a single check.
- *
- * Widget to insert into a ResultListWidget to display an iconic status
- * (warning or failure when the check is not satisfied) along with
- * descriptive test.
- */
-class ResultWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    /**
-     * @brief Create widget with results of a check.
-     *
-     * Use setText() to set up the text of the widget.
-     */
-    explicit ResultWidget( bool satisfied, bool required, QWidget* parent = nullptr );
-
-    /// @brief Set the displayed description of the check.
-    void setText( const QString& text );
-
-private:
-    QLabel* m_textLabel;
-    QLabel* m_iconLabel;
-};
-
-#endif  // CHECKER_RESULTWIDGET_H
diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp
index a5d92b590..b3371cee1 100644
--- a/src/modules/welcome/checker/ResultsListWidget.cpp
+++ b/src/modules/welcome/checker/ResultsListWidget.cpp
@@ -10,7 +10,7 @@
 
 #include "ResultsListWidget.h"
 
-#include "ResultWidget.h"
+#include "ResultDelegate.h"
 
 #include "Branding.h"
 #include "Settings.h"
@@ -18,183 +18,77 @@
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "widgets/FixedAspectRatioLabel.h"
+#include "widgets/WaitingWidget.h"
 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 
-/** @brief Add widgets to @p layout for the list @p checkEntries
- *
- * The @p resultWidgets is filled with pointers to the widgets;
- * for each entry in @p checkEntries that satisfies @p predicate,
- * a widget is created, otherwise a nullptr is added instead.
- *
- * Adds all the widgets to the given @p layout.
- *
- * Afterwards, @p resultWidgets has a length equal to @p checkEntries.
- */
-static void
-createResultWidgets( QLayout* layout,
-                     QList< ResultWidget* >& resultWidgets,
-                     const Calamares::RequirementsModel& model,
-                     std::function< bool( const Calamares::RequirementsModel&, QModelIndex ) > predicate )
-{
-    resultWidgets.clear();
-    resultWidgets.reserve( model.count() );
-    for ( auto i = 0; i < model.count(); i++ )
-    {
-        const auto& index = model.index( i );
-        if ( !predicate( model, index ) )
-        {
-            resultWidgets.append( nullptr );
-            continue;
-        }
-
-        const QString checkName = model.data( index, Calamares::RequirementsModel::Name ).toString();
-        const bool is_satisfied = model.data( index, Calamares::RequirementsModel::Satisfied ).toBool();
-        const bool is_mandatory = model.data( index, Calamares::RequirementsModel::Mandatory ).toBool();
-        ResultWidget* ciw = new ResultWidget( is_satisfied, is_mandatory );
-        ciw->setObjectName( checkName );
-
-        layout->addWidget( ciw );
-        ciw->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
-
-        ciw->setAutoFillBackground( true );
-        QPalette pal( ciw->palette() );
-        QColor bgColor = pal.window().color();
-        int bgHue = ( is_satisfied ) ? bgColor.hue() : ( is_mandatory ) ? 0 : 60;
-        bgColor.setHsv( bgHue, 64, bgColor.value() );
-        pal.setColor( QPalette::Window, bgColor );
-        ciw->setPalette( pal );
-
-        resultWidgets.append( ciw );
-    }
-}
-
-/** @brief A "details" dialog for the results-list
- *
- * This displays the same RequirementsList as ResultsListWidget,
- * but the *details* part rather than the show description.
- *
- * This is an internal-to-the-widget class.
- */
-class ResultsListDialog : public QDialog
-{
-    Q_OBJECT
-public:
-    /** @brief Create a dialog for the given @p checkEntries list of requirements.
-     *
-     * The list must continue to exist for the lifetime of the dialog,
-     * or UB happens.
-     */
-    ResultsListDialog( const Calamares::RequirementsModel& model, QWidget* parent );
-    ~ResultsListDialog() override;
-
-private:
-    QLabel* m_title;
-    QList< ResultWidget* > m_resultWidgets;  ///< One widget for each entry with details available
-    const Calamares::RequirementsModel& m_model;
-
-    void retranslate();
-};
-
-ResultsListDialog::ResultsListDialog( const Calamares::RequirementsModel& model, QWidget* parent )
-    : QDialog( parent )
-    , m_model( model )
-{
-    auto* mainLayout = new QVBoxLayout;
-    auto* entriesLayout = new QVBoxLayout;
-
-    m_title = new QLabel( this );
-    m_title->setObjectName( "resultDialogTitle" );
-
-    createResultWidgets( entriesLayout,
-                         m_resultWidgets,
-                         model,
-                         []( const Calamares::RequirementsModel& m, QModelIndex i )
-                         { return m.data( i, Calamares::RequirementsModel::HasDetails ).toBool(); } );
-
-    QDialogButtonBox* buttonBox = new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal, this );
-    buttonBox->setObjectName( "resultDialogButtons" );
-
-    mainLayout->addWidget( m_title );
-    mainLayout->addLayout( entriesLayout );
-    mainLayout->addWidget( buttonBox );
-
-    setLayout( mainLayout );
-
-    connect( buttonBox, &QDialogButtonBox::clicked, this, &QDialog::close );
-
-    CALAMARES_RETRANSLATE_SLOT( &ResultsListDialog::retranslate );
-}
-
-ResultsListDialog::~ResultsListDialog() {}
-
-void
-ResultsListDialog::retranslate()
-{
-    m_title->setText( tr( "For best results, please ensure that this computer:" ) );
-    setWindowTitle( tr( "System requirements" ) );
-
-    for ( auto i = 0; i < m_model.count(); i++ )
-    {
-        if ( m_resultWidgets[ i ] )
-        {
-            m_resultWidgets[ i ]->setText(
-                m_model.data( m_model.index( i ), Calamares::RequirementsModel::Details ).toString() );
-        }
-    }
-}
-
-
 ResultsListWidget::ResultsListWidget( Config* config, QWidget* parent )
     : QWidget( parent )
     , m_config( config )
 {
     setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
 
-    QBoxLayout* mainLayout = new QVBoxLayout;
-    QBoxLayout* entriesLayout = new QVBoxLayout;
-
+    auto mainLayout = new QVBoxLayout;
     setLayout( mainLayout );
 
-    int paddingSize = qBound( 32, CalamaresUtils::defaultFontHeight() * 4, 128 );
+    QHBoxLayout* explanationLayout = new QHBoxLayout;
+    m_explanation = new QLabel( m_config->warningMessage() );
+    m_explanation->setWordWrap( true );
+    m_explanation->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
+    m_explanation->setOpenExternalLinks( false );
+    m_explanation->setObjectName( "resultsExplanation" );
+    explanationLayout->addWidget( m_explanation );
+    m_countdown = new CountdownWaitingWidget;
+    m_countdown->setToolTip( tr( "Checking requirements again in a few seconds ..." ) );
+    m_countdown->start();
+    explanationLayout->addWidget( m_countdown );
 
-    QHBoxLayout* spacerLayout = new QHBoxLayout;
-    mainLayout->addLayout( spacerLayout );
-    spacerLayout->addSpacing( paddingSize );
-    spacerLayout->addLayout( entriesLayout );
-    spacerLayout->addSpacing( paddingSize );
-    CalamaresUtils::unmarginLayout( spacerLayout );
+    mainLayout->addLayout( explanationLayout );
+    mainLayout->addSpacing( CalamaresUtils::defaultFontHeight() / 2 );
 
-    auto* explanation = new QLabel( m_config->warningMessage() );
-    explanation->setWordWrap( true );
-    explanation->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
-    explanation->setOpenExternalLinks( false );
-    explanation->setObjectName( "resultsExplanation" );
-    entriesLayout->addWidget( explanation );
+    auto* listview = new QListView( this );
+    listview->setSelectionMode( QAbstractItemView::NoSelection );
+    listview->setDragDropMode( QAbstractItemView::NoDragDrop );
+    listview->setAcceptDrops( false );
+    listview->setItemDelegate( new ResultDelegate( this, Calamares::RequirementsModel::NegatedText ) );
+    listview->setModel( config->unsatisfiedRequirements() );
+    m_centralWidget = listview;
+    m_centralLayout = mainLayout;
 
-    connect( config, &Config::warningMessageChanged, explanation, &QLabel::setText );
-    connect( explanation, &QLabel::linkActivated, this, &ResultsListWidget::linkClicked );
+    mainLayout->addWidget( listview );
+    mainLayout->addStretch();
 
-    // Check that all are satisfied (gives warnings if not) and
-    // all *mandatory* entries are satisfied (gives errors if not).
+    connect( config, &Config::warningMessageChanged, m_explanation, &QLabel::setText );
+}
 
-    const bool requirementsSatisfied = config->requirementsModel()->satisfiedRequirements();
-    auto isUnSatisfied = []( const Calamares::RequirementsModel& m, QModelIndex i )
-    { return !m.data( i, Calamares::RequirementsModel::Satisfied ).toBool(); };
+void
+ResultsListWidget::requirementsComplete()
+{
+    // Check that the satisfaction of the requirements:
+    // - if everything is satisfied, show the welcome image
+    // - otherwise, if all the mandatory ones are satisfied,
+    //   we won't be re-checking (see ModuleManager::checkRequirements)
+    //   so hide the countdown,
+    // - otherwise we have unsatisfied mandatory requirements,
+    //   so keep the countdown and the list of problems.
+    const bool requirementsSatisfied = m_config->requirementsModel()->satisfiedRequirements();
+    const bool mandatoryRequirementsSatisfied = m_config->requirementsModel()->satisfiedMandatory();
 
-    createResultWidgets( entriesLayout, m_resultWidgets, *( config->requirementsModel() ), isUnSatisfied );
-
-    if ( !requirementsSatisfied )
+    if ( mandatoryRequirementsSatisfied )
     {
-        entriesLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() / 2 );
-        mainLayout->addStretch();
+        m_countdown->stop();
+        m_countdown->hide();
     }
-    else
+    if ( requirementsSatisfied )
     {
+        delete m_centralWidget;
+        m_centralWidget = nullptr;
+
         if ( !Calamares::Branding::instance()->imagePath( Calamares::Branding::ProductWelcome ).isEmpty() )
         {
             QPixmap theImage
@@ -218,41 +112,10 @@ ResultsListWidget::ResultsListWidget( Config* config, QWidget* parent )
                 imageLabel->setAlignment( Qt::AlignCenter );
                 imageLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
                 imageLabel->setObjectName( "welcomeLogo" );
-                mainLayout->addWidget( imageLabel );
+                // This specifically isn't assigned to m_centralWidget
+                m_centralLayout->addWidget( imageLabel );
             }
         }
-        explanation->setAlignment( Qt::AlignCenter );
-    }
-
-    CALAMARES_RETRANSLATE_SLOT( &ResultsListWidget::retranslate );
-}
-
-
-void
-ResultsListWidget::linkClicked( const QString& link )
-{
-    if ( link == "#details" )
-    {
-        auto* dialog = new ResultsListDialog( *( m_config->requirementsModel() ), this );
-        dialog->exec();
-        dialog->deleteLater();
+        m_explanation->setAlignment( Qt::AlignCenter );
     }
 }
-
-void
-ResultsListWidget::retranslate()
-{
-    const auto& model = *( m_config->requirementsModel() );
-    for ( auto i = 0; i < model.count(); i++ )
-    {
-        if ( m_resultWidgets[ i ] )
-        {
-            m_resultWidgets[ i ]->setText(
-                model.data( model.index( i ), Calamares::RequirementsModel::NegatedText ).toString() );
-        }
-    }
-}
-
-#include "utils/moc-warnings.h"
-
-#include "ResultsListWidget.moc"
diff --git a/src/modules/welcome/checker/ResultsListWidget.h b/src/modules/welcome/checker/ResultsListWidget.h
index 5e96b74a0..1f2f630fb 100644
--- a/src/modules/welcome/checker/ResultsListWidget.h
+++ b/src/modules/welcome/checker/ResultsListWidget.h
@@ -11,26 +11,36 @@
 #ifndef CHECKER_RESULTSLISTWIDGET_H
 #define CHECKER_RESULTSLISTWIDGET_H
 
-#include "ResultWidget.h"
-
 #include "Config.h"
 
 #include 
 
+class CountdownWaitingWidget;
+
+class QBoxLayout;
 class QLabel;
+
 class ResultsListWidget : public QWidget
 {
     Q_OBJECT
 public:
     explicit ResultsListWidget( Config* config, QWidget* parent );
 
-private:
-    /// @brief A link in the explanatory text has been clicked
-    void linkClicked( const QString& link );
-    void retranslate();
+    /// @brief The model of requirements has finished a round of checking
+    void requirementsComplete();
 
-    QList< ResultWidget* > m_resultWidgets;  ///< One widget for each unsatisfied entry
+private:
     Config* m_config = nullptr;
+
+    // UI parts, which need updating when the model changes
+    QLabel* m_explanation = nullptr;
+    CountdownWaitingWidget* m_countdown = nullptr;
+    // There is a central widget, which can be:
+    // - a list widget showing failed requirements
+    // - nullptr (when displaying a pretty label for language / splash purposes)
+    // it is placed in the central layout.
+    QWidget* m_centralWidget = nullptr;
+    QBoxLayout* m_centralLayout = nullptr;
 };
 
 #endif  // CHECKER_RESULTSLISTWIDGET_H
diff --git a/src/modules/welcome/welcome.conf b/src/modules/welcome/welcome.conf
index 6e11817bf..90bf9d115 100644
--- a/src/modules/welcome/welcome.conf
+++ b/src/modules/welcome/welcome.conf
@@ -64,6 +64,18 @@ requirements:
     # the host system satisfying the condition.
     #
     # This sample file lists all the conditions that are known.
+    #
+    # Note that the last three checks are for testing-purposes only,
+    # and shouldn't be used in production (they are only available
+    # when building Calamares in development mode). There are five
+    # special checks:
+    # - *false* is a check that is always false (unsatisfied)
+    # - *true* is a check that is always true (satisfied)
+    # - *slow-false* takes 3 seconds, and then is false; use this one to
+    #   show off the waiting-spinner before the first results come in
+    # - *slow-true* takes 3 seconds, and then is true
+    # - *snark* is a check that is only satisfied once it has been checked
+    #   at least three times ("what I tell you three times is true").
     check:
         - storage
         - ram
@@ -71,6 +83,9 @@ requirements:
         - internet
         - root
         - screen
+        - false
+        - true
+        - snark
     # List conditions that **must** be satisfied (from the list
     # of conditions, above) for installation to proceed.
     # If any of these conditions are not met, the user cannot
diff --git a/src/modules/welcome/welcome.schema.yaml b/src/modules/welcome/welcome.schema.yaml
index fbebcd968..30b3e4866 100644
--- a/src/modules/welcome/welcome.schema.yaml
+++ b/src/modules/welcome/welcome.schema.yaml
@@ -21,10 +21,10 @@ properties:
             internetCheckUrl: { type: string }
             check:
                 type: array
-                items: { type: string, enum: [storage, ram, power, internet, root, screen], unique: true }
+                items: { type: string, enum: [storage, ram, power, internet, root, screen, "false", "true", "slow-false", "slow-true", snark], unique: true }
             required:  # Key-name in the config-file
                 type: array
-                items: { type: string, enum: [storage, ram, power, internet, root, screen], unique: true }
+                items: { type: string, enum: [storage, ram, power, internet, root, screen, "false", "true", "slow-false", "slow-true", snark], unique: true }
         required: [ requiredStorage, requiredRam, check ]  # Schema keyword
 
     # TODO: refactor, this is reused in locale
diff --git a/src/modules/welcomeq/CMakeLists.txt b/src/modules/welcomeq/CMakeLists.txt
index b6f950dad..7afdf638c 100644
--- a/src/modules/welcomeq/CMakeLists.txt
+++ b/src/modules/welcomeq/CMakeLists.txt
@@ -7,34 +7,31 @@
 # This is a re-write of the welcome module using QML view steps
 # instead of widgets.
 
-if( NOT WITH_QML )
+if(NOT WITH_QML)
     calamares_skip_module( "welcomeq (QML is not supported in this build)" )
     return()
 endif()
 
-set( _welcome ${CMAKE_CURRENT_SOURCE_DIR}/../welcome )
+set(_welcome ${CMAKE_CURRENT_SOURCE_DIR}/../welcome)
 
-include_directories( ${_welcome} )
+include_directories(${_welcome})
 
 # DUPLICATED WITH WELCOME MODULE
-find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network )
+find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network)
 
-find_package( LIBPARTED )
-if ( LIBPARTED_FOUND )
-    set( PARTMAN_SRC ${_welcome}/checker/partman_devices.c )
-    set( CHECKER_LINK_LIBRARIES ${LIBPARTED_LIBRARY} )
+find_package(LIBPARTED)
+if(LIBPARTED_FOUND)
+    set(PARTMAN_SRC ${_welcome}/checker/partman_devices.c)
+    set(CHECKER_LINK_LIBRARIES ${LIBPARTED_LIBRARY})
 else()
-    set( PARTMAN_SRC )
-    set( CHECKER_LINK_LIBRARIES )
-    add_definitions( -DWITHOUT_LIBPARTED )
+    set(PARTMAN_SRC)
+    set(CHECKER_LINK_LIBRARIES)
+    add_definitions(-DWITHOUT_LIBPARTED)
 endif()
 
-set( CHECKER_SOURCES
-    ${_welcome}/checker/GeneralRequirements.cpp
-    ${PARTMAN_SRC}
-)
+set(CHECKER_SOURCES ${_welcome}/checker/GeneralRequirements.cpp ${PARTMAN_SRC})
 
-calamares_add_plugin( welcomeq
+calamares_add_plugin(welcomeq
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
diff --git a/src/modules/welcomeq/about.qml b/src/modules/welcomeq/about.qml
deleted file mode 100644
index bb7b06056..000000000
--- a/src/modules/welcomeq/about.qml
+++ /dev/null
@@ -1,95 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2020 Anke Boersma 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-import io.calamares.ui 1.0
-
-import QtQuick 2.7
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.3
-
-Item {
-    width: parent.width
-    height: parent.height
-    focus: true
-
-    Rectangle {
-        id: textArea
-        x: 28
-        y: 14
-        anchors.fill: parent
-        color: "#f2f2f2"
-
-        Column {
-            id: column
-            x: 130
-            y: 40
-
-
-            Rectangle {
-                width: 560
-                height: 250
-                radius: 10
-                border.width: 0
-
-                Text {
-                    width: 400
-                    height: 250
-                    anchors.centerIn: parent
-                    text: config.aboutMessage.arg(Branding.string(Branding.VersionedName))
-
-                        onLinkActivated: Qt.openUrlExternally(link)
-
-                        MouseArea {
-                            anchors.fill: parent
-                            acceptedButtons: Qt.NoButton
-                            cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
-                        }
-
-                    font.pointSize: 10
-                    anchors.verticalCenterOffset: 10
-                    anchors.horizontalCenterOffset: 40
-                    wrapMode: Text.WordWrap
-                }
-
-                Image {
-                    id: image
-                    x: 8
-                    y: 12
-                    height: 100
-                    fillMode: Image.PreserveAspectFit
-                    source: "img/squid.png"
-                }
-
-            }
-
-        }
-
-        ToolButton {
-            id: toolButton
-            x: 19
-            y: 29
-            width: 105
-            height: 48
-            text: qsTr("Back")
-            hoverEnabled: true
-            onClicked: load.source = ""
-
-            Image {
-                id: image1
-                x: 0
-                y: 13
-                width: 22
-                height: 22
-                source: "img/chevron-left-solid.svg"
-                fillMode: Image.PreserveAspectFit
-            }
-        }
-    }
-
-}
diff --git a/src/modules/welcomeq/welcomeq.qml b/src/modules/welcomeq/welcomeq.qml
index 02b5424c7..acb1cebf2 100644
--- a/src/modules/welcomeq/welcomeq.qml
+++ b/src/modules/welcomeq/welcomeq.qml
@@ -61,20 +61,6 @@ Page
 
             spacing: Kirigami.Units.largeSpacing* 2
 
-            Button {
-                Layout.fillWidth: true
-                text: qsTr("About")
-                icon.name: "dialog-information"
-                Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4)
-                Kirigami.Theme.textColor: Kirigami.Theme.textColor
-
-                visible: true
-                onClicked: {
-                    //onClicked: load.source = "file:/usr/share/calamares/branding/default/show.qml"
-                    onClicked: load.source = "about.qml"
-                }
-            }
-
             Button {
                 Layout.fillWidth: true
                 text: qsTr("Support")
diff --git a/src/modules/welcomeq/welcomeq.qrc b/src/modules/welcomeq/welcomeq.qrc
index ef41f816a..6f7a9c5df 100644
--- a/src/modules/welcomeq/welcomeq.qrc
+++ b/src/modules/welcomeq/welcomeq.qrc
@@ -1,7 +1,6 @@
 
 
   welcomeq.qml
-  about.qml
   release_notes.qml
   Recommended.qml
   Requirements.qml
diff --git a/src/modules/zfs/CMakeLists.txt b/src/modules/zfs/CMakeLists.txt
index 2feb911d0..07764a360 100644
--- a/src/modules/zfs/CMakeLists.txt
+++ b/src/modules/zfs/CMakeLists.txt
@@ -3,11 +3,10 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-calamares_add_plugin( zfs
+calamares_add_plugin(zfs
     TYPE job
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         ZfsJob.cpp
     SHARED_LIB
 )
-
diff --git a/src/qml/calamares/CMakeLists.txt b/src/qml/calamares/CMakeLists.txt
index d74e79ea0..07e376bfa 100644
--- a/src/qml/calamares/CMakeLists.txt
+++ b/src/qml/calamares/CMakeLists.txt
@@ -12,29 +12,31 @@
 
 # Iterate over all the subdirectories which have a qmldir file, copy them over to the build dir,
 # and install them into share/calamares/qml/calamares
-file( GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*" )
-foreach( SUBDIRECTORY ${SUBDIRECTORIES} )
-    if( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}"
-        AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/qmldir" )
-
-        set( QML_DIR share/calamares/qml )
-        set( QML_MODULE_DESTINATION ${QML_DIR}/calamares/${SUBDIRECTORY} )
+file(GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*")
+foreach(SUBDIRECTORY ${SUBDIRECTORIES})
+    if(
+        IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}"
+        AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/qmldir"
+    )
+        set(QML_DIR share/calamares/qml)
+        set(QML_MODULE_DESTINATION ${QML_DIR}/calamares/${SUBDIRECTORY})
 
         # We glob all the files inside the subdirectory, and we make sure they are
         # synced with the bindir structure and installed.
-        file( GLOB QML_MODULE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY} "${SUBDIRECTORY}/*" )
-        foreach( QML_MODULE_FILE ${QML_MODULE_FILES} )
-            if( NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${QML_MODULE_FILE} )
-                configure_file( ${SUBDIRECTORY}/${QML_MODULE_FILE} ${SUBDIRECTORY}/${QML_MODULE_FILE} COPYONLY )
+        file(GLOB QML_MODULE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY} "${SUBDIRECTORY}/*")
+        foreach(QML_MODULE_FILE ${QML_MODULE_FILES})
+            if(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${QML_MODULE_FILE})
+                configure_file(${SUBDIRECTORY}/${QML_MODULE_FILE} ${SUBDIRECTORY}/${QML_MODULE_FILE} COPYONLY)
 
-                install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/${QML_MODULE_FILE}
-                         DESTINATION ${QML_MODULE_DESTINATION} )
+                install(
+                    FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/${QML_MODULE_FILE}
+                    DESTINATION ${QML_MODULE_DESTINATION}
+                )
             endif()
         endforeach()
 
-        message( "-- ${BoldYellow}Configured QML module: ${BoldRed}calamares.${SUBDIRECTORY}${ColorReset}" )
-
+        message("-- ${BoldYellow}Configured QML module: ${BoldRed}calamares.${SUBDIRECTORY}${ColorReset}")
     endif()
 endforeach()
 
-message( "" )
+message("")