napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge upstream changes

Browse Source
This commit is contained in:
Philip 2018-04-07 21:59:58 +02:00
commit 031416a1de
53 changed files with 618 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -185,6 +185,22 @@ if( NOT PYTHONLIBS_FOUND OR NOT PYTHONQT_FOUND )
set( WITH_PYTHONQT OFF ) set( WITH_PYTHONQT OFF )
endif() endif()
### Transifex Translation status
#
# complete = 100% translated,
# good = nearly complete (use own judgement, right now < 100 untranslated strings),
# ok = incomplete (100 or more untranslated),
# bad = 0% translated, placeholder in tx; these are not included.
#
# Language en (source language) is added later. It isn't listed in
# Transifex either. Get the list of languages and their status
# from https://transifex.com/calamares/calamares/ .
set( _tx_complete ca zh_CN zh_TW hr cs_CZ da fr lt pt_BR pt_PT es tr_TR)
set( _tx_good sq ja pl sk ro it_IT hu he ru id de nl )
set( _tx_ok bg uk ast is ar sv el es_MX gl en_GB es_ES th fi_FI hi pl_PL
eu nb sr sl sr@latin mr es_PR kn kk et )
set( _tx_bad fr_CH gu lo fa ur uz )
### ###
### Calamares application info ### Calamares application info
### ###
@ -192,13 +208,14 @@ set( CALAMARES_ORGANIZATION_NAME "Calamares" )
set( CALAMARES_ORGANIZATION_DOMAIN "github.com/calamares" ) set( CALAMARES_ORGANIZATION_DOMAIN "github.com/calamares" )
set( CALAMARES_APPLICATION_NAME "Calamares" ) set( CALAMARES_APPLICATION_NAME "Calamares" )
set( CALAMARES_DESCRIPTION_SUMMARY "The distribution-independent installer framework" ) set( CALAMARES_DESCRIPTION_SUMMARY "The distribution-independent installer framework" )
set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en en_GB es_MX es eu fr he hi hr hu id is it_IT ja lt mr nl pl pt_BR pt_PT ro ru sk sq sv th tr_TR zh_CN zh_TW ) set( CALAMARES_TRANSLATION_LANGUAGES en ${_tx_complete} ${_tx_good} ${_tx_ok} )
list( SORT CALAMARES_TRANSLATION_LANGUAGES )
### Bump version here ### Bump version here
set( CALAMARES_VERSION_MAJOR 3 ) set( CALAMARES_VERSION_MAJOR 3 )
set( CALAMARES_VERSION_MINOR 2 ) set( CALAMARES_VERSION_MINOR 2 )
set( CALAMARES_VERSION_PATCH 0 ) set( CALAMARES_VERSION_PATCH 0 )
set( CALAMARES_VERSION_RC 3 ) set( CALAMARES_VERSION_RC 4 )
set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} ) set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} )
set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" ) set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" )

33
CMakeModules/CalamaresAddBrandingSubdirectory.cmake
View File

@ -54,8 +54,11 @@ include( CMakeColors )
# If SUBDIRECTORIES are given, then those are copied (each one level deep) # If SUBDIRECTORIES are given, then those are copied (each one level deep)
# to the installation location as well, preserving the subdirectory name. # to the installation location as well, preserving the subdirectory name.
function( calamares_add_branding NAME ) function( calamares_add_branding NAME )
set( _CABT_DIRECTORY "." )
cmake_parse_arguments( _CABT "" "DIRECTORY" "SUBDIRECTORIES" ${ARGN} ) cmake_parse_arguments( _CABT "" "DIRECTORY" "SUBDIRECTORIES" ${ARGN} )
if (NOT _CABT_DIRECTORY)
set(_CABT_DIRECTORY ".")
endif()
set( SUBDIRECTORY ${_CABT_DIRECTORY} ) set( SUBDIRECTORY ${_CABT_DIRECTORY} )
set( _brand_dir ${_CABT_DIRECTORY} ) set( _brand_dir ${_CABT_DIRECTORY} )
@ -64,7 +67,6 @@ function( calamares_add_branding NAME )
foreach( _subdir "" ${_CABT_SUBDIRECTORIES} ) foreach( _subdir "" ${_CABT_SUBDIRECTORIES} )
file( GLOB BRANDING_COMPONENT_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${_brand_dir} "${_brand_dir}/${_subdir}/*" ) file( GLOB BRANDING_COMPONENT_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${_brand_dir} "${_brand_dir}/${_subdir}/*" )
message(STATUS "${BRANDING_COMPONENT_FILES}")
foreach( BRANDING_COMPONENT_FILE ${BRANDING_COMPONENT_FILES} ) foreach( BRANDING_COMPONENT_FILE ${BRANDING_COMPONENT_FILES} )
set( _subpath ${_brand_dir}/${BRANDING_COMPONENT_FILE} ) set( _subpath ${_brand_dir}/${BRANDING_COMPONENT_FILE} )
if( NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_subpath} ) if( NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_subpath} )
@ -93,8 +95,11 @@ endfunction()
# the lang/ dir is found in the given <dir> instead of the current source # the lang/ dir is found in the given <dir> instead of the current source
# directory. # directory.
function( calamares_add_branding_translations NAME ) function( calamares_add_branding_translations NAME )
set( _CABT_DIRECTORY "." )
cmake_parse_arguments( _CABT "" "DIRECTORY" "" ${ARGN} ) cmake_parse_arguments( _CABT "" "DIRECTORY" "" ${ARGN} )
if (NOT _CABT_DIRECTORY)
set(_CABT_DIRECTORY ".")
endif()
set( SUBDIRECTORY ${_CABT_DIRECTORY} ) set( SUBDIRECTORY ${_CABT_DIRECTORY} )
set( _brand_dir ${_CABT_DIRECTORY} ) set( _brand_dir ${_CABT_DIRECTORY} )
@ -111,23 +116,33 @@ function( calamares_add_branding_translations NAME )
endif() endif()
endfunction() endfunction()
# Usage calamares_add_branding_subdirectory( <dir> [SUBDIRECTORIES <dir> ...]) # Usage calamares_add_branding_subdirectory( <dir> [NAME <name>] [SUBDIRECTORIES <dir> ...])
# #
# Adds a branding component from a subdirectory: # Adds a branding component from a subdirectory:
# - if there is a CMakeLists.txt, use that # - if there is a CMakeLists.txt, use that (that CMakeLists.txt should
# - otherwise assume a "standard" setup with top-level files and a lang/ dir for translations # call suitable calamares_add_branding() and other macros to install
# the branding component).
# - otherwise assume a "standard" setup with top-level files and a lang/
# subdirectory for translations.
#
# If NAME is given, this is used instead of <dir> as the name of
# the branding component. This is needed if <dir> is more than
# one level deep, or to rename a component as it gets installed.
# #
# If SUBDIRECTORIES are given, they are relative to <dir>, and are # If SUBDIRECTORIES are given, they are relative to <dir>, and are
# copied (one level deep) to the install location as well. # copied (one level deep) to the install location as well.
function( calamares_add_branding_subdirectory SUBDIRECTORY ) function( calamares_add_branding_subdirectory SUBDIRECTORY )
cmake_parse_arguments( _CABS "" "" "SUBDIRECTORIES" ${ARGN} ) cmake_parse_arguments( _CABS "" "NAME" "SUBDIRECTORIES" ${ARGN} )
if (NOT _CABS_NAME)
set(_CABS_NAME "${SUBDIRECTORY}")
endif()
if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt" ) if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt" )
add_subdirectory( ${SUBDIRECTORY} ) add_subdirectory( ${SUBDIRECTORY} )
elseif( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/branding.desc" ) elseif( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/branding.desc" )
calamares_add_branding( ${SUBDIRECTORY} DIRECTORY ${SUBDIRECTORY} SUBDIRECTORIES ${_CABS_SUBDIRECTORIES} ) calamares_add_branding( ${_CABS_NAME} DIRECTORY ${SUBDIRECTORY} SUBDIRECTORIES ${_CABS_SUBDIRECTORIES} )
if( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/lang" ) if( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/lang" )
calamares_add_branding_translations( ${SUBDIRECTORY} DIRECTORY ${SUBDIRECTORY} ) calamares_add_branding_translations( ${_CABS_NAME} DIRECTORY ${SUBDIRECTORY} )
endif() endif()
else() else()
message( "-- ${BoldYellow}Warning:${ColorReset} tried to add branding component subdirectory ${BoldRed}${SUBDIRECTORY}${ColorReset} which has no branding.desc." ) message( "-- ${BoldYellow}Warning:${ColorReset} tried to add branding component subdirectory ${BoldRed}${SUBDIRECTORY}${ColorReset} which has no branding.desc." )

2
CMakeModules/CalamaresAddTranslations.cmake
View File

@ -61,7 +61,7 @@ macro(add_calamares_translations language)
add_custom_command( add_custom_command(
OUTPUT ${trans_outfile} OUTPUT ${trans_outfile}
COMMAND "${Qt5Core_RCC_EXECUTABLE}" COMMAND "${Qt5Core_RCC_EXECUTABLE}"
ARGS ${rcc_options} -name ${trans_file} -o ${trans_outfile} ${trans_infile} ARGS ${rcc_options} --format-version 1 -name ${trans_file} -o ${trans_outfile} ${trans_infile}
MAIN_DEPENDENCY ${trans_infile} MAIN_DEPENDENCY ${trans_infile}
DEPENDS ${QM_FILES} DEPENDS ${QM_FILES}
) )

4
calamares.desktop
View File

@ -23,6 +23,10 @@ Categories=Qt;System;
Name[bg]=Calamares
Icon[bg]=calamares
GenericName[bg]=Системен Инсталатор
Comment[bg]=Calamares — Системен Инсталатор
Name[ca]=Calamares Name[ca]=Calamares
Icon[ca]=calamares Icon[ca]=calamares
GenericName[ca]=Instal·lador de sistema GenericName[ca]=Instal·lador de sistema

68
lang/calamares_bg.ts
View File

@ -178,7 +178,7 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="76"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="76"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="280"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="280"/>
<source>Cancel installation without changing the system.</source> <source>Cancel installation without changing the system.</source>
<translation>Отказ от инсталацията без промяна на системата</translation> <translation>Отказ от инсталацията без промяна на системата.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="291"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="291"/>
@ -525,7 +525,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="151"/> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="151"/>
<source>LVM LV name</source> <source>LVM LV name</source>
<translation type="unfinished"/> <translation>LVM LV име</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="188"/> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="188"/>
@ -565,7 +565,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="288"/> <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="288"/>
<source>Mountpoint already in use. Please select another one.</source> <source>Mountpoint already in use. Please select another one.</source>
<translation>Точкака на монтиране вече се използва. Моля изберете друга.</translation> <translation>Точката за монтиране вече се използва. Моля изберете друга.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -692,7 +692,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="170"/> <location filename="../src/modules/users/CreateUserJob.cpp" line="170"/>
<source>Cannot add user %1 to groups: %2.</source> <source>Cannot add user %1 to groups: %2.</source>
<translation>Не може да бъе добавен потребител %1 към групи: %2.</translation> <translation>Не може да се добави потребител %1 към групи: %2.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="173"/> <location filename="../src/modules/users/CreateUserJob.cpp" line="173"/>
@ -789,7 +789,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="149"/> <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="149"/>
<source>Failed to open %1</source> <source>Failed to open %1</source>
<translation type="unfinished"/> <translation>Неуспешно отваряне на %1</translation>
</message> </message>
</context> </context>
<context> <context>
@ -797,7 +797,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/dummycpp/DummyCppJob.cpp" line="46"/> <location filename="../src/modules/dummycpp/DummyCppJob.cpp" line="46"/>
<source>Dummy C++ Job</source> <source>Dummy C++ Job</source>
<translation type="unfinished"/> <translation>Фиктивна С++ задача</translation>
</message> </message>
</context> </context>
<context> <context>
@ -855,7 +855,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="307"/> <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="307"/>
<source>Mountpoint already in use. Please select another one.</source> <source>Mountpoint already in use. Please select another one.</source>
<translation>Точкака на монтиране вече се използва. Моля изберете друга.</translation> <translation>Точката за монтиране вече се използва. Моля изберете друга.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -883,7 +883,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/EncryptWidget.cpp" line="151"/> <location filename="../src/modules/partition/gui/EncryptWidget.cpp" line="151"/>
<source>Please enter the same passphrase in both boxes.</source> <source>Please enter the same passphrase in both boxes.</source>
<translation type="unfinished"/> <translation>Моля, въведете еднаква парола в двете полета.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1003,7 +1003,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="54"/> <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="54"/>
<source>Please install KDE Konsole and try again!</source> <source>Please install KDE Konsole and try again!</source>
<translation type="unfinished"/> <translation>Моля, инсталирайте KDE Konsole и опитайте отново!</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="116"/> <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="116"/>
@ -1060,7 +1060,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/locale/LCLocaleDialog.cpp" line="67"/> <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="67"/>
<source>&amp;OK</source> <source>&amp;OK</source>
<translation type="unfinished"/> <translation>&amp;ОК</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1146,7 +1146,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/locale/LocalePage.cpp" line="387"/> <location filename="../src/modules/locale/LocalePage.cpp" line="387"/>
<source>The system language will be set to %1.</source> <source>The system language will be set to %1.</source>
<translation type="unfinished"/> <translation>Системният език ще бъде %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/locale/LocalePage.cpp" line="389"/> <location filename="../src/modules/locale/LocalePage.cpp" line="389"/>
@ -1204,7 +1204,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/> <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="73"/>
<source>Description</source> <source>Description</source>
<translation type="unfinished"/> <translation>Описание</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallPage.cpp" line="94"/> <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="94"/>
@ -1222,7 +1222,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="52"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="52"/>
<source>Package selection</source> <source>Package selection</source>
<translation type="unfinished"/> <translation>Избор на пакети</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1230,17 +1230,17 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="67"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="67"/>
<source>Password is too short</source> <source>Password is too short</source>
<translation type="unfinished"/> <translation>Паролата е твърде кратка</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="89"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="89"/>
<source>Password is too long</source> <source>Password is too long</source>
<translation type="unfinished"/> <translation>Паролата е твърде дълга</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="155"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="155"/>
<source>Password is too weak</source> <source>Password is too weak</source>
<translation type="unfinished"/> <translation>Паролата е твърде слаба</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="162"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="162"/>
@ -1255,12 +1255,12 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="168"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="168"/>
<source>The password is the same as the old one</source> <source>The password is the same as the old one</source>
<translation type="unfinished"/> <translation>Паролата съвпада с предишната</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="170"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="170"/>
<source>The password is a palindrome</source> <source>The password is a palindrome</source>
<translation type="unfinished"/> <translation>Паролата е палиндром</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="172"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="172"/>
@ -1270,7 +1270,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="174"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="174"/>
<source>The password is too similar to the old one</source> <source>The password is too similar to the old one</source>
<translation type="unfinished"/> <translation>Паролата е твърде сходна с предишната</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="176"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="176"/>
@ -1335,7 +1335,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="200"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="200"/>
<source>The password is too short</source> <source>The password is too short</source>
<translation type="unfinished"/> <translation>Паролата е твърде кратка</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="202"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="202"/>
@ -1385,7 +1385,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="220"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="220"/>
<source>No password supplied</source> <source>No password supplied</source>
<translation type="unfinished"/> <translation>Липсва парола</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="222"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="222"/>
@ -1465,7 +1465,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="271"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="271"/>
<source>Unknown error</source> <source>Unknown error</source>
<translation type="unfinished"/> <translation>Неизвестна грешка</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2151,7 +2151,7 @@ Output:
<message> <message>
<location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="328"/> <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="328"/>
<source>Failed to write keyboard configuration to existing /etc/default directory.</source> <source>Failed to write keyboard configuration to existing /etc/default directory.</source>
<translation type="unfinished"/> <translation>Неуспешно записване на клавиатурна конфигурация в съществуващата директория /etc/default.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2164,12 +2164,12 @@ Output:
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/>
<source>Set flags on %1MB %2 partition.</source> <source>Set flags on %1MB %2 partition.</source>
<translation type="unfinished"/> <translation>Задай флагове на дял %1MB %2.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/>
<source>Set flags on new partition.</source> <source>Set flags on new partition.</source>
<translation type="unfinished"/> <translation>Задай флагове на нов дял.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="67"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="67"/>
@ -2179,12 +2179,12 @@ Output:
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/>
<source>Clear flags on %1MB &lt;strong&gt;%2&lt;/strong&gt; partition.</source> <source>Clear flags on %1MB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
<translation type="unfinished"/> <translation>Изчисти флагове на дял %1MB &lt;strong&gt;%2&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/>
<source>Clear flags on new partition.</source> <source>Clear flags on new partition.</source>
<translation type="unfinished"/> <translation>Изчисти флагове на нов дял.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="79"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="79"/>
@ -2194,12 +2194,12 @@ Output:
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="85"/>
<source>Flag %1MB &lt;strong&gt;%2&lt;/strong&gt; partition as &lt;strong&gt;%3&lt;/strong&gt;.</source> <source>Flag %1MB &lt;strong&gt;%2&lt;/strong&gt; partition as &lt;strong&gt;%3&lt;/strong&gt;.</source>
<translation type="unfinished"/> <translation>Сложи флаг на дял %1MB &lt;strong&gt;%2&lt;/strong&gt; като &lt;strong&gt;%3&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/>
<source>Flag new partition as &lt;strong&gt;%1&lt;/strong&gt;.</source> <source>Flag new partition as &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation type="unfinished"/> <translation>Сложи флаг на новия дял като &lt;strong&gt;%1&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="103"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="103"/>
@ -2209,12 +2209,12 @@ Output:
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="107"/>
<source>Clearing flags on %1MB &lt;strong&gt;%2&lt;/strong&gt; partition.</source> <source>Clearing flags on %1MB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
<translation type="unfinished"/> <translation>Изчистване флаговете на дял %1MB &lt;strong&gt;%2&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/>
<source>Clearing flags on new partition.</source> <source>Clearing flags on new partition.</source>
<translation type="unfinished"/> <translation>Изчистване на флаговете на новия дял.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="115"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="115"/>
@ -2224,12 +2224,12 @@ Output:
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/>
<source>Setting flags &lt;strong&gt;%3&lt;/strong&gt; on %1MB &lt;strong&gt;%2&lt;/strong&gt; partition.</source> <source>Setting flags &lt;strong&gt;%3&lt;/strong&gt; on %1MB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
<translation type="unfinished"/> <translation>Задаване на флагове &lt;strong&gt;%3&lt;/strong&gt; на дял %1MB &lt;strong&gt;%2&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/>
<source>Setting flags &lt;strong&gt;%1&lt;/strong&gt; on new partition.</source> <source>Setting flags &lt;strong&gt;%1&lt;/strong&gt; on new partition.</source>
<translation type="unfinished"/> <translation>Задаване на флагове &lt;strong&gt;%1&lt;/strong&gt; на новия дял.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="140"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="140"/>
@ -2423,7 +2423,7 @@ Output:
<location filename="../src/modules/tracking/page_trackingstep.ui" line="195"/> <location filename="../src/modules/tracking/page_trackingstep.ui" line="195"/>
<location filename="../src/modules/tracking/page_trackingstep.ui" line="257"/> <location filename="../src/modules/tracking/page_trackingstep.ui" line="257"/>
<source>...</source> <source>...</source>
<translation type="unfinished"/> <translation>...</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/tracking/page_trackingstep.ui" line="271"/> <location filename="../src/modules/tracking/page_trackingstep.ui" line="271"/>

14
lang/calamares_ca.ts
View File

@ -9,12 +9,12 @@
<message> <message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="79"/> <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="79"/>
<source>This system was started with an &lt;strong&gt;EFI&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from an EFI environment, this installer must deploy a boot loader application, like &lt;strong&gt;GRUB&lt;/strong&gt; or &lt;strong&gt;systemd-boot&lt;/strong&gt; on an &lt;strong&gt;EFI System Partition&lt;/strong&gt;. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.</source> <source>This system was started with an &lt;strong&gt;EFI&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from an EFI environment, this installer must deploy a boot loader application, like &lt;strong&gt;GRUB&lt;/strong&gt; or &lt;strong&gt;systemd-boot&lt;/strong&gt; on an &lt;strong&gt;EFI System Partition&lt;/strong&gt;. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.</source>
<translation>Aquest sistema s&apos;ha iniciat amb un entorn d&apos;arrencada &lt;strong&gt;EFI&lt;/strong&gt;. &lt;br&gt;&lt;br&gt; Per configurar una arrencada des d&apos;un entorn EFI, aquest instal·lador ha de desplegar una aplicació de càrrega d&apos;arrencada, com ara el &lt;strong&gt;GRUB&lt;/strong&gt; o el &lt;strong&gt;systemd-boot&lt;/strong&gt; en una &lt;strong&gt;partició EFI del sistema&lt;/strong&gt;. Això és automàtic, llevat que trieu un partiment manual, en què caldrà que ho configureu vosaltres mateixos.</translation> <translation>Aquest sistema s&apos;ha iniciat amb un entorn d&apos;arrencada &lt;strong&gt;EFI&lt;/strong&gt;. &lt;br&gt;&lt;br&gt; Per configurar una arrencada des d&apos;un entorn EFI, aquest instal·lador ha de desplegar una aplicació de càrrega d&apos;arrencada, com ara el &lt;strong&gt;GRUB&lt;/strong&gt; o el &lt;strong&gt;systemd-boot&lt;/strong&gt; en una &lt;strong&gt;partició EFI del sistema&lt;/strong&gt;. Això és automàtic, llevat que trieu fer les particions manualment, en què caldrà que ho configureu vosaltres mateixos.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="91"/> <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="91"/>
<source>This system was started with a &lt;strong&gt;BIOS&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from a BIOS environment, this installer must install a boot loader, like &lt;strong&gt;GRUB&lt;/strong&gt;, either at the beginning of a partition or on the &lt;strong&gt;Master Boot Record&lt;/strong&gt; near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.</source> <source>This system was started with a &lt;strong&gt;BIOS&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from a BIOS environment, this installer must install a boot loader, like &lt;strong&gt;GRUB&lt;/strong&gt;, either at the beginning of a partition or on the &lt;strong&gt;Master Boot Record&lt;/strong&gt; near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.</source>
<translation>Aquest sistema s&apos;ha iniciat amb un entorn d&apos;arrencada &lt;strong&gt;BIOS &lt;/strong&gt;. Per configurar una arrencada des d&apos;un entorn BIOS, aquest instal·lador ha d&apos;instal·lar un carregador d&apos;arrencada, com ara el &lt;strong&gt;GRUB&lt;/strong&gt;, ja sigui al començament d&apos;una partició o al &lt;strong&gt;Registre d&apos;Arrencada Mestre&lt;/strong&gt;, a prop del començament de la taula de particions (millor). Això és automàtic, llevat que trieu un partiment manual, en què caldrà que ho configureu pel vostre compte.</translation> <translation>Aquest sistema s&apos;ha iniciat amb un entorn d&apos;arrencada &lt;strong&gt;BIOS &lt;/strong&gt;. Per configurar una arrencada des d&apos;un entorn BIOS, aquest instal·lador ha d&apos;instal·lar un carregador d&apos;arrencada, com ara el &lt;strong&gt;GRUB&lt;/strong&gt;, ja sigui al començament d&apos;una partició o al &lt;strong&gt;Registre d&apos;Arrencada Mestre&lt;/strong&gt;, a prop del començament de la taula de particions (millor). Això és automàtic, llevat que trieu fer les particions manualment, en què caldrà que ho configureu pel vostre compte.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -327,7 +327,7 @@ L&apos;instal·lador es tancarà i tots els canvis es perdran.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="235"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="235"/>
<source>&lt;strong&gt;Manual partitioning&lt;/strong&gt;&lt;br/&gt;You can create or resize partitions yourself.</source> <source>&lt;strong&gt;Manual partitioning&lt;/strong&gt;&lt;br/&gt;You can create or resize partitions yourself.</source>
<translation>&lt;strong&gt;Partiment manual&lt;/strong&gt;&lt;br/&gt;Podeu crear o redimensionar les particions vosaltres mateixos.</translation> <translation>&lt;strong&gt;Particions manuals&lt;/strong&gt;&lt;br/&gt;Podeu crear o redimensionar les particions vosaltres mateixos.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/>
@ -370,7 +370,7 @@ L&apos;instal·lador es tancarà i tots els canvis es perdran.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1096"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1096"/>
<source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation>No s&apos;ha pogut trobar enlloc una partició EFI en aquest sistema. Si us plau, torneu enrere i useu el partiment manual per configurar %1.</translation> <translation>No s&apos;ha pogut trobar enlloc una partició EFI en aquest sistema. Si us plau, torneu enrere i use les particions manuals per configurar %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1105"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1105"/>
@ -1711,7 +1711,7 @@ L&apos;instal·lador es tancarà i tots els canvis es perdran.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="171"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="171"/>
<source>&lt;strong&gt;Manual&lt;/strong&gt; partitioning.</source> <source>&lt;strong&gt;Manual&lt;/strong&gt; partitioning.</source>
<translation>Partiment &lt;strong&gt;manual&lt;/strong&gt;.</translation> <translation>Particions &lt;strong&gt;manuals&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="184"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="184"/>
@ -1731,7 +1731,7 @@ L&apos;instal·lador es tancarà i tots els canvis es perdran.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="203"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="203"/>
<source>&lt;strong&gt;Manual&lt;/strong&gt; partitioning on disk &lt;strong&gt;%1&lt;/strong&gt; (%2).</source> <source>&lt;strong&gt;Manual&lt;/strong&gt; partitioning on disk &lt;strong&gt;%1&lt;/strong&gt; (%2).</source>
<translation>Partiment &lt;strong&gt;manual&lt;/strong&gt; del disc &lt;strong&gt;%1&lt;/strong&gt; (%2).</translation> <translation>Particions &lt;strong&gt;manuals&lt;/strong&gt; del disc &lt;strong&gt;%1&lt;/strong&gt; (%2).</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="211"/>
@ -1982,7 +1982,7 @@ Sortida:
<message> <message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/> <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="250"/>
<source>&lt;strong&gt;%2&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source> <source>&lt;strong&gt;%2&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
<translation>&lt;strong&gt;%2&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;No es pot trobar cap partició EFI enlloc del sistema. Si us plau, torneu enrere i useu el partiment manual per establir %1.</translation> <translation>&lt;strong&gt;%2&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;No es pot trobar cap partició EFI enlloc del sistema. Si us plau, torneu enrere i useu les particions manuals per establir %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/> <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>

12
lang/calamares_da.ts
View File

@ -1274,7 +1274,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="176"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="176"/>
<source>The password contains the user name in some form</source> <source>The password contains the user name in some form</source>
<translation>Adgangskoden indeholde i nogen form brugernavnet</translation> <translation>Adgangskoden indeholder i nogen form brugernavnet</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="178"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="178"/>
@ -1289,12 +1289,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="183"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="183"/>
<source>The password contains less than %1 digits</source> <source>The password contains less than %1 digits</source>
<translation>Adgangskoden indeholder færre end %1 tal</translation> <translation>Adgangskoden indeholder færre end %1 cifre</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="184"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="184"/>
<source>The password contains too few digits</source> <source>The password contains too few digits</source>
<translation>Adgangskoden indeholder for få tal</translation> <translation>Adgangskoden indeholder for få cifre</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="187"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="187"/>
@ -1419,7 +1419,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="243"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="243"/>
<source>Bad integer value of setting - %1</source> <source>Bad integer value of setting - %1</source>
<translation>Dårlig heltalsværdi til indstilling - %1</translation> <translation>Ugyldig heltalsværdi til indstilling - %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="247"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="247"/>
@ -1845,7 +1845,7 @@ Output:
<message> <message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="268"/> <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="268"/>
<source>Command &lt;i&gt;%1&lt;/i&gt; crashed.</source> <source>Command &lt;i&gt;%1&lt;/i&gt; crashed.</source>
<translation>Kommandoen &lt;i&gt;%1&lt;/i&gt; holdet op med at virke.</translation> <translation>Kommandoen &lt;i&gt;%1&lt;/i&gt; holdte op med at virke.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="273"/> <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="273"/>
@ -1860,7 +1860,7 @@ Output:
<message> <message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="278"/> <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="278"/>
<source>Internal error when starting command.</source> <source>Internal error when starting command.</source>
<translation>Intern kommando ved start af kommando.</translation> <translation>Intern fejl ved start af kommando.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="279"/> <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="279"/>

118
lang/calamares_nb.ts
View File

@ -42,7 +42,7 @@
<message> <message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="125"/> <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="125"/>
<source>%1 (%2)</source> <source>%1 (%2)</source>
<translation type="unfinished"/> <translation>%1 (%2)</translation>
</message> </message>
</context> </context>
<context> <context>
@ -120,7 +120,7 @@
<message> <message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="60"/> <location filename="../src/libcalamares/ProcessJob.cpp" line="60"/>
<source>Running command %1 %2</source> <source>Running command %1 %2</source>
<translation type="unfinished"/> <translation>Kjører kommando %1 %2</translation>
</message> </message>
</context> </context>
<context> <context>
@ -195,17 +195,17 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="297"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="297"/>
<source>&amp;Yes</source> <source>&amp;Yes</source>
<translation type="unfinished"/> <translation>&amp;Ja</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="298"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="298"/>
<source>&amp;No</source> <source>&amp;No</source>
<translation type="unfinished"/> <translation>&amp;Nei</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="162"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="162"/>
<source>&amp;Close</source> <source>&amp;Close</source>
<translation type="unfinished"/> <translation>&amp;Lukk</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="212"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="212"/>
@ -230,12 +230,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="248"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="248"/>
<source>&amp;Done</source> <source>&amp;Done</source>
<translation type="unfinished"/> <translation>&amp;Ferdig</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/>
<source>The installation is complete. Close the installer.</source> <source>The installation is complete. Close the installer.</source>
<translation type="unfinished"/> <translation>Installasjonen er fullført. Lukk installeringsprogrammet.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="159"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="159"/>
@ -289,7 +289,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="96"/> <location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="96"/>
<source>This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;Installation cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source> <source>This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;Installation cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source>
<translation type="unfinished"/> <translation>Denne datamaskinen oppfyller ikke minimumskravene for installering %1.&lt;br/&gt; Installeringen kan ikke fortsette. &lt;a href=&quot;#details&quot;&gt;Detaljer..&lt;/a&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="113"/> <location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="113"/>
@ -309,7 +309,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="202"/> <location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="202"/>
<source>System requirements</source> <source>System requirements</source>
<translation type="unfinished"/> <translation>Systemkrav</translation>
</message> </message>
</context> </context>
<context> <context>
@ -327,7 +327,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="235"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="235"/>
<source>&lt;strong&gt;Manual partitioning&lt;/strong&gt;&lt;br/&gt;You can create or resize partitions yourself.</source> <source>&lt;strong&gt;Manual partitioning&lt;/strong&gt;&lt;br/&gt;You can create or resize partitions yourself.</source>
<translation type="unfinished"/> <translation>&lt;strong&gt;Manuell partisjonering&lt;/strong&gt;&lt;br/&gt;Du kan opprette eller endre størrelse på partisjoner selv.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="998"/>
@ -460,7 +460,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="60"/> <location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="60"/>
<source>Cannot get list of temporary mounts.</source> <source>Cannot get list of temporary mounts.</source>
<translation>Klarer ikke å få tak i listen over midlertidige monterte disker.</translation> <translation>Klarte ikke å få tak i listen over midlertidige monterte disker.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="99"/> <location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="99"/>
@ -656,7 +656,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="64"/> <location filename="../src/modules/users/CreateUserJob.cpp" line="64"/>
<source>Creating user %1.</source> <source>Creating user %1.</source>
<translation type="unfinished"/> <translation>Oppretter bruker %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="80"/> <location filename="../src/modules/users/CreateUserJob.cpp" line="80"/>
@ -681,7 +681,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="159"/> <location filename="../src/modules/users/CreateUserJob.cpp" line="159"/>
<source>Cannot create user %1.</source> <source>Cannot create user %1.</source>
<translation>Klarte ikke å opprette bruker %1</translation> <translation>Klarte ikke opprette bruker %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="161"/> <location filename="../src/modules/users/CreateUserJob.cpp" line="161"/>
@ -938,7 +938,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="98"/> <location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
<source>&amp;Restart now</source> <source>&amp;Restart now</source>
<translation type="unfinished"/> <translation>&amp;Start på nytt nå</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="52"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="52"/>
@ -948,7 +948,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="110"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="110"/>
<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> <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;Innnstallasjonen mislyktes&lt;/h1&gt;&lt;br/&gt;%1 har ikke blitt installert på datamaskinen din.&lt;br/&gt;Feilmeldingen var: %2.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -961,12 +961,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="124"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="124"/>
<source>Installation Complete</source> <source>Installation Complete</source>
<translation type="unfinished"/> <translation>Installasjon fullført</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="125"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="125"/>
<source>The installation of %1 is complete.</source> <source>The installation of %1 is complete.</source>
<translation type="unfinished"/> <translation>Installasjonen av %1 er fullført.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -984,7 +984,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/>
<source>Formatting partition %1 with file system %2.</source> <source>Formatting partition %1 with file system %2.</source>
<translation type="unfinished"/> <translation>Formaterer partisjon %1 med filsystem %2.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="77"/> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="77"/>
@ -1023,12 +1023,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/keyboard/KeyboardPage.cpp" line="220"/> <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="220"/>
<source>Set keyboard model to %1.&lt;br/&gt;</source> <source>Set keyboard model to %1.&lt;br/&gt;</source>
<translation type="unfinished"/> <translation>Sett tastaturmodell til %1.&lt;br/&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboard/KeyboardPage.cpp" line="222"/> <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="222"/>
<source>Set keyboard layout to %1/%2.</source> <source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/> <translation>Sett tastaturoppsett til %1/%2.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1059,7 +1059,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/locale/LCLocaleDialog.cpp" line="67"/> <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="67"/>
<source>&amp;OK</source> <source>&amp;OK</source>
<translation type="unfinished"/> <translation>&amp;OK</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1098,18 +1098,18 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<location filename="../src/modules/license/LicensePage.cpp" line="159"/> <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
<source>&lt;strong&gt;%1 driver&lt;/strong&gt;&lt;br/&gt;by %2</source> <source>&lt;strong&gt;%1 driver&lt;/strong&gt;&lt;br/&gt;by %2</source>
<extracomment>%1 is an untranslatable product name, example: Creative Audigy driver</extracomment> <extracomment>%1 is an untranslatable product name, example: Creative Audigy driver</extracomment>
<translation type="unfinished"/> <translation>&lt;strong&gt;%1 driver&lt;/strong&gt;&lt;br/&gt;fra %2</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicensePage.cpp" line="166"/> <location filename="../src/modules/license/LicensePage.cpp" line="166"/>
<source>&lt;strong&gt;%1 graphics driver&lt;/strong&gt;&lt;br/&gt;&lt;font color=&quot;Grey&quot;&gt;by %2&lt;/font&gt;</source> <source>&lt;strong&gt;%1 graphics driver&lt;/strong&gt;&lt;br/&gt;&lt;font color=&quot;Grey&quot;&gt;by %2&lt;/font&gt;</source>
<extracomment>%1 is usually a vendor name, example: Nvidia graphics driver</extracomment> <extracomment>%1 is usually a vendor name, example: Nvidia graphics driver</extracomment>
<translation type="unfinished"/> <translation>&lt;strong&gt;%1 grafikkdriver&lt;/strong&gt;&lt;br/&gt;&lt;font color=&quot;Grey&quot;&gt;fra %2&lt;/font&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicensePage.cpp" line="172"/> <location filename="../src/modules/license/LicensePage.cpp" line="172"/>
<source>&lt;strong&gt;%1 browser plugin&lt;/strong&gt;&lt;br/&gt;&lt;font color=&quot;Grey&quot;&gt;by %2&lt;/font&gt;</source> <source>&lt;strong&gt;%1 browser plugin&lt;/strong&gt;&lt;br/&gt;&lt;font color=&quot;Grey&quot;&gt;by %2&lt;/font&gt;</source>
<translation type="unfinished"/> <translation>&lt;strong&gt;%1 nettlesertillegg&lt;/strong&gt;&lt;br/&gt;&lt;font color=&quot;Grey&quot;&gt;fra %2&lt;/font&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicensePage.cpp" line="178"/> <location filename="../src/modules/license/LicensePage.cpp" line="178"/>
@ -1124,7 +1124,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/license/LicensePage.cpp" line="190"/> <location filename="../src/modules/license/LicensePage.cpp" line="190"/>
<source>&lt;strong&gt;%1&lt;/strong&gt;&lt;br/&gt;&lt;font color=&quot;Grey&quot;&gt;by %2&lt;/font&gt;</source> <source>&lt;strong&gt;%1&lt;/strong&gt;&lt;br/&gt;&lt;font color=&quot;Grey&quot;&gt;by %2&lt;/font&gt;</source>
<translation type="unfinished"/> <translation>&lt;strong&gt;%1&lt;/strong&gt;&lt;br/&gt;&lt;font color=&quot;Grey&quot;&gt;fra %2&lt;/font&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicensePage.cpp" line="202"/> <location filename="../src/modules/license/LicensePage.cpp" line="202"/>
@ -1137,7 +1137,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/license/LicenseViewStep.cpp" line="51"/> <location filename="../src/modules/license/LicenseViewStep.cpp" line="51"/>
<source>License</source> <source>License</source>
<translation type="unfinished"/> <translation>Lisens</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1166,7 +1166,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<location filename="../src/modules/locale/LocalePage.cpp" line="220"/> <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/> <location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
<source>&amp;Change...</source> <source>&amp;Change...</source>
<translation type="unfinished"/> <translation>&amp;Endre...</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/locale/LocalePage.cpp" line="398"/> <location filename="../src/modules/locale/LocalePage.cpp" line="398"/>
@ -1177,7 +1177,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<location filename="../src/modules/locale/LocalePage.cpp" line="480"/> <location filename="../src/modules/locale/LocalePage.cpp" line="480"/>
<source>%1 (%2)</source> <source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment> <extracomment>Language (Country)</extracomment>
<translation type="unfinished"/> <translation>%1 (%2)</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1229,17 +1229,17 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="67"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="67"/>
<source>Password is too short</source> <source>Password is too short</source>
<translation type="unfinished"/> <translation>Passordet er for kort</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="89"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="89"/>
<source>Password is too long</source> <source>Password is too long</source>
<translation type="unfinished"/> <translation>Passordet er for langt</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="155"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="155"/>
<source>Password is too weak</source> <source>Password is too weak</source>
<translation type="unfinished"/> <translation>Passordet er for svakt</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="162"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="162"/>
@ -1254,7 +1254,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="168"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="168"/>
<source>The password is the same as the old one</source> <source>The password is the same as the old one</source>
<translation type="unfinished"/> <translation>Passordet er det samme som det gamle</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="170"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="170"/>
@ -1269,7 +1269,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="174"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="174"/>
<source>The password is too similar to the old one</source> <source>The password is too similar to the old one</source>
<translation type="unfinished"/> <translation>Passordet likner for mye på det gamle</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="176"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="176"/>
@ -1299,22 +1299,22 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="187"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="187"/>
<source>The password contains less than %1 uppercase letters</source> <source>The password contains less than %1 uppercase letters</source>
<translation type="unfinished"/> <translation>Passordet inneholder mindre enn %1 store bokstaver</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="188"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="188"/>
<source>The password contains too few uppercase letters</source> <source>The password contains too few uppercase letters</source>
<translation type="unfinished"/> <translation>Passordet inneholder for få store bokstaver</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="191"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="191"/>
<source>The password contains less than %1 lowercase letters</source> <source>The password contains less than %1 lowercase letters</source>
<translation type="unfinished"/> <translation>Passordet inneholder mindre enn %1 små bokstaver</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="192"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="192"/>
<source>The password contains too few lowercase letters</source> <source>The password contains too few lowercase letters</source>
<translation type="unfinished"/> <translation>Passordet inneholder for få små bokstaver</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="195"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="195"/>
@ -1334,7 +1334,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="200"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="200"/>
<source>The password is too short</source> <source>The password is too short</source>
<translation type="unfinished"/> <translation>Passordet er for kort</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="202"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="202"/>
@ -1359,7 +1359,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="210"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="210"/>
<source>The password contains too many same characters consecutively</source> <source>The password contains too many same characters consecutively</source>
<translation type="unfinished"/> <translation>Passordet inneholder for mange like tegn etter hverandre</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="213"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="213"/>
@ -1444,7 +1444,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="263"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="263"/>
<source>Setting is not of string type</source> <source>Setting is not of string type</source>
<translation type="unfinished"/> <translation>Innstillingen er ikke av type streng</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="265"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="265"/>
@ -1464,7 +1464,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="271"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="271"/>
<source>Unknown error</source> <source>Unknown error</source>
<translation type="unfinished"/> <translation>Ukjent feil</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1477,12 +1477,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/keyboard/KeyboardPage.ui" line="70"/> <location filename="../src/modules/keyboard/KeyboardPage.ui" line="70"/>
<source>Keyboard Model:</source> <source>Keyboard Model:</source>
<translation type="unfinished"/> <translation>Tastaturmodell:</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboard/KeyboardPage.ui" line="131"/> <location filename="../src/modules/keyboard/KeyboardPage.ui" line="131"/>
<source>Type here to test your keyboard</source> <source>Type here to test your keyboard</source>
<translation type="unfinished"/> <translation>Skriv her for å teste tastaturet ditt</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1495,12 +1495,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="36"/> <location filename="../src/modules/users/page_usersetup.ui" line="36"/>
<source>What is your name?</source> <source>What is your name?</source>
<translation type="unfinished"/> <translation>Hva heter du?</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="117"/> <location filename="../src/modules/users/page_usersetup.ui" line="117"/>
<source>What name do you want to use to log in?</source> <source>What name do you want to use to log in?</source>
<translation type="unfinished"/> <translation>Hvilket navn vil du bruke for å logge inn?</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="306"/> <location filename="../src/modules/users/page_usersetup.ui" line="306"/>
@ -1890,13 +1890,13 @@ Output:
<message> <message>
<location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="82"/> <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="82"/>
<source>Default Keyboard Model</source> <source>Default Keyboard Model</source>
<translation type="unfinished"/> <translation>Standard tastaturmodell</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="127"/> <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="127"/>
<location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="163"/> <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="163"/>
<source>Default</source> <source>Default</source>
<translation type="unfinished"/> <translation>Standard</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/core/KPMHelpers.cpp" line="204"/> <location filename="../src/modules/partition/core/KPMHelpers.cpp" line="204"/>
@ -1954,7 +1954,7 @@ Output:
<message> <message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/> <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
<source>%1 cannot be installed on this partition.</source> <source>%1 cannot be installed on this partition.</source>
<translation type="unfinished"/> <translation>%1 kan ikke bli installert på denne partisjonen.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/> <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
@ -2029,22 +2029,22 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/> <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="136"/>
<source>is plugged in to a power source</source> <source>is plugged in to a power source</source>
<translation type="unfinished"/> <translation>er koblet til en strømkilde</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/> <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="137"/>
<source>The system is not plugged in to a power source.</source> <source>The system is not plugged in to a power source.</source>
<translation type="unfinished"/> <translation>Systemet er ikke koblet til en strømkilde.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="144"/> <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="144"/>
<source>is connected to the Internet</source> <source>is connected to the Internet</source>
<translation type="unfinished"/> <translation>er tilkoblet Internett</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/> <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="145"/>
<source>The system is not connected to the Internet.</source> <source>The system is not connected to the Internet.</source>
<translation type="unfinished"/> <translation>Systemet er ikke tilkoblet Internett.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/> <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="153"/>
@ -2114,7 +2114,7 @@ Output:
<location filename="../src/modules/users/SetHostNameJob.cpp" line="61"/> <location filename="../src/modules/users/SetHostNameJob.cpp" line="61"/>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="68"/> <location filename="../src/modules/users/SetHostNameJob.cpp" line="68"/>
<source>Internal Error</source> <source>Internal Error</source>
<translation type="unfinished"/> <translation>Intern feil</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="75"/> <location filename="../src/modules/users/SetHostNameJob.cpp" line="75"/>
@ -2314,7 +2314,7 @@ Output:
<message> <message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="97"/> <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="97"/>
<source>Cannot open /etc/timezone for writing</source> <source>Cannot open /etc/timezone for writing</source>
<translation type="unfinished"/> <translation>Klarte ikke åpne /etc/timezone for skriving</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2463,7 +2463,7 @@ Output:
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="289"/> <location filename="../src/modules/users/UsersPage.cpp" line="289"/>
<source>Your username is too long.</source> <source>Your username is too long.</source>
<translation type="unfinished"/> <translation>Brukernavnet ditt er for langt.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="295"/> <location filename="../src/modules/users/UsersPage.cpp" line="295"/>
@ -2497,7 +2497,7 @@ Output:
<message> <message>
<location filename="../src/modules/users/UsersViewStep.cpp" line="51"/> <location filename="../src/modules/users/UsersViewStep.cpp" line="51"/>
<source>Users</source> <source>Users</source>
<translation type="unfinished"/> <translation>Brukere</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2510,7 +2510,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="75"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="75"/>
<source>&amp;Language:</source> <source>&amp;Language:</source>
<translation type="unfinished"/> <translation>&amp;Språk:</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="176"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
@ -2530,7 +2530,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="146"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="146"/>
<source>&amp;About</source> <source>&amp;About</source>
<translation type="unfinished"/> <translation>&amp;Om</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
@ -2563,7 +2563,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/> <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/>
<source>Welcome</source> <source>Welcome</source>
<translation type="unfinished"/> <translation>Velkommen</translation>
</message> </message>
</context> </context>
</TS> </TS>

10
lang/calamares_pt_BR.ts
View File

@ -9,12 +9,12 @@
<message> <message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="79"/> <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="79"/>
<source>This system was started with an &lt;strong&gt;EFI&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from an EFI environment, this installer must deploy a boot loader application, like &lt;strong&gt;GRUB&lt;/strong&gt; or &lt;strong&gt;systemd-boot&lt;/strong&gt; on an &lt;strong&gt;EFI System Partition&lt;/strong&gt;. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.</source> <source>This system was started with an &lt;strong&gt;EFI&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from an EFI environment, this installer must deploy a boot loader application, like &lt;strong&gt;GRUB&lt;/strong&gt; or &lt;strong&gt;systemd-boot&lt;/strong&gt; on an &lt;strong&gt;EFI System Partition&lt;/strong&gt;. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.</source>
<translation>Este sistema foi iniciado com um ambiente de inicialização &lt;strong&gt;EFI&lt;/strong&gt;.&lt;br&gt;&lt;br&gt;Para configurar o início a partir de um ambiente EFI, este instalador deverá instalar um gerenciador de inicialização, como o &lt;strong&gt;GRUB&lt;/strong&gt; ou &lt;strong&gt;systemd-boot&lt;/strong&gt; em uma &lt;strong&gt;Partição de Sistema EFI&lt;/strong&gt;. Este processo é automático, a não ser que escolha o particionamento manual, que no caso permite-lhe escolher ou criá-lo manualmente.</translation> <translation>Este sistema foi iniciado com um ambiente de inicialização &lt;strong&gt;EFI&lt;/strong&gt;.&lt;br&gt;&lt;br&gt;Para configurar o início a partir de um ambiente EFI, este instalador deverá instalar um gerenciador de inicialização, como o &lt;strong&gt;GRUB&lt;/strong&gt; ou &lt;strong&gt;systemd-boot&lt;/strong&gt; em uma &lt;strong&gt;Partição de Sistema EFI&lt;/strong&gt;. Esse processo é automático, a não ser que escolha o particionamento manual, que no caso fará você escolher ou criar o gerenciador de inicialização por conta própria.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="91"/> <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="91"/>
<source>This system was started with a &lt;strong&gt;BIOS&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from a BIOS environment, this installer must install a boot loader, like &lt;strong&gt;GRUB&lt;/strong&gt;, either at the beginning of a partition or on the &lt;strong&gt;Master Boot Record&lt;/strong&gt; near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.</source> <source>This system was started with a &lt;strong&gt;BIOS&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from a BIOS environment, this installer must install a boot loader, like &lt;strong&gt;GRUB&lt;/strong&gt;, either at the beginning of a partition or on the &lt;strong&gt;Master Boot Record&lt;/strong&gt; near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.</source>
<translation>Este sistema foi iniciado utilizando o &lt;strong&gt;BIOS&lt;/strong&gt; como ambiente de inicialização.&lt;br&gt;&lt;br&gt;Para configurar a inicialização em um ambiente BIOS, este instalador deve instalar um gerenciador de boot, como o &lt;strong&gt;GRUB&lt;/strong&gt;, no começo de uma partição ou no &lt;strong&gt;Master Boot Record&lt;/strong&gt;, perto do começo da tabela de partições (recomendado). Este processo é automático, a não ser que você escolha o particionamento manual, onde você deverá configurá-lo manualmente.</translation> <translation>Este sistema foi iniciado utilizando o &lt;strong&gt;BIOS&lt;/strong&gt; como ambiente de inicialização.&lt;br&gt;&lt;br&gt;Para configurar a inicialização em um ambiente BIOS, este instalador deve instalar um gerenciador de boot, como o &lt;strong&gt;GRUB&lt;/strong&gt;, no começo de uma partição ou no &lt;strong&gt;Master Boot Record&lt;/strong&gt;, perto do começo da tabela de partições (recomendado). Esse processo é automático, a não ser que você escolha o particionamento manual, onde você deverá configurá-lo manualmente.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -387,7 +387,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1200"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1200"/>
<source>This storage device does not seem to have an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source> <source>This storage device does not seem to have an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
<translation>Parece que não há um sistema operacional neste dispositivo. O que você gostaria de fazer?&lt;br/&gt;Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.</translation> <translation>Parece que não há um sistema operacional neste dispositivo de armazenamento. O que você gostaria de fazer?&lt;br/&gt;Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1205"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1205"/>
@ -1514,7 +1514,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="200"/> <location filename="../src/modules/users/page_usersetup.ui" line="200"/>
<source>&lt;small&gt;If more than one person will use this computer, you can set up multiple accounts after installation.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can set up multiple accounts after installation.&lt;/small&gt;</source>
<translation>&lt;small&gt;Se mais de uma pessoa usará este computador, você pode definir múltiplas contas após a instalação.&lt;/small&gt;</translation> <translation>&lt;small&gt;Se mais de uma pessoa utilizará este computador, você pode definir múltiplas contas após a instalação.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="335"/> <location filename="../src/modules/users/page_usersetup.ui" line="335"/>
@ -1534,7 +1534,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="309"/> <location filename="../src/modules/users/page_usersetup.ui" line="309"/>
<source>&lt;small&gt;This name will be used if you make the computer visible to others on a network.&lt;/small&gt;</source> <source>&lt;small&gt;This name will be used if you make the computer visible to others on a network.&lt;/small&gt;</source>
<translation>&lt;small&gt;Este nome será usado caso você deixe o computador visível a outros na rede.&lt;/small&gt;</translation> <translation>&lt;small&gt;Esse nome será usado caso você deixe o computador visível a outros na rede.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="450"/> <location filename="../src/modules/users/page_usersetup.ui" line="450"/>

95
lang/calamares_tr_TR.ts
View File

@ -1242,232 +1242,232 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="155"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="155"/>
<source>Password is too weak</source> <source>Password is too weak</source>
<translation type="unfinished"/> <translation>Şifre çok zayıf</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="162"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="162"/>
<source>Memory allocation error when setting &apos;%1&apos;</source> <source>Memory allocation error when setting &apos;%1&apos;</source>
<translation type="unfinished"/> <translation>&apos;%1&apos; ayarlanırken bellek ayırma hatası</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="166"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="166"/>
<source>Memory allocation error</source> <source>Memory allocation error</source>
<translation type="unfinished"/> <translation>Bellek ayırma hatası</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="168"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="168"/>
<source>The password is the same as the old one</source> <source>The password is the same as the old one</source>
<translation type="unfinished"/> <translation>Şifre eski şifreyle aynı</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="170"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="170"/>
<source>The password is a palindrome</source> <source>The password is a palindrome</source>
<translation type="unfinished"/> <translation>Parola eskilerden birinin ters okunuşu olabilir</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="172"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="172"/>
<source>The password differs with case changes only</source> <source>The password differs with case changes only</source>
<translation type="unfinished"/> <translation>Parola sadece vaka değişiklikleri ile farklılık gösterir</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="174"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="174"/>
<source>The password is too similar to the old one</source> <source>The password is too similar to the old one</source>
<translation type="unfinished"/> <translation>Parola eski parolaya çok benzer</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="176"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="176"/>
<source>The password contains the user name in some form</source> <source>The password contains the user name in some form</source>
<translation type="unfinished"/> <translation>Parola kullanıcı adını bir biçimde içeriyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="178"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="178"/>
<source>The password contains words from the real name of the user in some form</source> <source>The password contains words from the real name of the user in some form</source>
<translation type="unfinished"/> <translation>Şifre, kullanıcının gerçek adına ait kelimeleri bazı biçimde içerir</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="180"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="180"/>
<source>The password contains forbidden words in some form</source> <source>The password contains forbidden words in some form</source>
<translation type="unfinished"/> <translation>Şifre, bazı biçimde yasak kelimeler içeriyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="183"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="183"/>
<source>The password contains less than %1 digits</source> <source>The password contains less than %1 digits</source>
<translation type="unfinished"/> <translation>Şifre %1 den az hane içeriyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="184"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="184"/>
<source>The password contains too few digits</source> <source>The password contains too few digits</source>
<translation type="unfinished"/> <translation>Parola çok az basamak içeriyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="187"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="187"/>
<source>The password contains less than %1 uppercase letters</source> <source>The password contains less than %1 uppercase letters</source>
<translation type="unfinished"/> <translation>Parola %1 den az büyük harf içeriyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="188"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="188"/>
<source>The password contains too few uppercase letters</source> <source>The password contains too few uppercase letters</source>
<translation type="unfinished"/> <translation>Parola çok az harf içermektedir</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="191"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="191"/>
<source>The password contains less than %1 lowercase letters</source> <source>The password contains less than %1 lowercase letters</source>
<translation type="unfinished"/> <translation>Parola %1 den daha küçük harf içermektedir</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="192"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="192"/>
<source>The password contains too few lowercase letters</source> <source>The password contains too few lowercase letters</source>
<translation type="unfinished"/> <translation>Parola çok az küçük harf içeriyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="195"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="195"/>
<source>The password contains less than %1 non-alphanumeric characters</source> <source>The password contains less than %1 non-alphanumeric characters</source>
<translation type="unfinished"/> <translation>Şifre %1 den az alfasayısal olmayan karakter içeriyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="196"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="196"/>
<source>The password contains too few non-alphanumeric characters</source> <source>The password contains too few non-alphanumeric characters</source>
<translation type="unfinished"/> <translation>Parola çok az sayıda alfasayısal olmayan karakter içeriyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="199"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="199"/>
<source>The password is shorter than %1 characters</source> <source>The password is shorter than %1 characters</source>
<translation type="unfinished"/> <translation>Parola %1 karakterden kısa</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="200"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="200"/>
<source>The password is too short</source> <source>The password is too short</source>
<translation type="unfinished"/> <translation>Parola çok kısa</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="202"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="202"/>
<source>The password is just rotated old one</source> <source>The password is just rotated old one</source>
<translation type="unfinished"/> <translation>Şifre önceden kullanıldı</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="205"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="205"/>
<source>The password contains less than %1 character classes</source> <source>The password contains less than %1 character classes</source>
<translation type="unfinished"/> <translation>Parola %1 den az karakter sınıfı içeriyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="206"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="206"/>
<source>The password does not contain enough character classes</source> <source>The password does not contain enough character classes</source>
<translation type="unfinished"/> <translation>Parola yeterli sayıda karakter sınıfı içermiyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="209"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="209"/>
<source>The password contains more than %1 same characters consecutively</source> <source>The password contains more than %1 same characters consecutively</source>
<translation type="unfinished"/> <translation>Şifre, %1 den fazla aynı karakteri ardışık olarak içeriyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="210"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="210"/>
<source>The password contains too many same characters consecutively</source> <source>The password contains too many same characters consecutively</source>
<translation type="unfinished"/> <translation>Parola ardışık olarak aynı sayıda çok karakter içeriyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="213"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="213"/>
<source>The password contains more than %1 characters of the same class consecutively</source> <source>The password contains more than %1 characters of the same class consecutively</source>
<translation type="unfinished"/> <translation>Parola, aynı sınıftan %1 den fazla karakter ardışık olarak içeriyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="214"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="214"/>
<source>The password contains too many characters of the same class consecutively</source> <source>The password contains too many characters of the same class consecutively</source>
<translation type="unfinished"/> <translation>Parola aynı sınıfta çok fazla karakter içeriyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="217"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="217"/>
<source>The password contains monotonic sequence longer than %1 characters</source> <source>The password contains monotonic sequence longer than %1 characters</source>
<translation type="unfinished"/> <translation>Şifre, %1 karakterden daha uzun monoton dizilim içeriyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="218"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="218"/>
<source>The password contains too long of a monotonic character sequence</source> <source>The password contains too long of a monotonic character sequence</source>
<translation type="unfinished"/> <translation>Parola çok uzun monoton karakter dizisi içeriyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="220"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="220"/>
<source>No password supplied</source> <source>No password supplied</source>
<translation type="unfinished"/> <translation>Parola sağlanmadı</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="222"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="222"/>
<source>Cannot obtain random numbers from the RNG device</source> <source>Cannot obtain random numbers from the RNG device</source>
<translation type="unfinished"/> <translation>RNG cihazından rastgele sayılar elde edemiyor</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="224"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="224"/>
<source>Password generation failed - required entropy too low for settings</source> <source>Password generation failed - required entropy too low for settings</source>
<translation type="unfinished"/> <translation>Şifre üretimi başarısız oldu - ayarlar için entropi çok düşük gerekli</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="229"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="229"/>
<source>The password fails the dictionary check - %1</source> <source>The password fails the dictionary check - %1</source>
<translation type="unfinished"/> <translation>Parola, sözlüğü kontrolü başarısız - %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="231"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="231"/>
<source>The password fails the dictionary check</source> <source>The password fails the dictionary check</source>
<translation type="unfinished"/> <translation>Parola, sözlük onayı başarısız</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="235"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="235"/>
<source>Unknown setting - %1</source> <source>Unknown setting - %1</source>
<translation type="unfinished"/> <translation>Bilinmeyen ayar - %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="239"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="239"/>
<source>Unknown setting</source> <source>Unknown setting</source>
<translation type="unfinished"/> <translation>Bilinmeyen ayar</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="243"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="243"/>
<source>Bad integer value of setting - %1</source> <source>Bad integer value of setting - %1</source>
<translation type="unfinished"/> <translation>Ayarın bozuk tam sayı değeri - %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="247"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="247"/>
<source>Bad integer value</source> <source>Bad integer value</source>
<translation type="unfinished"/> <translation>Yanlış tamsayı değeri</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="251"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="251"/>
<source>Setting %1 is not of integer type</source> <source>Setting %1 is not of integer type</source>
<translation type="unfinished"/> <translation>%1 ayarı tamsayı tipi değil</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="255"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="255"/>
<source>Setting is not of integer type</source> <source>Setting is not of integer type</source>
<translation type="unfinished"/> <translation>Ayar tamsayı tipi değil</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="259"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="259"/>
<source>Setting %1 is not of string type</source> <source>Setting %1 is not of string type</source>
<translation type="unfinished"/> <translation>Ayar %1, dize tipi değil</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="263"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="263"/>
<source>Setting is not of string type</source> <source>Setting is not of string type</source>
<translation type="unfinished"/> <translation>Ayar, dize tipi değil</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="265"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="265"/>
<source>Opening the configuration file failed</source> <source>Opening the configuration file failed</source>
<translation type="unfinished"/> <translation>Yapılandırma dosyasını açma başarısız oldu</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="267"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="267"/>
<source>The configuration file is malformed</source> <source>The configuration file is malformed</source>
<translation type="unfinished"/> <translation>Yapılandırma dosyası hatalı biçimlendirildi</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="269"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="269"/>
<source>Fatal failure</source> <source>Fatal failure</source>
<translation type="unfinished"/> <translation>Ölümcül arıza</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="271"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="271"/>
<source>Unknown error</source> <source>Unknown error</source>
<translation type="unfinished"/> <translation>Bilinmeyen hata</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1829,7 +1829,8 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.</t
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="263"/> <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="263"/>
<source> <source>
There was no output from the command.</source> There was no output from the command.</source>
<translation type="unfinished"/> <translation>
Komut çıktısı yok.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="264"/> <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="264"/>

BIN
lang/python/bg/LC_MESSAGES/python.mo
View File

Binary file not shown.

11
lang/python/bg/LC_MESSAGES/python.po
View File

@ -10,6 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-07 18:58+0100\n" "POT-Creation-Date: 2018-02-07 18:58+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\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" "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -36,18 +37,18 @@ msgstr ""
#: src/modules/packages/main.py:62 src/modules/packages/main.py:72 #: src/modules/packages/main.py:62 src/modules/packages/main.py:72
msgid "Install packages." msgid "Install packages."
msgstr "" msgstr "Инсталирай пакетите."
#: src/modules/packages/main.py:65 #: src/modules/packages/main.py:65
#, python-format #, python-format
msgid "Installing one package." msgid "Installing one package."
msgid_plural "Installing %(num)d packages." msgid_plural "Installing %(num)d packages."
msgstr[0] "" msgstr[0] "Инсталиране на един пакет."
msgstr[1] "" msgstr[1] "Инсталиране на %(num)d пакети."
#: src/modules/packages/main.py:68 #: src/modules/packages/main.py:68
#, python-format #, python-format
msgid "Removing one package." msgid "Removing one package."
msgid_plural "Removing %(num)d packages." msgid_plural "Removing %(num)d packages."
msgstr[0] "" msgstr[0] "Премахване на един пакет."
msgstr[1] "" msgstr[1] "Премахване на %(num)d пакети."

BIN
lang/python/ru/LC_MESSAGES/python.mo
View File

Binary file not shown.

3
lang/python/ru/LC_MESSAGES/python.po
View File

@ -10,6 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-07 18:58+0100\n" "POT-Creation-Date: 2018-02-07 18:58+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Aleksey Kabanov <ak099@mail.ru>, 2018\n"
"Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n" "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -32,7 +33,7 @@ msgstr ""
#: src/modules/packages/main.py:60 #: src/modules/packages/main.py:60
#, python-format #, python-format
msgid "Processing packages (%(count)d / %(total)d)" msgid "Processing packages (%(count)d / %(total)d)"
msgstr "" msgstr "Обработка пакетов (%(count)d / %(total)d)"
#: src/modules/packages/main.py:62 src/modules/packages/main.py:72 #: src/modules/packages/main.py:62 src/modules/packages/main.py:72
msgid "Install packages." msgid "Install packages."

BIN
lang/python/tr_TR/LC_MESSAGES/python.mo
View File

Binary file not shown.

4
lang/python/tr_TR/LC_MESSAGES/python.po
View File

@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: tr_TR\n" "Language: tr_TR\n"
"Plural-Forms: nplurals=1; plural=0;\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: src/modules/dummypython/main.py:44 #: src/modules/dummypython/main.py:44
msgid "Dummy python job." msgid "Dummy python job."
@ -44,9 +44,11 @@ msgstr "Paketleri yükle"
msgid "Installing one package." msgid "Installing one package."
msgid_plural "Installing %(num)d packages." msgid_plural "Installing %(num)d packages."
msgstr[0] "%(num)d paket yükleniyor" msgstr[0] "%(num)d paket yükleniyor"
msgstr[1] "%(num)d paket yükleniyor"
#: src/modules/packages/main.py:68 #: src/modules/packages/main.py:68
#, python-format #, python-format
msgid "Removing one package." msgid "Removing one package."
msgid_plural "Removing %(num)d packages." msgid_plural "Removing %(num)d packages."
msgstr[0] "%(num)d paket kaldırılıyor." msgstr[0] "%(num)d paket kaldırılıyor."
msgstr[1] "%(num)d paket kaldırılıyor."

10
src/calamares/CalamaresApplication.cpp
View File

@ -44,7 +44,12 @@ CalamaresApplication::CalamaresApplication( int& argc, char* argv[] )
, m_moduleManager( nullptr ) , m_moduleManager( nullptr )
, m_debugMode( false ) , m_debugMode( false )
{ {
setOrganizationName( QLatin1String( CALAMARES_ORGANIZATION_NAME ) ); // Setting the organization name makes the default cache
// directory -- where Calamares stores logs, for instance --
// <org>/<app>/, so we end up with ~/.cache/Calamares/calamares/
// which is excessively squidly.
//
// setOrganizationName( QLatin1String( CALAMARES_ORGANIZATION_NAME ) );
setOrganizationDomain( QLatin1String( CALAMARES_ORGANIZATION_DOMAIN ) ); setOrganizationDomain( QLatin1String( CALAMARES_ORGANIZATION_DOMAIN ) );
setApplicationName( QLatin1String( CALAMARES_APPLICATION_NAME ) ); setApplicationName( QLatin1String( CALAMARES_APPLICATION_NAME ) );
setApplicationVersion( QLatin1String( CALAMARES_VERSION ) ); setApplicationVersion( QLatin1String( CALAMARES_VERSION ) );
@ -65,9 +70,6 @@ CalamaresApplication::CalamaresApplication( int& argc, char* argv[] )
void void
CalamaresApplication::init() CalamaresApplication::init()
{ {
cDebug() << "CalamaresApplication thread:" << thread();
//TODO: Icon loader
Logger::setupLogfile(); Logger::setupLogfile();
setQuitOnLastWindowClosed( false ); setQuitOnLastWindowClosed( false );

9
src/libcalamares/CMakeLists.txt
View File

@ -18,6 +18,7 @@ set( libSources
Job.cpp Job.cpp
JobQueue.cpp JobQueue.cpp
ProcessJob.cpp ProcessJob.cpp
Settings.cpp
) )
set( utilsSources set( utilsSources
utils/CalamaresUtils.cpp utils/CalamaresUtils.cpp
@ -26,6 +27,7 @@ set( utilsSources
utils/Logger.cpp utils/Logger.cpp
utils/PluginFactory.cpp utils/PluginFactory.cpp
utils/Retranslator.cpp utils/Retranslator.cpp
utils/YamlUtils.cpp
) )
set( kdsagSources set( kdsagSources
kdsingleapplicationguard/kdsingleapplicationguard.cpp kdsingleapplicationguard/kdsingleapplicationguard.cpp
@ -88,8 +90,11 @@ set_target_properties( calamares
) )
target_link_libraries( calamares target_link_libraries( calamares
LINK_PRIVATE ${OPTIONAL_PRIVATE_LIBRARIES} LINK_PRIVATE
LINK_PUBLIC Qt5::Core ${OPTIONAL_PRIVATE_LIBRARIES}
LINK_PUBLIC
${YAMLCPP_LIBRARY}
Qt5::Core
) )
install( TARGETS calamares install( TARGETS calamares

2
src/libcalamares/JobQueue.cpp
View File

@ -54,7 +54,7 @@ public:
for( auto job : m_jobs ) for( auto job : m_jobs )
{ {
emitProgress(); emitProgress();
cLog() << "Starting job" << job->prettyName(); cDebug() << "Starting job" << job->prettyName();
connect( job.data(), &Job::progress, this, &JobThread::emitProgress ); connect( job.data(), &Job::progress, this, &JobThread::emitProgress );
JobResult result = job->exec(); JobResult result = job->exec();
if ( !result ) if ( !result )

0
src/libcalamaresui/Settings.cpp → src/libcalamares/Settings.cpp
View File

0
src/libcalamaresui/Settings.h → src/libcalamares/Settings.h
View File

11
src/libcalamares/utils/CalamaresUtilsSystem.cpp
View File

@ -20,8 +20,9 @@
#include "CalamaresUtilsSystem.h" #include "CalamaresUtilsSystem.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "JobQueue.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h"
#include "Settings.h"
#include <QCoreApplication> #include <QCoreApplication>
#include <QDir> #include <QDir>
@ -173,7 +174,7 @@ System::runCommand(
if ( !process.waitForFinished( timeoutSec ? ( timeoutSec * 1000 ) : -1 ) ) if ( !process.waitForFinished( timeoutSec ? ( timeoutSec * 1000 ) : -1 ) )
{ {
cWarning() << "Timed out. output so far:\n" << cWarning().noquote().nospace() << "Timed out. Output so far:\n" <<
process.readAllStandardOutput(); process.readAllStandardOutput();
return -4; return -4;
} }
@ -182,16 +183,16 @@ System::runCommand(
if ( process.exitStatus() == QProcess::CrashExit ) if ( process.exitStatus() == QProcess::CrashExit )
{ {
cWarning() << "Process crashed"; cWarning().noquote().nospace() << "Process crashed. Output so far:\n" << output;
return -1; return -1;
} }
auto r = process.exitCode(); auto r = process.exitCode();
cDebug() << "Finished. Exit code:" << r; cDebug() << "Finished. Exit code:" << r;
if ( r != 0 ) if ( ( r != 0 ) || Calamares::Settings::instance()->debugMode() )
{ {
cDebug() << "Target cmd:" << args; cDebug() << "Target cmd:" << args;
cDebug().noquote() << "Target output:\n" << output; cDebug().noquote().nospace() << "Target output:\n" << output;
} }
return ProcessResult(r, output); return ProcessResult(r, output);
} }

34
src/libcalamares/utils/Logger.cpp
View File

@ -31,6 +31,7 @@
#include <QVariant> #include <QVariant>
#include "utils/CalamaresUtils.h" #include "utils/CalamaresUtils.h"
#include "CalamaresVersion.h"
#define LOGFILE_SIZE 1024 * 256 #define LOGFILE_SIZE 1024 * 256
@ -85,7 +86,7 @@ log( const char* msg, unsigned int debugLevel, bool toDisk = true )
} }
void static void
CalamaresLogHandler( QtMsgType type, const QMessageLogContext& context, const QString& msg ) CalamaresLogHandler( QtMsgType type, const QMessageLogContext& context, const QString& msg )
{ {
static QMutex s_mutex; static QMutex s_mutex;
@ -115,10 +116,10 @@ CalamaresLogHandler( QtMsgType type, const QMessageLogContext& context, const QS
} }
QString static QString
logFile() logFile()
{ {
return CalamaresUtils::appLogDir().filePath( "Calamares.log" ); return CalamaresUtils::appLogDir().filePath( "session.log" );
} }
@ -145,9 +146,18 @@ setupLogfile()
} }
} }
// Since the log isn't open yet, this probably only goes to stdout
cDebug() << "Using log file:" << logFile(); cDebug() << "Using log file:" << logFile();
// Lock while (re-)opening the logfile
{
QMutexLocker lock( &s_mutex );
logfile.open( logFile().toLocal8Bit(), std::ios::app ); logfile.open( logFile().toLocal8Bit(), std::ios::app );
if ( logfile.tellp() )
logfile << "\n\n" << std::endl;
logfile << "=== START CALAMARES " << CALAMARES_VERSION << std::endl;
}
qInstallMessageHandler( CalamaresLogHandler ); qInstallMessageHandler( CalamaresLogHandler );
} }
@ -167,4 +177,22 @@ CDebug::~CDebug()
{ {
} }
const char* continuation = "\n ";
QString toString( const QVariant& v )
{
auto t = v.type();
if ( t == QVariant::List )
{
QStringList s;
auto l = v.toList();
for ( auto lit = l.constBegin(); lit != l.constEnd(); ++lit )
s << lit->toString();
return s.join(", ");
}
else
return v.toString();
}
} // namespace } // namespace

115
src/libcalamares/utils/Logger.h
View File

@ -2,7 +2,7 @@
* *
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org> * Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
* Copyright 2014, Teo Mrnjavac <teo@kde.org> * Copyright 2014, Teo Mrnjavac <teo@kde.org>
* Copyright 2017, Adriaan de Groot <groot@kde.org> * Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -27,6 +27,8 @@
namespace Logger namespace Logger
{ {
extern const char* continuation;
enum enum
{ {
LOG_DISABLE = 0, LOG_DISABLE = 0,
@ -41,7 +43,7 @@ namespace Logger
class DLLEXPORT CLog : public QDebug class DLLEXPORT CLog : public QDebug
{ {
public: public:
CLog( unsigned int debugLevel = 0 ); explicit CLog( unsigned int debugLevel );
virtual ~CLog(); virtual ~CLog();
private: private:
@ -54,13 +56,22 @@ namespace Logger
public: public:
CDebug( unsigned int debugLevel = LOGDEBUG ) : CLog( debugLevel ) CDebug( unsigned int debugLevel = LOGDEBUG ) : CLog( debugLevel )
{ {
if ( debugLevel <= LOGERROR )
*this << "ERROR:";
else if ( debugLevel <= LOGWARNING )
*this << "WARNING:";
} }
virtual ~CDebug(); virtual ~CDebug();
}; };
DLLEXPORT void CalamaresLogHandler( QtMsgType type, const QMessageLogContext& context, const QString& msg ); /**
* @brief Start logging to the log file.
*
* Call this (once) to start logging to the log file (usually
* ~/.cache/calamares/session.log ). An existing log file is
* rolled over if it is too large.
*/
DLLEXPORT void setupLogfile(); DLLEXPORT void setupLogfile();
DLLEXPORT QString logFile();
/** /**
* @brief Set a log level for future logging. * @brief Set a log level for future logging.
@ -72,11 +83,101 @@ namespace Logger
* Practical values are 0, 1, 2, and 6. * Practical values are 0, 1, 2, and 6.
*/ */
DLLEXPORT void setupLogLevel( unsigned int level ); DLLEXPORT void setupLogLevel( unsigned int level );
/**
* @brief Row-oriented formatted logging.
*
* Use DebugRow to produce multiple rows of 2-column output
* in a debugging statement. For instance,
* cDebug() << DebugRow<int,int>(1,12)
* << DebugRow<int,int>(2,24)
* will produce a single timestamped debug line with continuations.
* Each DebugRow produces one line of output, with the two values.
*/
template<typename T, typename U>
struct DebugRow
{
public:
explicit DebugRow(const T& t, const U& u)
: first(t)
, second(u)
{}
const T& first;
const U& second;
} ;
/**
* @brief List-oriented formatted logging.
*
* Use DebugList to produce multiple rows of output in a debugging
* statement. For instance,
* cDebug() << DebugList( QStringList() << "foo" << "bar" )
* will produce a single timestamped debug line with continuations.
* Each element of the list of strings will be logged on a separate line.
*/
struct DebugList
{
explicit DebugList( const QStringList& l )
: list(l)
{}
const QStringList& list;
} ;
/**
* @brief Map-oriented formatted logging.
*
* Use DebugMap to produce multiple rows of output in a debugging
* statement from a map. The output is intentionally a bit-yaml-ish.
* cDebug() << DebugMap( map )
* will produce a single timestamped debug line with continuations.
* The continued lines will have a key (from the map) and a value
* on each line.
*/
struct DebugMap
{
public:
explicit DebugMap(const QVariantMap& m)
: map( m )
{}
const QVariantMap& map;
} ;
/** @brief output operator for DebugRow */
template<typename T, typename U>
inline QDebug&
operator <<( QDebug& s, const DebugRow<T, U>& t )
{
s << continuation << t.first << ':' << ' ' << t.second;
return s;
}
/** @brief output operator for DebugList */
inline QDebug&
operator <<( QDebug& s, const DebugList& c )
{
for( const auto& i : c.list )
s << continuation << i;
return s;
}
/** @brief supporting method for outputting a DebugMap */
QString toString( const QVariant& v );
/** @brief output operator for DebugMap */
inline QDebug&
operator <<( QDebug& s, const DebugMap& t )
{
for ( auto it = t.map.constBegin(); it != t.map.constEnd(); ++it )
s << continuation << it.key().toUtf8().constData() << ':' << ' ' << toString( it.value() ).toUtf8().constData();
return s;
}
} }
#define cLog Logger::CLog
#define cDebug Logger::CDebug #define cDebug Logger::CDebug
#define cWarning() Logger::CDebug(Logger::LOGWARNING) << "WARNING:" #define cWarning() Logger::CDebug(Logger::LOGWARNING)
#define cError() Logger::CDebug(Logger::LOGERROR) << "ERROR:" #define cError() Logger::CDebug(Logger::LOGERROR)
#endif // CALAMARES_LOGGER_H #endif // CALAMARES_LOGGER_H

0
src/libcalamaresui/utils/YamlUtils.cpp → src/libcalamares/utils/YamlUtils.cpp
View File

0
src/libcalamaresui/utils/YamlUtils.h → src/libcalamares/utils/YamlUtils.h
View File

3
src/libcalamaresui/CMakeLists.txt
View File

@ -10,7 +10,6 @@ set( calamaresui_SOURCES
utils/CalamaresUtilsGui.cpp utils/CalamaresUtilsGui.cpp
utils/DebugWindow.cpp utils/DebugWindow.cpp
utils/ImageRegistry.cpp utils/ImageRegistry.cpp
utils/YamlUtils.cpp
utils/qjsonmodel.cpp utils/qjsonmodel.cpp
utils/qjsonitem.cpp utils/qjsonitem.cpp
@ -25,7 +24,6 @@ set( calamaresui_SOURCES
ExecutionViewStep.cpp ExecutionViewStep.cpp
Branding.cpp Branding.cpp
Settings.cpp
ViewManager.cpp ViewManager.cpp
) )
@ -71,7 +69,6 @@ calamares_add_library( calamaresui
UI ${calamaresui_UI} UI ${calamaresui_UI}
EXPORT_MACRO UIDLLEXPORT_PRO EXPORT_MACRO UIDLLEXPORT_PRO
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
${YAMLCPP_LIBRARY}
${OPTIONAL_PRIVATE_LIBRARIES} ${OPTIONAL_PRIVATE_LIBRARIES}
LINK_LIBRARIES LINK_LIBRARIES
Qt5::Svg Qt5::Svg

3
src/libcalamaresui/ExecutionViewStep.cpp
View File

@ -2,6 +2,7 @@
* *
* Copyright 2014, Aurélien Gâteau <agateau@kde.org> * Copyright 2014, Aurélien Gâteau <agateau@kde.org>
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2018, Adriaan de Groot <groot@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -64,7 +65,7 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent )
innerLayout->addWidget( m_progressBar ); innerLayout->addWidget( m_progressBar );
innerLayout->addWidget( m_label ); innerLayout->addWidget( m_label );
cDebug() << "QML import paths:" << m_slideShow->engine()->importPathList(); cDebug() << "QML import paths:" << Logger::DebugList( m_slideShow->engine()->importPathList() );
connect( JobQueue::instance(), &JobQueue::progress, connect( JobQueue::instance(), &JobQueue::progress,
this, &ExecutionViewStep::updateFromJobQueue ); this, &ExecutionViewStep::updateFromJobQueue );

8
src/libcalamaresui/ViewManager.cpp
View File

@ -150,9 +150,9 @@ ViewManager::insertViewStep( int before, ViewStep* step )
void void
ViewManager::onInstallationFailed( const QString& message, const QString& details ) ViewManager::onInstallationFailed( const QString& message, const QString& details )
{ {
cLog() << "Installation failed:"; cError() << "Installation failed:";
cLog() << "- message:" << message; cDebug() << "- message:" << message;
cLog() << "- details:" << details; cDebug() << "- details:" << details;
QMessageBox* msgBox = new QMessageBox(); QMessageBox* msgBox = new QMessageBox();
msgBox->setIcon( QMessageBox::Critical ); msgBox->setIcon( QMessageBox::Critical );
@ -167,7 +167,7 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail
msgBox->setInformativeText( text ); msgBox->setInformativeText( text );
connect( msgBox, &QMessageBox::buttonClicked, qApp, &QApplication::quit ); connect( msgBox, &QMessageBox::buttonClicked, qApp, &QApplication::quit );
cLog() << "Calamares will quit when the dialog closes."; cDebug() << "Calamares will quit when the dialog closes.";
msgBox->show(); msgBox->show();
} }

19
src/libcalamaresui/modulesystem/Module.cpp
View File

@ -72,8 +72,7 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
if ( typeString.isEmpty() || if ( typeString.isEmpty() ||
intfString.isEmpty() ) intfString.isEmpty() )
{ {
cLog() << Q_FUNC_INFO << "bad module descriptor format" cError() << "Bad module descriptor format" << instanceId;
<< instanceId;
return nullptr; return nullptr;
} }
if ( ( typeString == "view" ) || ( typeString == "viewmodule" ) ) if ( ( typeString == "view" ) || ( typeString == "viewmodule" ) )
@ -87,11 +86,11 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
#ifdef WITH_PYTHONQT #ifdef WITH_PYTHONQT
m = new PythonQtViewModule(); m = new PythonQtViewModule();
#else #else
cLog() << "PythonQt modules are not supported in this version of Calamares."; cError() << "PythonQt modules are not supported in this version of Calamares.";
#endif #endif
} }
else else
cLog() << "Bad interface" << intfString << "for module type" << typeString; cError() << "Bad interface" << intfString << "for module type" << typeString;
} }
else if ( typeString == "job" ) else if ( typeString == "job" )
{ {
@ -108,18 +107,18 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
#ifdef WITH_PYTHON #ifdef WITH_PYTHON
m = new PythonJobModule(); m = new PythonJobModule();
#else #else
cLog() << "Python modules are not supported in this version of Calamares."; cError() << "Python modules are not supported in this version of Calamares.";
#endif #endif
} }
else else
cLog() << "Bad interface" << intfString << "for module type" << typeString; cError() << "Bad interface" << intfString << "for module type" << typeString;
} }
else else
cLog() << "Bad module type" << typeString; cError() << "Bad module type" << typeString;
if ( !m ) if ( !m )
{ {
cLog() << "Bad module type (" << typeString cDebug() << "Bad module type (" << typeString
<< ") or interface string (" << intfString << ") or interface string (" << intfString
<< ") for module " << instanceId; << ") for module " << instanceId;
return nullptr; return nullptr;
@ -130,8 +129,8 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
m->m_directory = moduleDir.absolutePath(); m->m_directory = moduleDir.absolutePath();
else else
{ {
cLog() << Q_FUNC_INFO << "bad module directory" cError() << "Bad module directory" << moduleDirectory
<< instanceId; << "for" << instanceId;
delete m; delete m;
return nullptr; return nullptr;
} }

11
src/libcalamaresui/modulesystem/ModuleManager.cpp
View File

@ -200,8 +200,8 @@ ModuleManager::loadModules()
if ( moduleEntrySplit.length() < 1 || if ( moduleEntrySplit.length() < 1 ||
moduleEntrySplit.length() > 2 ) moduleEntrySplit.length() > 2 )
{ {
cError() << "Wrong module entry format for module" << moduleEntry << "." cError() << "Wrong module entry format for module" << moduleEntry << '.';
<< "\nCalamares will now quit."; cError() << "Calamares will now quit.";
qApp->exit( 1 ); qApp->exit( 1 );
return; return;
} }
@ -213,7 +213,8 @@ ModuleManager::loadModules()
m_availableDescriptorsByModuleName.value( moduleName ).isEmpty() ) m_availableDescriptorsByModuleName.value( moduleName ).isEmpty() )
{ {
cError() << "Module" << moduleName << "not found in module search paths." cError() << "Module" << moduleName << "not found in module search paths."
<< "\nCalamares will now quit."; << Logger::DebugList( m_paths );
cError() << "Calamares will now quit.";
qApp->exit( 1 ); qApp->exit( 1 );
return; return;
} }
@ -240,8 +241,8 @@ ModuleManager::loadModules()
} }
else //ought to be a custom instance, but cannot find instance entry else //ought to be a custom instance, but cannot find instance entry
{ {
cError() << "Custom instance" << moduleEntry << "not found in custom instances section." cError() << "Custom instance" << moduleEntry << "not found in custom instances section.";
<< "\nCalamares will now quit."; cError() << "Calamares will now quit.";
qApp->exit( 1 ); qApp->exit( 1 );
return; return;
} }

BIN
src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo
View File

Binary file not shown.

7
src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po
View File

@ -8,8 +8,9 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-04 08:16-0400\n" "POT-Creation-Date: 2018-02-07 18:58+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\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" "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -19,11 +20,11 @@ msgstr ""
#: src/modules/dummypythonqt/main.py:84 #: src/modules/dummypythonqt/main.py:84
msgid "Click me!" msgid "Click me!"
msgstr "" msgstr "Натисни ме!"
#: src/modules/dummypythonqt/main.py:94 #: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel." msgid "A new QLabel."
msgstr "" msgstr "Нов QLabel."
#: src/modules/dummypythonqt/main.py:97 #: src/modules/dummypythonqt/main.py:97
msgid "Dummy PythonQt ViewStep" msgid "Dummy PythonQt ViewStep"

BIN
src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.mo
View File

Binary file not shown.

4
src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-12-21 16:44+0100\n" "POT-Creation-Date: 2018-02-07 18:58+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Demiray “tulliana” Muhterem <mdemiray@msn.com>, 2016\n" "Last-Translator: Demiray “tulliana” Muhterem <mdemiray@msn.com>, 2016\n"
"Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n"
@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: tr_TR\n" "Language: tr_TR\n"
"Plural-Forms: nplurals=1; plural=0;\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: src/modules/dummypythonqt/main.py:84 #: src/modules/dummypythonqt/main.py:84
msgid "Click me!" msgid "Click me!"

14
src/modules/locale/LocaleConfiguration.cpp
View File

@ -43,9 +43,11 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
const QStringList& availableLocales, const QStringList& availableLocales,
const QString& countryCode ) const QString& countryCode )
{ {
LocaleConfiguration lc = LocaleConfiguration(); LocaleConfiguration lc;
// Note that the documentation how this works is in packages.conf
QString language = languageLocale.split( '_' ).first(); QString language = languageLocale.split( '_' ).first();
lc.myLanguageLocaleBcp47 = QLocale(language).bcp47Name(); lc.myLanguageLocaleBcp47 = QLocale(language).bcp47Name().toLower();
QStringList linesForLanguage; QStringList linesForLanguage;
for ( const QString &line : availableLocales ) for ( const QString &line : availableLocales )
@ -288,7 +290,7 @@ LocaleConfiguration::isEmpty() const
QMap< QString, QString > QMap< QString, QString >
LocaleConfiguration::toMap() LocaleConfiguration::toMap() const
{ {
QMap< QString, QString > map; QMap< QString, QString > map;
@ -324,3 +326,9 @@ LocaleConfiguration::toMap()
return map; return map;
} }
QString
LocaleConfiguration::toBcp47() const
{
return myLanguageLocaleBcp47;
}

9
src/modules/locale/LocaleConfiguration.h
View File

@ -35,16 +35,21 @@ public:
bool isEmpty() const; bool isEmpty() const;
QMap< QString, QString > toMap() const;
// Note that the documentation how this works is in packages.conf
QString toBcp47() const;
// These become all uppercase in locale.conf, but we keep them lowercase here to // These become all uppercase in locale.conf, but we keep them lowercase here to
// avoid confusion with locale.h. // avoid confusion with locale.h.
QString lang, lc_numeric, lc_time, lc_monetary, lc_paper, lc_name, lc_address, QString lang, lc_numeric, lc_time, lc_monetary, lc_paper, lc_name, lc_address,
lc_telephone, lc_measurement, lc_identification; lc_telephone, lc_measurement, lc_identification;
QString myLanguageLocaleBcp47;
QMap< QString, QString > toMap();
// If the user has explicitly selected language (from the dialog) // If the user has explicitly selected language (from the dialog)
// or numbers format, set these to avoid implicit changes to them. // or numbers format, set these to avoid implicit changes to them.
bool explicit_lang, explicit_lc; bool explicit_lang, explicit_lc;
private:
QString myLanguageLocaleBcp47;
}; };
#endif // LOCALECONFIGURATION_H #endif // LOCALECONFIGURATION_H

5
src/modules/locale/LocalePage.cpp
View File

@ -489,8 +489,9 @@ LocalePage::updateGlobalStorage()
->insert( "locationRegion", location.region ); ->insert( "locationRegion", location.region );
Calamares::JobQueue::instance()->globalStorage() Calamares::JobQueue::instance()->globalStorage()
->insert( "locationZone", location.zone ); ->insert( "locationZone", location.zone );
Calamares::JobQueue::instance()->globalStorage()
->insert( "locale", m_selectedLocaleConfiguration.myLanguageLocaleBcp47); const QString bcp47 = m_selectedLocaleConfiguration.toBcp47();
Calamares::JobQueue::instance()->globalStorage()->insert( "locale", bcp47 );
// If we're in chroot mode (normal install mode), then we immediately set the // If we're in chroot mode (normal install mode), then we immediately set the
// timezone on the live system. // timezone on the live system.

30
src/modules/locale/locale.conf
View File

@ -6,22 +6,42 @@
# Distributions using systemd can list available # Distributions using systemd can list available
# time zones by using the timedatectl command. # time zones by using the timedatectl command.
# timedatectl list-timezones # timedatectl list-timezones
#
# The starting timezone (e.g. the pin-on-the-map) when entering
# the locale page can be set through keys *region* and *zone*.
# If either is not set, defaults to America/New_York.
#
region: "America" region: "America"
zone: "New_York" zone: "New_York"
# System locales are detected in the following order: # System locales are detected in the following order:
# #
# /usr/share/i18n/SUPPORTED # - /usr/share/i18n/SUPPORTED
# localeGenPath (defaults to /etc/locale.gen if not set) # - localeGenPath (defaults to /etc/locale.gen if not set)
# 'locale -a' output # - 'locale -a' output
#
# Enable only when your Distribution is using an # Enable only when your Distribution is using an
# custom path for locale.gen # custom path for locale.gen
#localeGenPath: "PATH_TO/locale.gen" #localeGenPath: "PATH_TO/locale.gen"
# GeoIP based Language settings: # GeoIP based Language settings:
# GeoIP need an working Internet connecion. #
# This can be managed from welcome.conf by adding # GeoIP need an working Internet connection.
# This can be managed from `welcome.conf` by adding
# internet to the list of required conditions. # internet to the list of required conditions.
#
# Leave commented out to disable GeoIP. # Leave commented out to disable GeoIP.
#
# An HTTP request is made to http://*geoipUrl*/json (which just happens
# to be the GET path needed by freegeoip.net, so calling this a URL
# is a stretch). The request must return valid JSON data; there should
# be an attribute *time_zone*, with a string value set to the
# timezone, in <region>/<zone> form.
#
# Suitable data looks like
# ```
# {"time_zone":"America/New_York"}
# ```
#
geoipUrl: "freegeoip.net" geoipUrl: "freegeoip.net"

27
src/modules/packages/main.py
View File

@ -332,7 +332,10 @@ def subst_locale(plist):
""" """
locale = libcalamares.globalstorage.value("locale") locale = libcalamares.globalstorage.value("locale")
if not locale: if not locale:
return plist # It is possible to skip the locale-setting entirely.
# Then pretend it is "en", so that {LOCALE}-decorated
# package names are removed from the list.
locale = "en"
ret = [] ret = []
for packagedata in plist: for packagedata in plist:
@ -378,20 +381,20 @@ def run_operations(pkgman, entry):
global group_packages, completed_packages, mode_packages global group_packages, completed_packages, mode_packages
for key in entry.keys(): for key in entry.keys():
entry[key] = subst_locale(entry[key]) package_list = subst_locale(entry[key])
group_packages = len(entry[key]) group_packages = len(package_list)
if key == "install": if key == "install":
_change_mode(INSTALL) _change_mode(INSTALL)
if all([isinstance(x, str) for x in entry[key]]): if all([isinstance(x, str) for x in package_list]):
pkgman.install(entry[key]) pkgman.install(package_list)
else: else:
for package in entry[key]: for package in package_list:
pkgman.install_package(package) pkgman.install_package(package)
elif key == "try_install": elif key == "try_install":
_change_mode(INSTALL) _change_mode(INSTALL)
# we make a separate package manager call for each package so a # we make a separate package manager call for each package so a
# single failing package won't stop all of them # single failing package won't stop all of them
for package in entry[key]: for package in package_list:
try: try:
pkgman.install_package(package) pkgman.install_package(package)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
@ -400,10 +403,10 @@ def run_operations(pkgman, entry):
libcalamares.utils.warning(warn_text) libcalamares.utils.warning(warn_text)
elif key == "remove": elif key == "remove":
_change_mode(REMOVE) _change_mode(REMOVE)
pkgman.remove(entry[key]) pkgman.remove(package_list)
elif key == "try_remove": elif key == "try_remove":
_change_mode(REMOVE) _change_mode(REMOVE)
for package in entry[key]: for package in package_list:
try: try:
pkgman.remove([package]) pkgman.remove([package])
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
@ -412,9 +415,9 @@ def run_operations(pkgman, entry):
libcalamares.utils.warning(warn_text) libcalamares.utils.warning(warn_text)
elif key == "localInstall": elif key == "localInstall":
_change_mode(INSTALL) _change_mode(INSTALL)
pkgman.install(entry[key], from_local=True) pkgman.install(package_list, from_local=True)
completed_packages += len(entry[key]) completed_packages += len(package_list)
libcalamares.job.setprogress(completed_packages * 1.0 / total_packages) libcalamares.job.setprogress(completed_packages * 1.0 / total_packages)
libcalamares.utils.debug(pretty_name()) libcalamares.utils.debug(pretty_name())
@ -458,7 +461,7 @@ def run():
completed_packages = 0 completed_packages = 0
for op in operations: for op in operations:
for packagelist in op.values(): for packagelist in op.values():
total_packages += len(packagelist) total_packages += len(subst_locale(packagelist))
if not total_packages: if not total_packages:
# Avoids potential divide-by-zero in progress reporting # Avoids potential divide-by-zero in progress reporting

18
src/modules/packages/packages.conf
View File

@ -76,7 +76,7 @@ update_db: true
# pre-script: touch /tmp/installing-vi # pre-script: touch /tmp/installing-vi
# post-script: rm -f /tmp/installing-vi # post-script: rm -f /tmp/installing-vi
# #
# The pre- and post-scripts are optional, but not both optional: using # The pre- and post-scripts are optional, but you cannot leave both out: using
# "package: vi" with neither script option will trick Calamares into # "package: vi" with neither script option will trick Calamares into
# trying to install a package named "package: vi", which is unlikely to work. # trying to install a package named "package: vi", which is unlikely to work.
# #
@ -84,11 +84,16 @@ update_db: true
# packages for software based on the selected system locale. By including # packages for software based on the selected system locale. By including
# the string LOCALE in the package name, the following happens: # the string LOCALE in the package name, the following happens:
# #
# - if the system locale is English (generally US English; en_GB is a valid # - if the system locale is English (any variety), then the package is not
# localization), then the package is not installed at all, # installed at all,
# - otherwise $LOCALE or ${LOCALE} is replaced by the Bcp47 name of the selected # - otherwise $LOCALE or ${LOCALE} is replaced by the **lower-cased** BCP47
# system locale, e.g. nl_BE. Note that just plain LOCALE will not be replaced, # name of the **language** part of the selected system locale (not the
# so foo-LOCALE will be unchanged, while foo-$LOCALE will be changed. # country/region/dialect part), e.g. selecting *nl_BE* will use *nl*
# here.
#
# Take care that just plain LOCALE will not be replaced, so foo-LOCALE will
# be left unchanged, while foo-$LOCALE will be changed. However, foo-LOCALE
# **will** be removed from the list of packages, if English is selected.
# #
# The following installs localizations for vi, if they are relevant; if # The following installs localizations for vi, if they are relevant; if
# there is no localization, installation continues normally. # there is no localization, installation continues normally.
@ -127,6 +132,7 @@ update_db: true
operations: operations:
- install: - install:
- vi - vi
- vi-${LOCALE}
- wget - wget
- binutils - binutils
- remove: - remove:

2
src/modules/partition/core/PartitionModel.cpp
View File

@ -115,7 +115,7 @@ PartitionModel::parent( const QModelIndex& child ) const
return createIndex( row, 0, parentNode ); return createIndex( row, 0, parentNode );
++row; ++row;
} }
cLog() << "No parent found!"; cWarning() << "No parent found!";
return QModelIndex(); return QModelIndex();
} }

16
src/modules/plasmalnf/CMakeLists.txt
View File

@ -4,8 +4,13 @@ find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
# needs a runtime support component (which we don't test for). # 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} )
find_package( KF5Plasma ${lnf_ver} ) find_package( KF5Plasma ${lnf_ver} )
find_package( KF5Package ${lnf_ver} ) find_package( KF5Package ${lnf_ver} )
set_package_properties(
KF5Config PROPERTIES
PURPOSE "For finding default Plasma Look-and-Feel"
)
set_package_properties( set_package_properties(
KF5Plasma PROPERTIES KF5Plasma PROPERTIES
PURPOSE "For Plasma Look-and-Feel selection" PURPOSE "For Plasma Look-and-Feel selection"
@ -16,11 +21,19 @@ set_package_properties(
) )
if ( KF5Plasma_FOUND AND KF5Package_FOUND ) if ( KF5Plasma_FOUND AND KF5Package_FOUND )
find_package( KF5 ${lnf_ver} REQUIRED CoreAddons Plasma Package ) if ( KF5Config_FOUND )
set( option_kf5 Config )
set( option_defs WITH_KCONFIG )
# set( option_libs KF5::Config ) # Not needed anyway
endif()
find_package( KF5 ${lnf_ver} REQUIRED CoreAddons Plasma Package ${option_kf5} )
calamares_add_plugin( plasmalnf calamares_add_plugin( plasmalnf
TYPE viewmodule TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO EXPORT_MACRO PLUGINDLLEXPORT_PRO
COMPILE_DEFINITIONS
${option_defs}
SOURCES SOURCES
PlasmaLnfViewStep.cpp PlasmaLnfViewStep.cpp
PlasmaLnfPage.cpp PlasmaLnfPage.cpp
@ -32,6 +45,7 @@ if ( KF5Plasma_FOUND AND KF5Package_FOUND )
page_plasmalnf.ui page_plasmalnf.ui
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
calamaresui calamaresui
${option_libs}
KF5::Package KF5::Package
KF5::Plasma KF5::Plasma
SHARED_LIB SHARED_LIB

35
src/modules/plasmalnf/PlasmaLnfPage.cpp
View File

@ -23,6 +23,8 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Retranslator.h" #include "utils/Retranslator.h"
#include <QAbstractButton>
#include <KPackage/Package> #include <KPackage/Package>
#include <KPackage/PackageLoader> #include <KPackage/PackageLoader>
@ -55,13 +57,18 @@ static ThemeInfoList plasma_themes()
PlasmaLnfPage::PlasmaLnfPage( QWidget* parent ) PlasmaLnfPage::PlasmaLnfPage( QWidget* parent )
: QWidget( parent ) : QWidget( parent )
, ui( new Ui::PlasmaLnfPage ) , ui( new Ui::PlasmaLnfPage )
, m_showAll( false )
, m_buttonGroup( nullptr ) , m_buttonGroup( nullptr )
{ {
ui->setupUi( this ); ui->setupUi( this );
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
{ {
ui->retranslateUi( this ); ui->retranslateUi( this );
ui->generalExplanation->setText( tr( "Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is installed." ) ); ui->generalExplanation->setText( tr(
"Please choose a look-and-feel for the KDE Plasma Desktop. "
"You can also skip this step and configure the look-and-feel "
"once the system is installed. Clicking on a look-and-feel "
"selection will give you a live preview of that look-and-feel.") );
updateThemeNames(); updateThemeNames();
fillUi(); fillUi();
} }
@ -75,10 +82,18 @@ PlasmaLnfPage::setLnfPath( const QString& path )
} }
void void
PlasmaLnfPage::setEnabledThemes(const ThemeInfoList& themes) PlasmaLnfPage::setEnabledThemes(const ThemeInfoList& themes, bool showAll )
{ {
m_enabledThemes = themes; m_enabledThemes = themes;
if ( showAll )
{
auto plasmaThemes = plasma_themes();
for ( auto& installed_theme : plasmaThemes )
if ( !m_enabledThemes.findById( installed_theme.id ) )
m_enabledThemes.append( installed_theme );
}
updateThemeNames(); updateThemeNames();
winnowThemes(); winnowThemes();
fillUi(); fillUi();
@ -87,9 +102,18 @@ PlasmaLnfPage::setEnabledThemes(const ThemeInfoList& themes)
void void
PlasmaLnfPage::setEnabledThemesAll() PlasmaLnfPage::setEnabledThemesAll()
{ {
setEnabledThemes( plasma_themes() ); // Don't need to set showAll=true, because we're already passing in
// the complete list of installed themes.
setEnabledThemes( plasma_themes(), false );
} }
void
PlasmaLnfPage::setPreselect( const QString& id )
{
m_preselect = id;
if ( !m_enabledThemes.isEmpty() )
fillUi();
}
void PlasmaLnfPage::updateThemeNames() void PlasmaLnfPage::updateThemeNames()
{ {
@ -162,6 +186,11 @@ void PlasmaLnfPage::fillUi()
{ {
theme.widget->updateThemeName( theme ); theme.widget->updateThemeName( theme );
} }
if ( theme.id == m_preselect )
{
const QSignalBlocker b( theme.widget->button() );
theme.widget->button()->setChecked( true );
}
++c; ++c;
} }
} }

13
src/modules/plasmalnf/PlasmaLnfPage.h
View File

@ -46,10 +46,17 @@ public:
explicit PlasmaLnfPage( QWidget* parent = nullptr ); explicit PlasmaLnfPage( QWidget* parent = nullptr );
void setLnfPath( const QString& path ); void setLnfPath( const QString& path );
/** @brief enable only the listed themes. */ /** @brief enable only the listed themes.
void setEnabledThemes( const ThemeInfoList& themes ); *
* Shows the listed @p themes with full information (e.g. screenshot).
* If @p showAll is true, then also show all installed themes
* not explicitly listed (without a screenshot).
*/
void setEnabledThemes( const ThemeInfoList& themes, bool showAll );
/** @brief enable all installed plasma themes. */ /** @brief enable all installed plasma themes. */
void setEnabledThemesAll(); void setEnabledThemesAll();
/** @brief set which theme is to be preselected. */
void setPreselect( const QString& id );
signals: signals:
void plasmaThemeSelected( const QString& id ); void plasmaThemeSelected( const QString& id );
@ -64,6 +71,8 @@ private:
Ui::PlasmaLnfPage* ui; Ui::PlasmaLnfPage* ui;
QString m_lnfPath; QString m_lnfPath;
QString m_preselect;
bool m_showAll; // If true, don't winnow according to enabledThemes
ThemeInfoList m_enabledThemes; ThemeInfoList m_enabledThemes;
QButtonGroup *m_buttonGroup; QButtonGroup *m_buttonGroup;

35
src/modules/plasmalnf/PlasmaLnfViewStep.cpp
View File

@ -27,8 +27,25 @@
#include <QProcess> #include <QProcess>
#include <QVariantMap> #include <QVariantMap>
#ifdef WITH_KCONFIG
#include <KConfigGroup>
#include <KSharedConfig>
#endif
CALAMARES_PLUGIN_FACTORY_DEFINITION( PlasmaLnfViewStepFactory, registerPlugin<PlasmaLnfViewStep>(); ) CALAMARES_PLUGIN_FACTORY_DEFINITION( PlasmaLnfViewStepFactory, registerPlugin<PlasmaLnfViewStep>(); )
static QString
currentPlasmaTheme()
{
#ifdef WITH_KCONFIG
KConfigGroup cg( KSharedConfig::openConfig( QStringLiteral( "kdeglobals" ) ), "KDE" );
return cg.readEntry( "LookAndFeelPackage", QString() );
#else
cWarning() << "No KConfig support, cannot determine Plasma theme.";
return QString();
#endif
}
PlasmaLnfViewStep::PlasmaLnfViewStep( QObject* parent ) PlasmaLnfViewStep::PlasmaLnfViewStep( QObject* parent )
: Calamares::ViewStep( parent ) : Calamares::ViewStep( parent )
, m_widget( new PlasmaLnfPage ) , m_widget( new PlasmaLnfPage )
@ -132,10 +149,18 @@ PlasmaLnfViewStep::setConfigurationMap( const QVariantMap& configurationMap )
m_liveUser = CalamaresUtils::getString( configurationMap, "liveuser" ); m_liveUser = CalamaresUtils::getString( configurationMap, "liveuser" );
QString preselect = CalamaresUtils::getString( configurationMap, "preselect" );
if ( preselect == QStringLiteral( "*" ) )
preselect = currentPlasmaTheme();
if ( !preselect.isEmpty() )
m_widget->setPreselect( preselect );
bool showAll = CalamaresUtils::getBool( configurationMap, "showAll", false );
if ( configurationMap.contains( "themes" ) && if ( configurationMap.contains( "themes" ) &&
configurationMap.value( "themes" ).type() == QVariant::List ) configurationMap.value( "themes" ).type() == QVariant::List )
{ {
ThemeInfoList allThemes; ThemeInfoList listedThemes;
auto themeList = configurationMap.value( "themes" ).toList(); auto themeList = configurationMap.value( "themes" ).toList();
// Create the ThemInfo objects for the listed themes; information // Create the ThemInfo objects for the listed themes; information
// about the themes from Plasma (e.g. human-readable name and description) // about the themes from Plasma (e.g. human-readable name and description)
@ -144,14 +169,14 @@ PlasmaLnfViewStep::setConfigurationMap( const QVariantMap& configurationMap )
if ( i.type() == QVariant::Map ) if ( i.type() == QVariant::Map )
{ {
auto iv = i.toMap(); auto iv = i.toMap();
allThemes.append( ThemeInfo( iv.value( "theme" ).toString(), iv.value( "image" ).toString() ) ); listedThemes.append( ThemeInfo( iv.value( "theme" ).toString(), iv.value( "image" ).toString() ) );
} }
else if ( i.type() == QVariant::String ) else if ( i.type() == QVariant::String )
allThemes.append( ThemeInfo( i.toString() ) ); listedThemes.append( ThemeInfo( i.toString() ) );
if ( allThemes.length() == 1 ) if ( listedThemes.length() == 1 )
cWarning() << "only one theme enabled in plasmalnf"; cWarning() << "only one theme enabled in plasmalnf";
m_widget->setEnabledThemes( allThemes ); m_widget->setEnabledThemes( listedThemes, showAll );
} }
else else
m_widget->setEnabledThemesAll(); // All of them m_widget->setEnabledThemesAll(); // All of them

6
src/modules/plasmalnf/PlasmaLnfViewStep.h
View File

@ -61,9 +61,9 @@ public slots:
private: private:
PlasmaLnfPage* m_widget; PlasmaLnfPage* m_widget;
QString m_lnfPath; QString m_lnfPath; // Path to the lnf tool
QString m_themeId; QString m_themeId; // Id of selected theme
QString m_liveUser; QString m_liveUser; // Name of the live user (for OEM mode)
}; };
CALAMARES_PLUGIN_FACTORY_DECLARATION( PlasmaLnfViewStepFactory ) CALAMARES_PLUGIN_FACTORY_DECLARATION( PlasmaLnfViewStepFactory )

2
src/modules/plasmalnf/ThemeWidget.cpp
View File

@ -65,7 +65,7 @@ ThemeWidget::ThemeWidget(const ThemeInfo& info, QWidget* parent)
layout->addWidget( image_label, 1 ); layout->addWidget( image_label, 1 );
layout->addWidget( m_description, 3 ); layout->addWidget( m_description, 3 );
connect( m_check, &QRadioButton::clicked, this, &ThemeWidget::clicked ); connect( m_check, &QRadioButton::toggled, this, &ThemeWidget::clicked );
} }
void void

28
src/modules/plasmalnf/plasmalnf.conf
View File

@ -23,8 +23,9 @@ lnftool: "/usr/bin/lookandfeeltool"
# You can limit the list of Plasma look-and-feel themes by listing ids # You can limit the list of Plasma look-and-feel themes by listing ids
# here. If this key is not present, all of the installed themes are listed. # here. If this key is not present, all of the installed themes are listed.
# If the key is present, only installed themes that are *also* included # If the key is present, only installed themes that are **also** included
# in the list are shown (could be none!). # in the list are shown (could be none!). See the *showAll* key, below,
# to change that.
# #
# Themes may be listed by id, (e.g. fluffy-bunny, below) or as a theme # Themes may be listed by id, (e.g. fluffy-bunny, below) or as a theme
# and an image (e.g. breeze) which will be used to show a screenshot. # and an image (e.g. breeze) which will be used to show a screenshot.
@ -49,3 +50,26 @@ themes:
- theme: org.kde.breezedark.desktop - theme: org.kde.breezedark.desktop
image: "breeze-dark.png" image: "breeze-dark.png"
- org.kde.fluffy-bunny.desktop - org.kde.fluffy-bunny.desktop
# If *showAll* is true, then all installed themes are shown in the
# UI for selection, even if they are not listed in *themes*. This
# allows selection of all themes even while not all of them are
# listed in *themes* -- which is useful to show screenshots for those
# you do have a screenshot for.
showAll: false
# You can pre-select one of the themes; it is not applied
# immediately, but its radio-button is switched on to indicate
# that that is the theme (that is most likely) currently in use.
# Do this only on Live images where you are reasonably sure
# that the user is not going to change the theme out from under
# themselves before running the installer.
#
# If this key is present, its value should be the id of the theme
# which should be pre-selected. If absent, empty, or the pre-selected
# theme is not found on the live system, no theme will be pre-selected.
#
# As a special setting, use "*", to try to find the currently-
# selected theme by reading the Plasma configuration. This requires
# KF5::Config at build- and run-time.
preselect: "*"

8
src/modules/users/SetHostNameJob.cpp
View File

@ -57,21 +57,21 @@ Calamares::JobResult SetHostNameJob::exec()
if ( !gs || !gs->contains( "rootMountPoint" ) ) if ( !gs || !gs->contains( "rootMountPoint" ) )
{ {
cLog() << "No rootMountPoint in global storage"; cError() << "No rootMountPoint in global storage";
return Calamares::JobResult::error( tr( "Internal Error" ) ); return Calamares::JobResult::error( tr( "Internal Error" ) );
} }
QString destDir = gs->value( "rootMountPoint" ).toString(); QString destDir = gs->value( "rootMountPoint" ).toString();
if ( !QDir( destDir ).exists() ) if ( !QDir( destDir ).exists() )
{ {
cLog() << "rootMountPoint points to a dir which does not exist"; cError() << "rootMountPoint points to a dir which does not exist";
return Calamares::JobResult::error( tr( "Internal Error" ) ); return Calamares::JobResult::error( tr( "Internal Error" ) );
} }
QFile hostfile( destDir + "/etc/hostname" ); QFile hostfile( destDir + "/etc/hostname" );
if ( !hostfile.open( QFile::WriteOnly ) ) if ( !hostfile.open( QFile::WriteOnly ) )
{ {
cLog() << "Can't write to hostname file"; cError() << "Can't write to hostname file";
return Calamares::JobResult::error( tr( "Cannot write hostname to target system" ) ); return Calamares::JobResult::error( tr( "Cannot write hostname to target system" ) );
} }
@ -82,7 +82,7 @@ Calamares::JobResult SetHostNameJob::exec()
QFile hostsfile( destDir + "/etc/hosts" ); QFile hostsfile( destDir + "/etc/hosts" );
if ( !hostsfile.open( QFile::WriteOnly ) ) if ( !hostsfile.open( QFile::WriteOnly ) )
{ {
cLog() << "Can't write to hosts file"; cError() << "Can't write to hosts file";
return Calamares::JobResult::error( tr( "Cannot write hostname to target system" ) ); return Calamares::JobResult::error( tr( "Cannot write hostname to target system" ) );
} }

4
src/modules/welcome/WelcomePage.cpp
View File

@ -162,6 +162,7 @@ WelcomePage::initLanguages()
QLocale thisLocale = ui->languageWidget->itemData( i, Qt::UserRole ).toLocale(); QLocale thisLocale = ui->languageWidget->itemData( i, Qt::UserRole ).toLocale();
if ( thisLocale == QLocale( QLocale::English, QLocale::UnitedStates ) ) if ( thisLocale == QLocale( QLocale::English, QLocale::UnitedStates ) )
{ {
isTranslationAvailable = true;
ui->languageWidget->setCurrentIndex( i ); ui->languageWidget->setCurrentIndex( i );
cDebug() << "Translation unavailable, so initial locale set to " << thisLocale.name(); cDebug() << "Translation unavailable, so initial locale set to " << thisLocale.name();
QLocale::setDefault( thisLocale ); QLocale::setDefault( thisLocale );
@ -173,6 +174,9 @@ WelcomePage::initLanguages()
} }
} }
if ( !isTranslationAvailable )
cWarning() << "No available translation matched" << defaultLocale;
connect( ui->languageWidget, connect( ui->languageWidget,
static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ), static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ),
this, [ & ]( int newIndex ) this, [ & ]( int newIndex )

18
src/modules/welcome/checker/RequirementsChecker.cpp
View File

@ -1,7 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* Copyright 2014-2017, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2017, Teo Mrnjavac <teo@kde.org>
* Copyright 2017, Adriaan de Groot <groot@kde.org> * Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
* Copyright 2017, Gabriel Craciunescu <crazy@frugalware.org> * Copyright 2017, Gabriel Craciunescu <crazy@frugalware.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
@ -100,12 +100,14 @@ RequirementsChecker::RequirementsChecker( QObject* parent )
if ( m_entriesToCheck.contains( "root" ) ) if ( m_entriesToCheck.contains( "root" ) )
isRoot = checkIsRoot(); isRoot = checkIsRoot();
using TR = Logger::DebugRow<const char *, bool>;
cDebug() << "RequirementsChecker output:" cDebug() << "RequirementsChecker output:"
<< " enoughStorage:" << enoughStorage << TR("enoughStorage", enoughStorage)
<< " enoughRam:" << enoughRam << TR("enoughRam", enoughRam)
<< " hasPower:" << hasPower << TR("hasPower", hasPower)
<< " hasInternet:" << hasInternet << TR("hasInternet", hasInternet)
<< " isRoot:" << isRoot; << TR("isRoot", isRoot);
QList< PrepareEntry > checkEntries; QList< PrepareEntry > checkEntries;
foreach ( const QString& entry, m_entriesToCheck ) foreach ( const QString& entry, m_entriesToCheck )
@ -305,7 +307,9 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
} }
if ( incompleteConfiguration ) if ( incompleteConfiguration )
cWarning() << "RequirementsChecker configuration map:\n" << configurationMap; {
cWarning() << "RequirementsChecker configuration map:" << Logger::DebugMap( configurationMap );
}
} }

4
src/modules/welcome/welcome.conf
View File

@ -25,6 +25,6 @@ requirements:
# If any of these conditions are not met, the user cannot # If any of these conditions are not met, the user cannot
# continue past the welcome page. # continue past the welcome page.
required: required:
- storage # - storage
- ram - ram
- root # - root