Merge branch 'master' of https://github.com/calamares/calamares into development

2018-09-24 20:13:16 +02:00 · 2018-09-24 20:13:16 +02:00 · d0488b7d0c
commit d0488b7d0c
parent da89f461bd d752223d0b
25 changed files with 219 additions and 164 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,6 +1,11 @@
-.tx/* export-ignore
-hacking/* export-ignore
-HACKING.md export-ignore
-.editorconfig export-ignore
-src/modules/testmodule.py export-ignore
+.editorconfig                  export-ignore
+.gitattributes                 export-ignore
+.github                        export-ignore
+.gitignore                     export-ignore
+.gitmodules                    export-ignore
+.travis.yml                    export-ignore
+.tx                            export-ignore
+
+src/modules/testmodule.py      export-ignore
 src/modules/globalStorage.yaml export-ignore
+
--- a/.travis.yml
+++ b/.travis.yml
@ -16,5 +16,5 @@ install:
  - docker build -t calamares .

 script:
-  - docker run -v $PWD:/src --tmpfs /build:rw,size=65536k -e SRCDIR=/src -e BUILDDIR=/build calamares "/src/ci/travis.sh"
+  - docker run -v $PWD:/src --tmpfs /build:rw,size=81920k -e SRCDIR=/src -e BUILDDIR=/build calamares "/src/ci/travis.sh"

--- a/28
+++ b/28
@ -3,15 +3,21 @@ 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.3 (unreleased) =
+# 3.2.3 (unreleased) #

 This release contains contributions from (alphabetically by first name):
+ - Alf Gaida
+ - Caio Carvalho
+ - Philip Mueller

-== Core ==
+## Core ##

-== Modules ==
+## Modules ##

-= 3.2.2 (2018-09-04) =
+ * The *partition* module supports RAID devices, but only when Calamares
+   is compiled with the newest KPMCore release.
+
+# 3.2.2 (2018-09-04) #

 This release contains contributions from (alphabetically by first name):
 - Andrius Štikonas
@ -22,7 +28,7 @@ This release contains contributions from (alphabetically by first name):
 - Simon Quigley
 - Walter Lapchynski

-== Core ==
+## Core ##

 * Example configurations are **no longer installed** by default.
   The default setting for *INSTALL_CONFIG* has changed. Distributions
@ -38,7 +44,7 @@ This release contains contributions from (alphabetically by first name):
 * A new `ci/RELEASE.sh` script has been added to streamline releases;
   it is not guaranteed to work anywhere in particular though.

-== Modules ==
+## Modules ##

 * When multiple modules are mutually exclusive, or don't make sense
   to enable concurrectly, a new `USE_<foo>` framework has been added
@ -68,7 +74,7 @@ This release contains contributions from (alphabetically by first name):
   Distro's are **strongly advised** to re-test their DM configuration
   and installation with the revamped code.

-**3.2.1** (2018-06-25)
+# 3.2.1 (2018-06-25) #

 This release contains contributions from (alphabetically by first name):
 - Bill Auguer
@ -76,7 +82,7 @@ This release contains contributions from (alphabetically by first name):
 - Phil Mueller
 - Raul Rodrigo Segura

- == Core ==
+## Core ##

 * Qt 5.7 is now the minimum required Qt version. Because KPMCore
   (a fairly fundamental dependency) requires Qt 5.7, Calamares
@ -91,7 +97,7 @@ This release contains contributions from (alphabetically by first name):
   ignoring some configuration errors. This will certainly cause
   problems for distributions with sloppy configurations.

-== Modules ==
+## Modules ##

 * New module preservefiles, keeps (log) files around after install;
   this duplicates functionality with the unmount module, but unmount
@ -111,7 +117,7 @@ This release contains contributions from (alphabetically by first name):
   all the comment-lines in the file and writes enabled locales
   at the end, with a descriptive comment.

-**3.2.0** (2018-05-17)
+# 3.2.0 (2018-05-17) #

 This release contains contributions from (alphabetically by first name):
 - Alf Gaida
@ -119,7 +125,7 @@ This release contains contributions from (alphabetically by first name):
 - Caio Carvalho
 - Frede H

-== Modules ==
+## Modules ##

 * UI annoyances in the partitioning module were fixed; the
   mount-point selector is now more obvious when no mount-point
--- a/CMakeModules/CalamaresAddBrandingSubdirectory.cmake
+++ b/CMakeModules/CalamaresAddBrandingSubdirectory.cmake
@ -79,10 +79,8 @@ function( calamares_add_branding NAME )
    endforeach()

    message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} branding component: ${BoldRed}${NAME}${ColorReset}" )
-    if( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
-        message( "   ${Green}TYPE:${ColorReset} branding component" )
-        message( "   ${Green}BRANDING_COMPONENT_DESTINATION:${ColorReset} ${BRANDING_COMPONENT_DESTINATION}" )
-    endif()
+    message( "   ${Green}TYPE:${ColorReset} branding component" )
+    message( "   ${Green}BRANDING_COMPONENT_DESTINATION:${ColorReset} ${BRANDING_COMPONENT_DESTINATION}" )
 endfunction()

 # Usage calamares_add_branding_translations( <name> [DIRECTORY <dir>])
--- a/CMakeModules/CalamaresAddModuleSubdirectory.cmake
+++ b/CMakeModules/CalamaresAddModuleSubdirectory.cmake
@ -99,19 +99,17 @@ function( calamares_add_module_subdirectory )
            endforeach()

            message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} module: ${BoldRed}${SUBDIRECTORY}${ColorReset}" )
-            if( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
-                message( "   ${Green}TYPE:${ColorReset} jobmodule" )
-                message( "   ${Green}MODULE_DESTINATION:${ColorReset} ${MODULE_DESTINATION}" )
-                if( MODULE_CONFIG_FILES )
-                    if ( INSTALL_CONFIG )
-                        set( _destination "${MODULE_DATA_DESTINATION}" )
-                    else()
-                        set( _destination "[Build directory only]" )
-                    endif()
-                    message( "   ${Green}CONFIGURATION_FILES:${ColorReset} ${MODULE_CONFIG_FILES} => ${_destination}" )
+            message( "   ${Green}TYPE:${ColorReset} jobmodule" )
+            message( "   ${Green}MODULE_DESTINATION:${ColorReset} ${MODULE_DESTINATION}" )
+            if( MODULE_CONFIG_FILES )
+                if ( INSTALL_CONFIG )
+                    set( _destination "${MODULE_DATA_DESTINATION}" )
+                else()
+                    set( _destination "[Build directory only]" )
                endif()
-                message( "" )
+                message( "   ${Green}CONFIGURATION_FILES:${ColorReset} ${MODULE_CONFIG_FILES} => ${_destination}" )
            endif()
+            message( "" )
            # We copy over the lang directory, if any
            if( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/lang" )
                install_calamares_gettext_translations(
--- a/CMakeModules/CalamaresAddPlugin.cmake
+++ b/CMakeModules/CalamaresAddPlugin.cmake
@ -62,28 +62,27 @@ function( calamares_add_plugin )
    set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

    message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} module: ${BoldRed}${PLUGIN_NAME}${ColorReset}" )
-    if( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
-        message( "   ${Green}TYPE:${ColorReset} ${PLUGIN_TYPE}" )
-        message( "   ${Green}LINK_LIBRARIES:${ColorReset} ${PLUGIN_LINK_LIBRARIES}" )
-        message( "   ${Green}LINK_PRIVATE_LIBRARIES:${ColorReset} ${PLUGIN_LINK_PRIVATE_LIBRARIES}" )
-        message( "   ${Green}PLUGIN_DESTINATION:${ColorReset} ${PLUGIN_DESTINATION}" )
-        if( PLUGIN_CONFIG_FILES )
-            set( _destination "(unknown)" )
-            if ( INSTALL_CONFIG AND NOT PLUGIN_NO_INSTALL )
-                set( _destination "${PLUGIN_DATA_DESTINATION}" )
-            elseif( NOT PLUGIN_NO_INSTALL )
-                # Not INSTALL_CONFIG
-                set( _destination "[Build directory only]" )
-            else()
-                set( _destination "[Skipping installation]" )
-            endif()
-            message( "   ${Green}CONFIGURATION_FILES:${ColorReset} ${PLUGIN_CONFIG_FILES} => ${_destination}" )
+    message( "   ${Green}TYPE:${ColorReset} ${PLUGIN_TYPE}" )
+    message( "   ${Green}LINK_LIBRARIES:${ColorReset} ${PLUGIN_LINK_LIBRARIES}" )
+    message( "   ${Green}LINK_PRIVATE_LIBRARIES:${ColorReset} ${PLUGIN_LINK_PRIVATE_LIBRARIES}" )
+    message( "   ${Green}PLUGIN_DESTINATION:${ColorReset} ${PLUGIN_DESTINATION}" )
+    if( PLUGIN_CONFIG_FILES )
+        set( _destination "(unknown)" )
+        if ( INSTALL_CONFIG AND NOT PLUGIN_NO_INSTALL )
+            set( _destination "${PLUGIN_DATA_DESTINATION}" )
+        elseif( NOT PLUGIN_NO_INSTALL )
+            # Not INSTALL_CONFIG
+            set( _destination "[Build directory only]" )
+        else()
+            set( _destination "[Skipping installation]" )
        endif()
-        if( PLUGIN_RESOURCES )
-            message( "   ${Green}RESOURCES:${ColorReset} ${PLUGIN_RESOURCES}" )
-        endif()
-        message( "" )
+        message( "   ${Green}CONFIGURATION_FILES:${ColorReset} ${PLUGIN_CONFIG_FILES} => ${_destination}" )
    endif()
+    if( PLUGIN_RESOURCES )
+        message( "   ${Green}RESOURCES:${ColorReset} ${PLUGIN_RESOURCES}" )
+    endif()
+    message( "" )
+
    # create target name once for convenience
    set( target "calamares_${PLUGIN_TYPE}_${PLUGIN_NAME}" )

--- a/calamares.desktop
+++ b/calamares.desktop
@ -21,7 +21,7 @@ Name[be]=Усталяваць сістэму
 Icon[bg]=calamares
 GenericName[bg]=Системен Инсталатор
 Comment[bg]=Calamares — Системен Инсталатор
-Name[bg]=Инсталирай система
+Name[bg]=Инсталирай системата
 Icon[ca]=calamares
 GenericName[ca]=Instal·lador de sistema
 Comment[ca]=Calamares — Instal·lador de sistema
--- a/ci/travis-continuous.sh
+++ b/ci/travis-continuous.sh
@ -21,16 +21,34 @@ echo -e "###\n### make\n###"
 make -j2 || { make -j1 VERBOSE=1 ; echo "! Make failed" ; exit 1 ; }

 echo -e "###\n### make install\n###"
+
+install_debugging() {
+	ls -la $( find "$1" -type f -name '*.so' )
+}
+
+echo "# System status"
+df -h
+
 echo "# Build results"
-find "$BUILDDIR" -name '*.so'
+install_debugging "$BUILDDIR"

 echo "# Install"
 DESTDIR=/build/INSTALL_ROOT
 mkdir -p "$DESTDIR"

-result=true
-make install VERBOSE=1 DESTDIR="$DESTDIR" || result=false
+if make install VERBOSE=1 DESTDIR="$DESTDIR" ;
+then
+	echo "# .. install OK"
+	result=true
+else
+	echo "# .. install failed"
+	result=false
+fi
+
+echo "# System status"
+df -h

 echo "# Install results"
-find "$DESTDIR" -type f
+install_debugging "$DESTDIR"
+
 $result  # Result of make install, above
--- a/lang/calamares_bg.ts
+++ b/lang/calamares_bg.ts
@ -50,7 +50,7 @@
    <message>
        <location filename="../src/libcalamaresui/viewpages/BlankViewStep.cpp" line="69"/>
        <source>Blank Page</source>
-        <translation type="unfinished"/>
+        <translation>Празна страница</translation>
    </message>
 </context>
 <context>
@ -192,22 +192,22 @@
    <message>
        <location filename="../src/libcalamaresui/ViewManager.cpp" line="179"/>
        <source>Calamares Initialization Failed</source>
-        <translation type="unfinished"/>
+        <translation>Инициализацията на Calamares се провали</translation>
    </message>
    <message>
        <location filename="../src/libcalamaresui/ViewManager.cpp" line="180"/>
        <source>%1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.</source>
-        <translation type="unfinished"/>
+        <translation>%1 не може да се инсталира. Calamares не можа да зареди всичките конфигурирани модули. Това е проблем с начина, по който Calamares е използван от дистрибуцията.</translation>
    </message>
    <message>
        <location filename="../src/libcalamaresui/ViewManager.cpp" line="185"/>
        <source>&lt;br/&gt;The following modules could not be loaded:</source>
-        <translation type="unfinished"/>
+        <translation>&lt;br/&gt;Следните модули не могат да се заредят:</translation>
    </message>
    <message>
        <location filename="../src/libcalamaresui/ViewManager.cpp" line="277"/>
        <source>&amp;Install</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Инсталирай</translation>
    </message>
    <message>
        <location filename="../src/libcalamaresui/ViewManager.cpp" line="325"/>
@ -287,17 +287,17 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/libcalamares/PythonHelper.cpp" line="284"/>
        <source>unparseable Python error</source>
-        <translation>неанализируема Python грешка</translation>
+        <translation>неанализируема грешка на Python</translation>
    </message>
    <message>
        <location filename="../src/libcalamares/PythonHelper.cpp" line="324"/>
        <source>unparseable Python traceback</source>
-        <translation>неанализируемо Python проследяване</translation>
+        <translation>неанализируемо проследяване на Python</translation>
    </message>
    <message>
        <location filename="../src/libcalamares/PythonHelper.cpp" line="329"/>
        <source>Unfetchable Python error.</source>
-        <translation>Недостъпна Python грешка.</translation>
+        <translation>Недостъпна грешка на Python.</translation>
    </message>
 </context>
 <context>
@ -504,17 +504,17 @@ The installer will quit and all changes will be lost.</source>
        <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
        <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
        <source>Could not run command.</source>
-        <translation type="unfinished"/>
+        <translation>Командата не може да се изпълни.</translation>
    </message>
    <message>
        <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
        <source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
-        <translation type="unfinished"/>
+        <translation>Командата се изпълнява в средата на хоста и трябва да установи местоположението на основния дял, но rootMountPoint не е определен.</translation>
    </message>
    <message>
        <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
        <source>The command needs to know the user&apos;s name, but no username is defined.</source>
-        <translation type="unfinished"/>
+        <translation>Командата трябва да установи потребителското име на профила, но такова не е определено.</translation>
    </message>
 </context>
 <context>
@ -522,7 +522,7 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/contextualprocess/ContextualProcessJob.cpp" line="117"/>
        <source>Contextual Processes Job</source>
-        <translation type="unfinished"/>
+        <translation>Задача с контекстуални процеси</translation>
    </message>
 </context>
 <context>
@ -580,7 +580,7 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="72"/>
        <source>En&amp;crypt</source>
-        <translation>En%crypt</translation>
+        <translation>Ши&amp;фриране</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="151"/>
@ -784,12 +784,12 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="131"/>
        <source>Write LUKS configuration for Dracut to %1</source>
-        <translation type="unfinished"/>
+        <translation>Запиши LUKS конфигурация за Dracut на %1</translation>
    </message>
    <message>
        <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="133"/>
        <source>Skip writing LUKS configuration for Dracut: &quot;/&quot; partition is not encrypted</source>
-        <translation type="unfinished"/>
+        <translation>Пропусни записването на LUKS конфигурация за Dracut: &quot;/&quot; дял не е шифриран</translation>
    </message>
    <message>
        <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="149"/>
@ -939,7 +939,7 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/finished/FinishedPage.ui" line="95"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot; font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Когато тази опция е избрана, Вашата система ще се рестартира незабавно при натискане на &lt;span style=&quot; font-style:italic;&quot;&gt;Готово&lt;/span&gt; или при затваряне на инсталатора.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
    </message>
    <message>
        <location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
@ -954,7 +954,7 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/finished/FinishedPage.cpp" line="109"/>
        <source>&lt;h1&gt;Installation Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been installed on your computer.&lt;br/&gt;The error message was: %2.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;h1&gt;Инсталацията е неуспешна&lt;/h1&gt;&lt;br/&gt;%1 не е инсталиран на Вашия компютър.&lt;br/&gt;Съобщението с грешката е: %2.</translation>
    </message>
 </context>
 <context>
@ -967,12 +967,12 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/finished/FinishedViewStep.cpp" line="124"/>
        <source>Installation Complete</source>
-        <translation type="unfinished"/>
+        <translation>Инсталацията е завършена</translation>
    </message>
    <message>
        <location filename="../src/modules/finished/FinishedViewStep.cpp" line="125"/>
        <source>The installation of %1 is complete.</source>
-        <translation type="unfinished"/>
+        <translation>Инсталацията на %1 е завършена.</translation>
    </message>
 </context>
 <context>
@ -1156,7 +1156,7 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/locale/LocalePage.cpp" line="389"/>
        <source>The numbers and dates locale will be set to %1.</source>
-        <translation type="unfinished"/>
+        <translation>Форматът на цифрите и датата ще бъде %1.</translation>
    </message>
    <message>
        <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
@ -1214,12 +1214,12 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="86"/>
        <source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
-        <translation type="unfinished"/>
+        <translation>Мрежова инсталация. (Изключена: Списъкът с пакети не може да бъде извлечен, проверете Вашата Интернет връзка)</translation>
    </message>
    <message>
        <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="96"/>
        <source>Network Installation. (Disabled: Received invalid groups data)</source>
-        <translation type="unfinished"/>
+        <translation>Мрежова инсталация. (Изключена: Получени са данни за невалидни групи)</translation>
    </message>
 </context>
 <context>
@ -1250,12 +1250,12 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="158"/>
        <source>Memory allocation error when setting &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Грешка при разпределяне на паметта по време на настройването на &apos;%1&apos;</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="162"/>
        <source>Memory allocation error</source>
-        <translation type="unfinished"/>
+        <translation>Грешка при разпределяне на паметта</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="164"/>
@ -1270,7 +1270,7 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="168"/>
        <source>The password differs with case changes only</source>
-        <translation type="unfinished"/>
+        <translation>Паролата се различава само със смяна на главни и малки букви</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="170"/>
@ -1280,62 +1280,62 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="172"/>
        <source>The password contains the user name in some form</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа потребителското име под някаква форма</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="174"/>
        <source>The password contains words from the real name of the user in some form</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа думи от истинското име на потребителя под някаква форма</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="176"/>
        <source>The password contains forbidden words in some form</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа забранени думи под някаква форма</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="179"/>
        <source>The password contains less than %1 digits</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа по-малко от %1 цифри</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="180"/>
        <source>The password contains too few digits</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа твърде малко цифри</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="183"/>
        <source>The password contains less than %1 uppercase letters</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа по-малко от %1 главни букви</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="184"/>
        <source>The password contains too few uppercase letters</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа твърде малко главни букви</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="187"/>
        <source>The password contains less than %1 lowercase letters</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа по-малко от %1 малки букви</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="188"/>
        <source>The password contains too few lowercase letters</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа твърде малко малки букви</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="191"/>
        <source>The password contains less than %1 non-alphanumeric characters</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа по-малко от %1 знаци, които не са букви или цифри</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="192"/>
        <source>The password contains too few non-alphanumeric characters</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа твърде малко знаци, които не са букви или цифри</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="195"/>
        <source>The password is shorter than %1 characters</source>
-        <translation type="unfinished"/>
+        <translation>Паролата е по-малка от %1 знаци</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="196"/>
@ -1345,47 +1345,47 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="198"/>
        <source>The password is just rotated old one</source>
-        <translation type="unfinished"/>
+        <translation>Паролата е обърнат вариант на старата</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="201"/>
        <source>The password contains less than %1 character classes</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа по-малко от %1 видове знаци</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="202"/>
        <source>The password does not contain enough character classes</source>
-        <translation type="unfinished"/>
+        <translation>Паролата не съдържа достатъчно видове знаци</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="205"/>
        <source>The password contains more than %1 same characters consecutively</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа повече от %1 еднакви знаци последователно</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="206"/>
        <source>The password contains too many same characters consecutively</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа твърде много еднакви знаци последователно</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="209"/>
        <source>The password contains more than %1 characters of the same class consecutively</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа повече от %1 еднакви видове знаци последователно</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="210"/>
        <source>The password contains too many characters of the same class consecutively</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа твърде много еднакви видове знаци последователно</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="213"/>
        <source>The password contains monotonic sequence longer than %1 characters</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа монотонна последователност, по-дълга от %1 знаци</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="214"/>
        <source>The password contains too long of a monotonic character sequence</source>
-        <translation type="unfinished"/>
+        <translation>Паролата съдържа твърде дълга монотонна последователност от знаци</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="216"/>
@ -1395,77 +1395,77 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="218"/>
        <source>Cannot obtain random numbers from the RNG device</source>
-        <translation type="unfinished"/>
+        <translation>Получаването на произволни числа от RNG устройството е неуспешно</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="220"/>
        <source>Password generation failed - required entropy too low for settings</source>
-        <translation type="unfinished"/>
+        <translation>Генерирането на парола е неуспешно - необходимата ентропия е твърде ниска за настройки</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="225"/>
        <source>The password fails the dictionary check - %1</source>
-        <translation type="unfinished"/>
+        <translation>Паролата не издържа проверката на речника - %1</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="227"/>
        <source>The password fails the dictionary check</source>
-        <translation type="unfinished"/>
+        <translation>Паролата не издържа проверката на речника</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="231"/>
        <source>Unknown setting - %1</source>
-        <translation type="unfinished"/>
+        <translation>Неизвестна настройка - %1</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="235"/>
        <source>Unknown setting</source>
-        <translation type="unfinished"/>
+        <translation>Неизвестна настройка</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="239"/>
        <source>Bad integer value of setting - %1</source>
-        <translation type="unfinished"/>
+        <translation>Невалидна числена стойност на настройката - %1</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="243"/>
        <source>Bad integer value</source>
-        <translation type="unfinished"/>
+        <translation>Невалидна числена стойност на настройката</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="247"/>
        <source>Setting %1 is not of integer type</source>
-        <translation type="unfinished"/>
+        <translation>Настройката %1 не е от числов вид</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="251"/>
        <source>Setting is not of integer type</source>
-        <translation type="unfinished"/>
+        <translation>Настройката не е от числов вид</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="255"/>
        <source>Setting %1 is not of string type</source>
-        <translation type="unfinished"/>
+        <translation>Настройката %1 не е от текстов вид</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="259"/>
        <source>Setting is not of string type</source>
-        <translation type="unfinished"/>
+        <translation>Настройката не е от текстов вид</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="261"/>
        <source>Opening the configuration file failed</source>
-        <translation type="unfinished"/>
+        <translation>Отварянето на файла с конфигурацията е неуспешно</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="263"/>
        <source>The configuration file is malformed</source>
-        <translation type="unfinished"/>
+        <translation>Файлът с конфигурацията е деформиран</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="265"/>
        <source>Fatal failure</source>
-        <translation type="unfinished"/>
+        <translation>Фатална повреда</translation>
    </message>
    <message>
        <location filename="../src/modules/users/CheckPWQuality.cpp" line="267"/>
@ -1664,7 +1664,7 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="107"/>
        <source>Cre&amp;ate</source>
-        <translation type="unfinished"/>
+        <translation>Съз&amp;дай</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="114"/>
@ -1689,12 +1689,12 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="195"/>
        <source>Can not create new partition</source>
-        <translation type="unfinished"/>
+        <translation>Не може да се създаде нов дял</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="196"/>
        <source>The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.</source>
-        <translation type="unfinished"/>
+        <translation>Таблицата на дяловете на %1 вече има %2 главни дялове, повече не може да се добавят. Моля, премахнете един главен дял и добавете разширен дял, на негово място.</translation>
    </message>
 </context>
 <context>
@ -1787,7 +1787,7 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="450"/>
        <source>Boot partition not encrypted</source>
-        <translation type="unfinished"/>
+        <translation>Липсва криптиране на дял за начално зареждане</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="451"/>
@ -1819,7 +1819,7 @@ The installer will quit and all changes will be lost.</source>
    <message>
        <location filename="../src/modules/plasmalnf/page_plasmalnf.ui" line="20"/>
        <source>Placeholder</source>
-        <translation type="unfinished"/>
+        <translation>Заместител</translation>
    </message>
    <message>
        <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="67"/>
@ -1866,7 +1866,9 @@ There was no output from the command.</source>
        <source>
 Output:
 </source>
-        <translation type="unfinished"/>
+        <translation>
+Резултат:
+</translation>
    </message>
    <message>
        <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="275"/>
@ -2088,7 +2090,7 @@ Output:
    <message>
        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="163"/>
        <source>The screen is too small to display the installer.</source>
-        <translation type="unfinished"/>
+        <translation>Екранът е твърде малък за инсталатора.</translation>
    </message>
 </context>
 <context>
@ -2290,7 +2292,7 @@ Output:
    <message>
        <location filename="../src/modules/users/SetPasswordJob.cpp" line="113"/>
        <source>rootMountPoint is %1</source>
-        <translation>root точка на монтиране е %1</translation>
+        <translation>rootMountPoint е %1</translation>
    </message>
    <message>
        <location filename="../src/modules/users/SetPasswordJob.cpp" line="123"/>
@ -2328,7 +2330,7 @@ Output:
    <message>
        <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="72"/>
        <source>Bad path: %1</source>
-        <translation>Лош път: %1</translation>
+        <translation>Невалиден път: %1</translation>
    </message>
    <message>
        <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="86"/>
@ -2365,7 +2367,7 @@ Output:
        <location filename="../src/qml/calamares/slideshow/SlideCounter.qml" line="36"/>
        <source>%L1 / %L2</source>
        <extracomment>slide counter, %1 of %2 (numeric)</extracomment>
-        <translation type="unfinished"/>
+        <translation>%L1 / %L2</translation>
    </message>
 </context>
 <context>
@ -2446,7 +2448,7 @@ Output:
    <message>
        <location filename="../src/modules/tracking/page_trackingstep.ui" line="24"/>
        <source>Placeholder</source>
-        <translation type="unfinished"/>
+        <translation>Заместител</translation>
    </message>
    <message>
        <location filename="../src/modules/tracking/page_trackingstep.ui" line="72"/>
@ -2458,7 +2460,7 @@ Output:
        <location filename="../src/modules/tracking/page_trackingstep.ui" line="185"/>
        <location filename="../src/modules/tracking/page_trackingstep.ui" line="247"/>
        <source>TextLabel</source>
-        <translation type="unfinished"/>
+        <translation>TextLabel</translation>
    </message>
    <message>
        <location filename="../src/modules/tracking/page_trackingstep.ui" line="133"/>
@ -2498,7 +2500,7 @@ Output:
    <message>
        <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
        <source>Feedback</source>
-        <translation type="unfinished"/>
+        <translation>Обратна връзка</translation>
    </message>
 </context>
 <context>
@ -2583,7 +2585,7 @@ Output:
    <message>
        <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
        <source>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;h1&gt;Добре дошли при инсталатора Calamares на %1.&lt;/h1&gt;</translation>
    </message>
    <message>
        <location filename="../src/modules/welcome/WelcomePage.cpp" line="73"/>
@ -2593,7 +2595,7 @@ Output:
    <message>
        <location filename="../src/modules/welcome/WelcomePage.cpp" line="75"/>
        <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;https://calamares.io/&quot;&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;за %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Авторско право 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Авторско право 2017 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Благодарности към: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg и &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;преводачите на Calamares&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;Разработката на &lt;a href=&quot;https://calamares.io/&quot;&gt;Calamares&lt;/a&gt; е спонсорирана от &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
    </message>
    <message>
        <location filename="../src/modules/welcome/WelcomePage.cpp" line="290"/>
--- a/lang/calamares_id.ts
+++ b/lang/calamares_id.ts
@ -50,7 +50,7 @@
    <message>
        <location filename="../src/libcalamaresui/viewpages/BlankViewStep.cpp" line="69"/>
        <source>Blank Page</source>
-        <translation type="unfinished"/>
+        <translation>Halaman Kosong</translation>
    </message>
 </context>
 <context>
@ -192,17 +192,17 @@
    <message>
        <location filename="../src/libcalamaresui/ViewManager.cpp" line="179"/>
        <source>Calamares Initialization Failed</source>
-        <translation type="unfinished"/>
+        <translation>Inisialisasi Calamares Gagal</translation>
    </message>
    <message>
        <location filename="../src/libcalamaresui/ViewManager.cpp" line="180"/>
        <source>%1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.</source>
-        <translation type="unfinished"/>
+        <translation>%1 tidak dapat terpasang. Calamares tidak dapat memuat seluruh modul konfigurasi. Terdapat masalah dengan Calamares karena sedang digunakan oleh distribusi.</translation>
    </message>
    <message>
        <location filename="../src/libcalamaresui/ViewManager.cpp" line="185"/>
        <source>&lt;br/&gt;The following modules could not be loaded:</source>
-        <translation type="unfinished"/>
+        <translation>&lt;br/&gt;Modul berikut tidak dapat dimuat.</translation>
    </message>
    <message>
        <location filename="../src/libcalamaresui/ViewManager.cpp" line="277"/>
@ -1665,7 +1665,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
    <message>
        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="107"/>
        <source>Cre&amp;ate</source>
-        <translation type="unfinished"/>
+        <translation>Mem&amp;buat</translation>
    </message>
    <message>
        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="114"/>
--- a/lang/calamares_tr_TR.ts
+++ b/lang/calamares_tr_TR.ts
@ -1696,7 +1696,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
    <message>
        <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="196"/>
        <source>The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.</source>
-        <translation>% 1 üzerindeki bölüm tablosu zaten% 2 birincil bölüme sahip ve artık eklenemiyor. Lütfen bir birincil bölümü kaldırın ve bunun yerine genişletilmiş bir bölüm ekleyin.</translation>
+        <translation>%1 üzerindeki disk bölümü tablosu zaten %2 birincil disk bölümüne sahip ve artık eklenemiyor. Lütfen bir birincil disk bölümü kaldırın ve bunun yerine uzatılmış bir disk bölümü ekleyin.</translation>
    </message>
 </context>
 <context>
--- a/lang/python/bg/LC_MESSAGES/python.mo
+++ b/lang/python/bg/LC_MESSAGES/python.mo
--- a/lang/python/bg/LC_MESSAGES/python.po
+++ b/lang/python/bg/LC_MESSAGES/python.po
@ -20,24 +20,24 @@ msgstr ""

 #: src/modules/umount/main.py:40
 msgid "Unmount file systems."
-msgstr ""
+msgstr "Демонтирай файловите системи."

 #: src/modules/dummypython/main.py:44
 msgid "Dummy python job."
-msgstr ""
+msgstr "Фиктивна задача python."

 #: src/modules/dummypython/main.py:97
 msgid "Dummy python step {}"
-msgstr ""
+msgstr "Фиктивна стъпка на python {}"

 #: src/modules/machineid/main.py:35
 msgid "Generate machine-id."
-msgstr ""
+msgstr "Генерирай machine-id."

 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
+msgstr "Обработване на пакетите (%(count)d / %(total)d)"

 #: src/modules/packages/main.py:64 src/modules/packages/main.py:74
 msgid "Install packages."
--- a/lang/python/tr_TR/LC_MESSAGES/python.mo
+++ b/lang/python/tr_TR/LC_MESSAGES/python.mo
--- a/lang/python/tr_TR/LC_MESSAGES/python.po
+++ b/lang/python/tr_TR/LC_MESSAGES/python.po
@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-18 07:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Demiray “tulliana” Muhterem <mdemiray@msn.com>, 2017\n"
+"Last-Translator: Demiray Muhterem <mdemiray@msn.com>, 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"
--- a/src/libcalamaresui/ViewManager.cpp
+++ b/src/libcalamaresui/ViewManager.cpp
@ -191,7 +191,7 @@ ViewManager::onInitFailed( const QStringList& modules)
        detailString = details.join( QString() );
    }

-    insertViewStep( 0, new BlankViewStep( title, description.arg( *Calamares::Branding::ShortProductName ), detailString ) );
+    insertViewStep( 0, new BlankViewStep( title, description.arg( *Calamares::Branding::ProductName ), detailString ) );
 }

 ViewStepList
--- a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-07 18:58+0100\n"
+"POT-Creation-Date: 2018-06-18 07:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Georgi Georgiev <georgiev_1994@abv.bg>, 2018\n"
 "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
@ -28,16 +28,16 @@ msgstr "Нов QLabel."

 #: src/modules/dummypythonqt/main.py:97
 msgid "Dummy PythonQt ViewStep"
-msgstr ""
+msgstr "Фиктивен PythonQt ViewStep"

 #: src/modules/dummypythonqt/main.py:183
 msgid "The Dummy PythonQt Job"
-msgstr ""
+msgstr "Фиктивната задача PythonQt"

 #: src/modules/dummypythonqt/main.py:186
 msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
+msgstr "Това е фиктивната задача PythonQt. Фиктивната задача заявява: {}"

 #: src/modules/dummypythonqt/main.py:190
 msgid "A status message for Dummy PythonQt Job."
-msgstr ""
+msgstr "Съобщение за състоянието на фиктивната задача PythonQt."
--- a/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po
@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-07 18:58+0100\n"
+"POT-Creation-Date: 2018-06-18 07:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Demiray “tulliana” Muhterem <mdemiray@msn.com>, 2016\n"
+"Last-Translator: Demiray Muhterem <mdemiray@msn.com>, 2016\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"
--- a/src/modules/keyboard/kbd-model-map
+++ b/src/modules/keyboard/kbd-model-map
@ -1,6 +1,11 @@
 # Copied from systemd-localed
-# http://cgit.freedesktop.org/systemd/systemd/log/src/locale/kbd-model-map
+#
+# https://cgit.freedesktop.org/systemd/systemd/log/src/locale/kbd-model-map
 # (originally under LGPLv2.1+, used under the LGPL to GPL conversion clause)
+#
+# This is the version from 534644b7be7b240eb0fbbe06e20cbecbe8206767,
+# committed 2015-01-22 01:07:24 .
+#
 # Generated from system-config-keyboard's model list
 # consolelayout		xlayout	xmodel		xvariant	xoptions
 sg			ch	pc105		de_nodeadkeys	terminate:ctrl_alt_bksp
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@ -104,10 +104,7 @@ swapSuggestion( const qint64 availableSpaceB )
 constexpr qint64
 alignBytesToBlockSize( qint64 bytes, qint64 blocksize )
 {
-    Q_ASSERT( bytes >= 0 );
-    Q_ASSERT( blocksize > 0 );
    qint64 blocks = bytes / blocksize;
-    Q_ASSERT( blocks >= 0 );

    if ( blocks * blocksize != bytes )
        ++blocks;
@ -135,17 +132,17 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
    // the logical sector size (usually 512B). EFI starts with 2MiB
    // empty and a 300MiB EFI boot partition, while BIOS starts at
    // the 1MiB boundary (usually sector 2048).
-    int uefisys_part_size = isEfi ? 300 : 0;
-    int empty_space_size = isEfi ? 2 : 1;
+    int uefisys_part_sizeB = isEfi ? 300_MiB : 0_MiB;
+    int empty_space_sizeB = isEfi ? 2_MiB : 1_MiB;

    // Since sectors count from 0, if the space is 2048 sectors in size,
    // the first free sector has number 2048 (and there are 2048 sectors
    // before that one, numbered 0..2047).
-    qint64 firstFreeSector = bytesToSectors( MiBtoBytes(empty_space_size), dev->logicalSize() );
+    qint64 firstFreeSector = bytesToSectors( empty_space_sizeB, dev->logicalSize() );

    if ( isEfi )
    {
-        qint64 efiSectorCount = bytesToSectors( MiBtoBytes(uefisys_part_size), dev->logicalSize() );
+        qint64 efiSectorCount = bytesToSectors( uefisys_part_sizeB, dev->logicalSize() );
        Q_ASSERT( efiSectorCount > 0 );

        // Since sectors count from 0, and this partition is created starting
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@ -48,6 +48,9 @@

 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>
+#ifdef WITH_KPMCOREGT33
+#include <kpmcore/core/softwareraid.h>
+#endif

 #include <QBoxLayout>
 #include <QButtonGroup>
@ -1182,6 +1185,13 @@ ChoicePage::setupActions()
    bool atLeastOneCanBeResized = false;
    bool atLeastOneCanBeReplaced = false;
    bool atLeastOneIsMounted = false;  // Suppress 'erase' if so
+    bool isInactiveRAID = false;
+
+#ifdef WITH_KPMCOREGT33
+    if ( currentDevice->type() == Device::Type::SoftwareRAID_Device &&
+         static_cast< SoftwareRAID* >(currentDevice)->status() == SoftwareRAID::Status::Inactive )
+        isInactiveRAID = true;
+#endif

    for ( auto it = PartitionIterator::begin( currentDevice );
          it != PartitionIterator::end( currentDevice ); ++it )
@ -1305,7 +1315,7 @@ ChoicePage::setupActions()
    else
        force_uncheck( m_grp, m_alongsideButton );

-    if ( !atLeastOneIsMounted )
+    if ( !atLeastOneIsMounted && !isInactiveRAID )
        m_eraseButton->show();  // None mounted
    else
        force_uncheck( m_grp, m_eraseButton );
--- a/src/modules/partition/gui/CreatePartitionDialog.cpp
+++ b/src/modules/partition/gui/CreatePartitionDialog.cpp
@ -72,7 +72,7 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, PartitionNode* par
    m_ui->encryptWidget->setText( tr( "En&crypt" ) );
    m_ui->encryptWidget->hide();

-    if (m_device->type() == Device::Type::Disk_Device) {
+    if (m_device->type() != Device::Type::LVM_Device) {
        m_ui->lvNameLabel->hide();
        m_ui->lvNameLineEdit->hide();
    }
--- a/src/modules/partition/gui/PartitionPage.cpp
+++ b/src/modules/partition/gui/PartitionPage.cpp
@ -4,6 +4,7 @@
 *   Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
 *   Copyright 2018, Adriaan de Groot <groot@kde.org>
 *   Copyright 2018, Andrius Štikonas <andrius@stikonas.eu>
+ *   Copyright 2018, Caio Jordão Carvalho <caiojcarvalho@gmail.com>
 *
 *   Calamares is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@ -47,6 +48,9 @@
 // KPMcore
 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>
+#ifdef WITH_KPMCOREGT33
+#include <kpmcore/core/softwareraid.h>
+#endif
 #include <kpmcore/ops/deactivatevolumegroupoperation.h>
 #include <kpmcore/ops/removevolumegroupoperation.h>

@ -146,6 +150,7 @@ PartitionPage::updateButtons()
        bool isInVG = m_core->isInVG( partition );

        create = isFree;
+
        // Keep it simple for now: do not support editing extended partitions as
        // it does not work with our current edit implementation which is
        // actually remove + add. This would not work with extended partitions
@ -160,8 +165,20 @@ PartitionPage::updateButtons()
    if ( m_ui->deviceComboBox->currentIndex() >= 0 )
    {
        QModelIndex deviceIndex = m_core->deviceModel()->index( m_ui->deviceComboBox->currentIndex(), 0 );
-        if ( m_core->deviceModel()->deviceForIndex( deviceIndex )->type() != Device::Type::LVM_Device )
+        auto device = m_core->deviceModel()->deviceForIndex( deviceIndex );
+        if ( device->type() != Device::Type::LVM_Device )
+        {
            createTable = true;
+
+#ifdef WITH_KPMCOREGT33
+            if ( device->type() == Device::Type::SoftwareRAID_Device &&
+                 static_cast< SoftwareRAID* >(device)->status() == SoftwareRAID::Status::Inactive )
+            {
+                createTable = false;
+                create = false;
+            }
+#endif
+        }
        else
        {
            currentDeviceIsVG = true;