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

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
Adriaan de Groot 2019-04-21 16:55:42 +02:00 committed by GitHub
commit 3b7b0d6f04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
126 changed files with 1678 additions and 923 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
CHANGES
View File

@ -3,17 +3,39 @@ contributors are listed. Note that Calamares does not have a historical
changelog -- this log starts with version 3.2.0. The release notes on the changelog -- this log starts with version 3.2.0. The release notes on the
website will have to do for older versions. website will have to do for older versions.
# 3.2.6 (unreleased) # # 3.2.7 (unreleased) #
This release contains contributions from (alphabetically by first name): This release contains contributions from (alphabetically by first name):
- Dominic Hayes (feren)
## Core ## ## Core ##
## Modules ## ## Modules ##
# 3.2.5 (unreleased) # # 3.2.6 (unreleased) #
This release contains contributions from (alphabetically by first name):
- Arnaud Ferraris
- Dominic Hayes (feren)
## Core ##
* Under-the-hood code cleanups in lots of parts of the core. Calamares now
builds without warnings when Clang 8 is used.
## Modules ##
* All of the Python-based modules now have translations enabled.
* *Displaymanager* module has improved support for LightDM configuration.
(Thanks to Dominic, FerenOS)
* *Partition* module has additional checks for validity partition layouts.
(Thanks to Arnaud)
* *Welcome* module has improved usability: a standard icon
alongside the *Language* label, for improved recognition,
and improved language-list display and sorting. #1107
# 3.2.5 (2019-04-15) #
This release contains contributions from (alphabetically by first name): This release contains contributions from (alphabetically by first name):
- Arnaud Ferraris - Arnaud Ferraris
@ -60,7 +82,7 @@ This release contains contributions from (alphabetically by first name):
- Alf Gaida - Alf Gaida
- aliveafter1000 - aliveafter1000
- Arnaud Ferraris - Arnaud Ferraris
- Caio Carvalho - Caio Jordão Carvalho
- Collabora LTD - Collabora LTD
- Gabriel Craciunescu - Gabriel Craciunescu
- Kevin Kofler - Kevin Kofler
@ -146,7 +168,7 @@ There are no core changes in this release.
This release contains contributions from (alphabetically by first name): This release contains contributions from (alphabetically by first name):
- Andrius Štikonas - Andrius Štikonas
- artoo@cromnix.org - artoo@cromnix.org
- Caio Carvalho - Caio Jordão Carvalho
- Harald Sitter - Harald Sitter
- Philip Müller - Philip Müller
- Simon Quigley - Simon Quigley
@ -246,7 +268,7 @@ This release contains contributions from (alphabetically by first name):
This release contains contributions from (alphabetically by first name): This release contains contributions from (alphabetically by first name):
- Alf Gaida - Alf Gaida
- AlmAck - AlmAck
- Caio Carvalho - Caio Jordão Carvalho
- Frede H - Frede H
## Modules ## ## Modules ##

7
CMakeLists.txt
View File

@ -37,10 +37,10 @@
cmake_minimum_required( VERSION 3.2 FATAL_ERROR ) cmake_minimum_required( VERSION 3.2 FATAL_ERROR )
project( CALAMARES project( CALAMARES
VERSION 3.2.5 VERSION 3.2.6
LANGUAGES C CXX ) LANGUAGES C CXX )
set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development
### OPTIONS ### OPTIONS
# #
@ -208,6 +208,8 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
set( CMAKE_TOOLCHAIN_PREFIX "llvm-" ) set( CMAKE_TOOLCHAIN_PREFIX "llvm-" )
set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" ) set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
set( CALAMARES_AUTOMOC_OPTIONS "-butils/moc-warnings.h" )
else() else()
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--fatal-warnings -Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--fatal-warnings -Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type" )
@ -509,6 +511,7 @@ install(
"CMakeModules/CalamaresAddLibrary.cmake" "CMakeModules/CalamaresAddLibrary.cmake"
"CMakeModules/CalamaresAddBrandingSubdirectory.cmake" "CMakeModules/CalamaresAddBrandingSubdirectory.cmake"
"CMakeModules/CalamaresAddTranslations.cmake" "CMakeModules/CalamaresAddTranslations.cmake"
"CMakeModules/CalamaresAutomoc.cmake"
"CMakeModules/CMakeColors.cmake" "CMakeModules/CMakeColors.cmake"
DESTINATION DESTINATION
"${CMAKE_INSTALL_CMAKEDIR}" "${CMAKE_INSTALL_CMAKEDIR}"

7
CMakeModules/CalamaresAddLibrary.cmake
View File

@ -44,6 +44,7 @@
# flag (i.e. `-D`) so only state the name (optionally, also the value) # flag (i.e. `-D`) so only state the name (optionally, also the value)
# without a `-D` prefixed to it. Pass in a CMake list as needed. # without a `-D` prefixed to it. Pass in a CMake list as needed.
include( CMakeParseArguments ) include( CMakeParseArguments )
include( CalamaresAutomoc )
function(calamares_add_library) function(calamares_add_library)
# parse arguments (name needs to be saved before passing ARGN into the macro) # parse arguments (name needs to be saved before passing ARGN into the macro)
@ -81,10 +82,8 @@ function(calamares_add_library)
add_library(${target} SHARED ${LIBRARY_SOURCES}) add_library(${target} SHARED ${LIBRARY_SOURCES})
endif() endif()
# definitions - can this be moved into set_target_properties below? calamares_automoc(${target})
add_definitions(${QT_DEFINITIONS})
set_target_properties(${target} PROPERTIES AUTOMOC TRUE)
if(LIBRARY_EXPORT_MACRO) if(LIBRARY_EXPORT_MACRO)
set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS ${LIBRARY_EXPORT_MACRO}) set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS ${LIBRARY_EXPORT_MACRO})
endif() endif()

36
CMakeModules/CalamaresAutomoc.cmake Normal file
View File

@ -0,0 +1,36 @@
# === This file is part of Calamares - <https://github.com/calamares> ===
#
# Calamares is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Calamares is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Calamares. If not, see <http://www.gnu.org/licenses/>.
#
# SPDX-License-Identifier: GPL-3.0+
# License-Filename: LICENSE
#
###
#
# Helper function for doing automoc on a target.
#
# Sets AUTOMOC TRUE for a target.
#
# If the global variable CALAMARES_AUTOMOC_OPTIONS is set, uses that
# as well to set options passed to MOC. This can be used to add
# libcalamares/utils/moc-warnings.h file to the moc, which in turn
# reduces compiler warnings in generated MOC code.
#
function(calamares_automoc TARGET)
set_target_properties( ${TARGET} PROPERTIES AUTOMOC TRUE )
if ( CALAMARES_AUTOMOC_OPTIONS )
set_target_properties( ${TARGET} PROPERTIES AUTOMOC_MOC_OPTIONS "${CALAMARES_AUTOMOC_OPTIONS}" )
endif()
endfunction()

44
ci/RELEASE.sh
View File

@ -15,30 +15,52 @@
# - pulling translations # - pulling translations
# - updating the language list # - updating the language list
# - switching to the right branch # - switching to the right branch
#
# You can influence the script a little with environment variables:
# - BUILD_DEFAULT set to false to avoid first build with gcc
# - BUILD_CLANG set to false to avoid second build with clang
# - BUILD_ONLY set to true to break after building
test -d .git || { echo "Not at top-level." ; exit 1 ; } test -d .git || { echo "Not at top-level." ; exit 1 ; }
test -d src/modules || { echo "No src/modules." ; exit 1 ; } test -d src/modules || { echo "No src/modules." ; exit 1 ; }
which cmake > /dev/null 2>&1 || { echo "No cmake(1) available." ; exit 1 ; } which cmake > /dev/null 2>&1 || { echo "No cmake(1) available." ; exit 1 ; }
### Build with default compiler test -z "$BUILD_DEFAULT" && BUILD_DEFAULT=true
test -z "$BUILD_CLANG" && BUILD_CLANG=true
test -z "$BUILD_ONLY" && BUILD_ONLY=false
### Setup
# #
# #
BUILDDIR=$(mktemp -d --suffix=-build --tmpdir=.) BUILDDIR=$(mktemp -d --suffix=-build --tmpdir=.)
rm -rf "$BUILDDIR"
mkdir "$BUILDDIR" || { echo "Could not create build directory." ; exit 1 ; } ### Build with default compiler
( cd "$BUILDDIR" && cmake .. && make -j4 ) || { echo "Could not perform test-build." ; exit 1 ; } #
( cd "$BUILDDIR" && make test ) || { echo "Tests failed." ; exit 1 ; } #
if test "x$BUILD_DEFAULT" = "xtrue" ; then
rm -rf "$BUILDDIR"
mkdir "$BUILDDIR" || { echo "Could not create build directory." ; exit 1 ; }
( cd "$BUILDDIR" && cmake .. && make -j4 ) || { echo "Could not perform test-build." ; exit 1 ; }
( cd "$BUILDDIR" && make test ) || { echo "Tests failed." ; exit 1 ; }
fi
### Build with clang ### Build with clang
# #
# #
if which clang++ > /dev/null 2>&1 ; then if test "x$BUILD_CLANG" = "xtrue" ; then
# Do build again with clang if which clang++ > /dev/null 2>&1 ; then
rm -rf "$BUILDDIR" # Do build again with clang
mkdir "$BUILDDIR" || { echo "Could not create build directory." ; exit 1 ; } rm -rf "$BUILDDIR"
( cd "$BUILDDIR" && CC=clang CXX=clang++ cmake .. && make -j4 ) || { echo "Could not perform test-build." ; exit 1 ; } mkdir "$BUILDDIR" || { echo "Could not create build directory." ; exit 1 ; }
( cd "$BUILDDIR" && make test ) || { echo "Tests failed." ; exit 1 ; } ( cd "$BUILDDIR" && CC=clang CXX=clang++ cmake .. && make -j4 ) || { echo "Could not perform test-build." ; exit 1 ; }
( cd "$BUILDDIR" && make test ) || { echo "Tests failed." ; exit 1 ; }
fi
fi
if test "x$BUILD_ONLY" = "xtrue" ; then
echo "Builds completed, release stopped."
exit 1
fi fi
### Get version number for this release ### Get version number for this release

29
lang/calamares_ast.ts
View File

@ -257,12 +257,12 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/>
<source>Continue with installation?</source> <source>Continue with installation?</source>
<translation type="unfinished"/> <translation>¿Siguir cola instalación?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/>
<source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source> <source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
<translation type="unfinished"/> <translation>El programa d&apos;instalación de %1 ta a piques de facer cambeos nel discu pa configurar %2.&lt;br/&gt;&lt;strong&gt;Nun vas ser a desfacer estos cambeos.&lt;strong&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/>
@ -298,7 +298,8 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/>
<source>Do you really want to cancel the current setup process? <source>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</source> The setup program will quit and all changes will be lost.</source>
<translation type="unfinished"/> <translation>¿De xuru que quies encaboxar el procesu actual de configuración?
El programa de configuración va colar y van perdese tolos cambeos.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/>
@ -1091,7 +1092,7 @@ L&apos;instalador va colar y van perdese tolos cambeos.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="95"/> <location filename="../src/modules/finished/FinishedPage.ui" line="95"/>
<source>&lt;Restart checkbox tooltip&gt;</source> <source>&lt;Restart checkbox tooltip&gt;</source>
<translation type="unfinished"/> <translation>&lt;Restart checkbox tooltip&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="98"/> <location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
@ -1139,7 +1140,7 @@ L&apos;instalador va colar y van perdese tolos cambeos.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/>
<source>Setup Complete</source> <source>Setup Complete</source>
<translation type="unfinished"/> <translation>Configuración completada</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/>
@ -1149,7 +1150,7 @@ L&apos;instalador va colar y van perdese tolos cambeos.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/>
<source>The setup of %1 is complete.</source> <source>The setup of %1 is complete.</source>
<translation type="unfinished"/> <translation>La configuración de %1 ta completada.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/>
@ -1235,7 +1236,7 @@ L&apos;instalador va colar y van perdese tolos cambeos.</translation>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/>
<source>The screen is too small to display the setup program.</source> <source>The screen is too small to display the setup program.</source>
<translation type="unfinished"/> <translation>La pantalla ye mui pequeña como p&apos;amosar el programa de configuración.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/>
@ -2455,7 +2456,7 @@ Salida:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/>
<source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source> <source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source>
<translation type="unfinished"/> <translation>Esti ordenador nun satisfaz dalgún de los requirimientos mínimos pa configurar %1.&lt;br/&gt;La configuración nun pue siguir. &lt;a href=&quot;#details&quot;&gt;Detalles...&lt;/a&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/>
@ -2465,7 +2466,7 @@ Salida:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/>
<source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source> <source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source>
<translation type="unfinished"/> <translation>Esti ordenador nun satisfaz dalgún de los requirimientos aconseyaos pa configurar %1.&lt;br/&gt;La configuración pue siguir pero dalgunes carauterístiques podríen desactivase.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/>
@ -2871,12 +2872,12 @@ Salida:
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="115"/> <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;Si va usar l&apos;ordenador más d&apos;una persona, pues crear más cuentes tres la configuración.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="121"/> <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;Si va usar l&apos;ordenador más d&apos;una persona, pues crear más cuentes tres la instalación.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="312"/> <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
@ -3016,17 +3017,17 @@ Salida:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
<source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Afáyate nel programa de configuración de Calamares pa %1.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/>
<source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Afáyate na configuración de %1.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/>
<source>About %1 setup</source> <source>About %1 setup</source>
<translation type="unfinished"/> <translation>Tocante a la configuración de %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/>

26
lang/calamares_cs_CZ.ts
View File

@ -226,7 +226,7 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/>
<source>Cancel setup without changing the system.</source> <source>Cancel setup without changing the system.</source>
<translation type="unfinished"/> <translation>Zrušit nastavení bez změny v systému.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/>
@ -237,7 +237,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/>
<source>Setup Failed</source> <source>Setup Failed</source>
<translation type="unfinished"/> <translation>Nastavení se nezdařilo</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/>
@ -257,7 +257,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/>
<source>Continue with installation?</source> <source>Continue with installation?</source>
<translation type="unfinished"/> <translation>Pokračovat v instalaci?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/>
@ -267,12 +267,12 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/>
<source>&amp;Set up now</source> <source>&amp;Set up now</source>
<translation type="unfinished"/> <translation>Na&amp;stavit nyní</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/>
<source>&amp;Set up</source> <source>&amp;Set up</source>
<translation type="unfinished"/> <translation>Na&amp;stavit</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/>
@ -282,12 +282,12 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/>
<source>Setup is complete. Close the setup program.</source> <source>Setup is complete. Close the setup program.</source>
<translation type="unfinished"/> <translation>Nastavení je dokončeno. Ukončete nastavovací program.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/>
<source>Cancel setup?</source> <source>Cancel setup?</source>
<translation type="unfinished"/> <translation>Zrušit nastavování?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/>
@ -1091,7 +1091,7 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="95"/> <location filename="../src/modules/finished/FinishedPage.ui" line="95"/>
<source>&lt;Restart checkbox tooltip&gt;</source> <source>&lt;Restart checkbox tooltip&gt;</source>
<translation type="unfinished"/> <translation>&lt;Restart checkbox tooltip&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="98"/> <location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
@ -1139,7 +1139,7 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/>
<source>Setup Complete</source> <source>Setup Complete</source>
<translation type="unfinished"/> <translation>Nastavení dokončeno</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/>
@ -1149,7 +1149,7 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/>
<source>The setup of %1 is complete.</source> <source>The setup of %1 is complete.</source>
<translation type="unfinished"/> <translation>Nastavení %1 je dokončeno.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/>
@ -1225,7 +1225,7 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/>
<source>The setup program is not running with administrator rights.</source> <source>The setup program is not running with administrator rights.</source>
<translation type="unfinished"/> <translation>Nastavovací program není spuštěn s právy správce systému.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/>
@ -1235,7 +1235,7 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/>
<source>The screen is too small to display the setup program.</source> <source>The screen is too small to display the setup program.</source>
<translation type="unfinished"/> <translation>Rozlišení obrazovky je příliš malé pro zobrazení nastavovacího programu.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/>
@ -3026,7 +3026,7 @@ Výstup:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/>
<source>About %1 setup</source> <source>About %1 setup</source>
<translation type="unfinished"/> <translation>O nastavování %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/>

77
lang/calamares_de.ts
View File

@ -115,12 +115,12 @@
<message> <message>
<location filename="../src/libcalamares/JobExample.cpp" line="39"/> <location filename="../src/libcalamares/JobExample.cpp" line="39"/>
<source>Job failed (%1)</source> <source>Job failed (%1)</source>
<translation type="unfinished"/> <translation>Auftrag fehlgeschlagen (%1)</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/JobExample.cpp" line="39"/> <location filename="../src/libcalamares/JobExample.cpp" line="39"/>
<source>Programmed job failure was explicitly requested.</source> <source>Programmed job failure was explicitly requested.</source>
<translation type="unfinished"/> <translation>Ein programmierter Auftragsfehler wurde explizit gefordert.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -136,7 +136,7 @@
<message> <message>
<location filename="../src/libcalamares/JobExample.cpp" line="27"/> <location filename="../src/libcalamares/JobExample.cpp" line="27"/>
<source>Example job (%1)</source> <source>Example job (%1)</source>
<translation type="unfinished"/> <translation>Beispielauftrag (%1)</translation>
</message> </message>
</context> </context>
<context> <context>
@ -190,17 +190,17 @@
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="147"/> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="147"/>
<source>Waiting for %n module(s).</source> <source>Waiting for %n module(s).</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> <translation><numerusform>Warten auf %n Modul.</numerusform><numerusform>Warten auf %n Modul(e).</numerusform></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="148"/> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="148"/>
<source>(%n second(s))</source> <source>(%n second(s))</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> <translation><numerusform>(%n Sekunde)</numerusform><numerusform>(%n Sekunde(n))</numerusform></translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="152"/> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="152"/>
<source>System-requirements checking is complete.</source> <source>System-requirements checking is complete.</source>
<translation type="unfinished"/> <translation>Die Überprüfung der Systemvoraussetzungen ist abgeschlossen.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -226,7 +226,7 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/>
<source>Cancel setup without changing the system.</source> <source>Cancel setup without changing the system.</source>
<translation type="unfinished"/> <translation>Brechen Sie die Installation ab, ohne das System zu verändern.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/>
@ -237,7 +237,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/>
<source>Setup Failed</source> <source>Setup Failed</source>
<translation type="unfinished"/> <translation>Setup fehlgeschlagen</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/>
@ -257,22 +257,22 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/>
<source>Continue with installation?</source> <source>Continue with installation?</source>
<translation type="unfinished"/> <translation>Installation fortsetzen?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/>
<source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source> <source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
<translation type="unfinished"/> <translation>Das %1 Installationsprogramm ist dabei, Änderungen an Ihrer Festplatte vorzunehmen, um %2 einzurichten.&lt;br/&gt;&lt;strong&gt; Sie werden diese Änderungen nicht rückgängig machen können.&lt;/strong&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/>
<source>&amp;Set up now</source> <source>&amp;Set up now</source>
<translation type="unfinished"/> <translation>&amp;Jetzt einrichten</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/>
<source>&amp;Set up</source> <source>&amp;Set up</source>
<translation type="unfinished"/> <translation>&amp;Einrichten</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/>
@ -282,12 +282,12 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/>
<source>Setup is complete. Close the setup program.</source> <source>Setup is complete. Close the setup program.</source>
<translation type="unfinished"/> <translation>Setup ist abgeschlossen. Schließe das Installationsprogramm.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/>
<source>Cancel setup?</source> <source>Cancel setup?</source>
<translation type="unfinished"/> <translation>Installation abbrechen?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/>
@ -298,7 +298,8 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/>
<source>Do you really want to cancel the current setup process? <source>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</source> The setup program will quit and all changes will be lost.</source>
<translation type="unfinished"/> <translation>Wollen Sie wirklich die aktuelle Installation abbrechen?
Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/>
@ -391,7 +392,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="58"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="58"/>
<source>%1 Setup Program</source> <source>%1 Setup Program</source>
<translation type="unfinished"/> <translation>%1 Installationsprogramm</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="59"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="59"/>
@ -1091,7 +1092,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="95"/> <location filename="../src/modules/finished/FinishedPage.ui" line="95"/>
<source>&lt;Restart checkbox tooltip&gt;</source> <source>&lt;Restart checkbox tooltip&gt;</source>
<translation type="unfinished"/> <translation>&lt;Restart checkbox tooltip&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="98"/> <location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
@ -1101,12 +1102,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="54"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="54"/>
<source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source> <source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Alles erledigt.&lt;/h1&gt;&lt;br/&gt;%1 wurde auf Ihrem Computer eingerichtet.&lt;br/&gt;Sie können nun mit Ihrem neuen System arbeiten.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="59"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="59"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wenn diese Option aktiviert ist, genügt zum Neustart des Systems ein Klick auf &lt;span style=&quot;font-style:italic;&quot;&gt;Fertig&lt;/span&gt; oder das Schließen des Installationsprogramms.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="67"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="67"/>
@ -1116,12 +1117,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="73"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="73"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wenn diese Option aktiviert ist, genügt zum Neustart des Systems ein Klick auf &lt;span style=&quot;font-style:italic;&quot;&gt;Fertig&lt;/span&gt; oder das Schließen des Installationsprogramms.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="132"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="132"/>
<source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source> <source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Installation fehlgeschlagen&lt;/h1&gt;&lt;br/&gt;%1 wurde nicht auf Ihrem Computer eingerichtet.&lt;br/&gt;Die Fehlermeldung war: %2.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="138"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="138"/>
@ -1139,7 +1140,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/>
<source>Setup Complete</source> <source>Setup Complete</source>
<translation type="unfinished"/> <translation>Installation komplett</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/>
@ -1149,7 +1150,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/>
<source>The setup of %1 is complete.</source> <source>The setup of %1 is complete.</source>
<translation type="unfinished"/> <translation>Die Installation von %1 ist abgeschlossen.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/>
@ -1225,7 +1226,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/>
<source>The setup program is not running with administrator rights.</source> <source>The setup program is not running with administrator rights.</source>
<translation type="unfinished"/> <translation>Das Installationsprogramm wird nicht mit Administratorrechten ausgeführt.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/>
@ -1235,7 +1236,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/>
<source>The screen is too small to display the setup program.</source> <source>The screen is too small to display the setup program.</source>
<translation type="unfinished"/> <translation>Der Bildschirm ist zu klein, um das Installationsprogramm anzuzeigen.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/>
@ -2045,12 +2046,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="640"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="640"/>
<source>has at least one disk device available.</source> <source>has at least one disk device available.</source>
<translation type="unfinished"/> <translation>hat mindestens ein Festplattengerät zur Verfügung.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="641"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="641"/>
<source>There are no partitons to install on.</source> <source>There are no partitons to install on.</source>
<translation type="unfinished"/> <translation>Es gibt keine Partitonen, auf denen man installieren könnte.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2077,7 +2078,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/>
<source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source> <source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source>
<translation type="unfinished"/> <translation>Bitte wählen Sie ein Erscheinungsbild für den KDE Plasma Desktop. Sie können diesen Schritt auch überspringen und das Erscheinungsbild festlegen, sobald das System eingerichtet ist. Per Klick auf einen Eintrag können Sie sich eine Vorschau dieses Erscheinungsbildes anzeigen lassen.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/>
@ -2226,7 +2227,7 @@ Ausgabe:
<message> <message>
<location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="62"/> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="62"/>
<source>Requirements checking for module &lt;i&gt;%1&lt;/i&gt; is complete.</source> <source>Requirements checking for module &lt;i&gt;%1&lt;/i&gt; is complete.</source>
<translation type="unfinished"/> <translation>Die Anforderungsprüfung für das Modul &lt;i&gt;%1&lt;/i&gt; ist abgeschlossen.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/utils/CalamaresUtilsGui.cpp" line="270"/> <location filename="../src/libcalamaresui/utils/CalamaresUtilsGui.cpp" line="270"/>
@ -2455,7 +2456,7 @@ Ausgabe:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/>
<source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source> <source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source>
<translation type="unfinished"/> <translation>Dieser Computer erfüllt nicht die Mindestvoraussetzungen für die Installation von %1.&lt;br/&gt;Die Installation kann nicht fortgesetzt werden. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/>
@ -2465,7 +2466,7 @@ Ausgabe:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/>
<source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source> <source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source>
<translation type="unfinished"/> <translation>Dieser Computer erfüllt nicht alle Voraussetzungen für die Installation von %1.&lt;br/&gt;Die Installation kann fortgesetzt werden, aber es werden eventuell nicht alle Funktionen verfügbar sein.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/>
@ -2747,7 +2748,7 @@ Ausgabe:
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="52"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="52"/>
<source>This is an overview of what will happen once you start the setup procedure.</source> <source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/> <translation>Dies ist eine Übersicht der Aktionen, die nach dem Starten des Installationsprozesses durchgeführt werden.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="55"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
@ -2871,12 +2872,12 @@ Ausgabe:
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="115"/> <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;Falls dieser Computer von mehr als einer Person benutzt werden soll, können weitere Benutzerkonten nach der Installation eingerichtet werden.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="121"/> <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;Falls dieser Computer von mehr als einer Person benutzt werden soll, können weitere Benutzerkonten nach der Installation eingerichtet werden.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="312"/> <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
@ -3016,17 +3017,17 @@ Ausgabe:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
<source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Willkommen beim Calamares Installationsprogramm für %1.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/>
<source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Willkommen zur Installation von %1.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/>
<source>About %1 setup</source> <source>About %1 setup</source>
<translation type="unfinished"/> <translation>Über das Installationsprogramm %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/>
@ -3036,7 +3037,7 @@ Ausgabe:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="93"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="93"/>
<source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2019 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href=&quot;https://calamares.io/team/&quot;&gt;the Calamares team&lt;/a&gt; and the &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;https://calamares.io/&quot;&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source> <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2019 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href=&quot;https://calamares.io/team/&quot;&gt;the Calamares team&lt;/a&gt; and the &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;https://calamares.io/&quot;&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;für %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2019 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Dank an &lt;a href=&quot;https://calamares.io/team/&quot;&gt;das Calamares-Team&lt;/a&gt; und das &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares Übersetzerteam&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;Die &lt;a href=&quot;https://calamares.io/&quot;&gt;Calamares&lt;/a&gt;-Entwicklung wird unterstützt von&lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="239"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="239"/>

57
lang/calamares_fr.ts
View File

@ -226,7 +226,7 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/>
<source>Cancel setup without changing the system.</source> <source>Cancel setup without changing the system.</source>
<translation type="unfinished"/> <translation>Annuler l&apos;installation sans toucher au système.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/>
@ -237,7 +237,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/>
<source>Setup Failed</source> <source>Setup Failed</source>
<translation type="unfinished"/> <translation>Échec de l&apos;installation</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/>
@ -257,22 +257,22 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/>
<source>Continue with installation?</source> <source>Continue with installation?</source>
<translation type="unfinished"/> <translation>Continuer avec l&apos;installation ?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/>
<source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source> <source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
<translation type="unfinished"/> <translation>L&apos;installateur %1 est sur le point de procéder aux changements sur le disque afin d&apos;installer %2.&lt;br/&gt; &lt;strong&gt;Vous ne pourrez pas annulez ces changements.&lt;/strong&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/>
<source>&amp;Set up now</source> <source>&amp;Set up now</source>
<translation type="unfinished"/> <translation>&amp;Installer maintenant</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/>
<source>&amp;Set up</source> <source>&amp;Set up</source>
<translation type="unfinished"/> <translation>&amp;Installer</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/>
@ -282,12 +282,12 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/>
<source>Setup is complete. Close the setup program.</source> <source>Setup is complete. Close the setup program.</source>
<translation type="unfinished"/> <translation>L&apos;installation est terminée. Fermer l&apos;installateur.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/>
<source>Cancel setup?</source> <source>Cancel setup?</source>
<translation type="unfinished"/> <translation>Annuler l&apos;installation ?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/>
@ -298,7 +298,8 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/>
<source>Do you really want to cancel the current setup process? <source>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</source> The setup program will quit and all changes will be lost.</source>
<translation type="unfinished"/> <translation>Voulez-vous réellement abandonner le processus d&apos;installation ?
L&apos;installateur se fermera et les changements seront perdus.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/>
@ -391,7 +392,7 @@ L&apos;installateur se fermera et les changements seront perdus.</translation>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="58"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="58"/>
<source>%1 Setup Program</source> <source>%1 Setup Program</source>
<translation type="unfinished"/> <translation>Programme d&apos;installation de %1</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="59"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="59"/>
@ -1091,7 +1092,7 @@ L&apos;installateur se fermera et les changements seront perdus.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="95"/> <location filename="../src/modules/finished/FinishedPage.ui" line="95"/>
<source>&lt;Restart checkbox tooltip&gt;</source> <source>&lt;Restart checkbox tooltip&gt;</source>
<translation type="unfinished"/> <translation>&lt;Restart checkbox tooltip&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="98"/> <location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
@ -1101,12 +1102,12 @@ L&apos;installateur se fermera et les changements seront perdus.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="54"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="54"/>
<source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source> <source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Installation terminée.&lt;/h1&gt;&lt;br/&gt;%1 a été installé sur votre ordinateur.&lt;br/&gt;Vous pouvez maintenant utiliser votre nouveau système.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="59"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="59"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;En sélectionnant cette option, votre système redémarrera immédiatement quand vous cliquerez sur &lt;span style=&quot; font-style:italic;&quot;&gt;Terminé&lt;/span&gt; ou fermerez l&apos;installateur.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="67"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="67"/>
@ -1116,12 +1117,12 @@ L&apos;installateur se fermera et les changements seront perdus.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="73"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="73"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;En sélectionnant cette option, votre système redémarrera immédiatement quand vous cliquerez sur &lt;span style=&quot; font-style:italic;&quot;&gt;Terminé&lt;/span&gt; ou fermerez l&apos;installateur.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="132"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="132"/>
<source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source> <source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Installation échouée&lt;/h1&gt;&lt;br/&gt;%1 n&apos;a pas été installée sur cet ordinateur.&lt;br/&gt;Le message d&apos;erreur était : %2.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="138"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="138"/>
@ -1139,7 +1140,7 @@ L&apos;installateur se fermera et les changements seront perdus.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/>
<source>Setup Complete</source> <source>Setup Complete</source>
<translation type="unfinished"/> <translation>Installation terminée</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/>
@ -1149,7 +1150,7 @@ L&apos;installateur se fermera et les changements seront perdus.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/>
<source>The setup of %1 is complete.</source> <source>The setup of %1 is complete.</source>
<translation type="unfinished"/> <translation>L&apos;installation de %1 est terminée.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/>
@ -1225,7 +1226,7 @@ L&apos;installateur se fermera et les changements seront perdus.</translation>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/>
<source>The setup program is not running with administrator rights.</source> <source>The setup program is not running with administrator rights.</source>
<translation type="unfinished"/> <translation>L&apos;installateur ne dispose pas des droits administrateur.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/>
@ -1235,7 +1236,7 @@ L&apos;installateur se fermera et les changements seront perdus.</translation>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/>
<source>The screen is too small to display the setup program.</source> <source>The screen is too small to display the setup program.</source>
<translation type="unfinished"/> <translation>L&apos;écran est trop petit pour afficher l&apos;installateur.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/>
@ -2077,7 +2078,7 @@ L&apos;installateur se fermera et les changements seront perdus.</translation>
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/>
<source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source> <source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source>
<translation type="unfinished"/> <translation>Merci de choisir l&apos;apparence du bureau KDE Plasma. Vous pouvez aussi passer cette étape et configurer l&apos;apparence une fois le système installé. Vous pouvez obtenir un aperçu des différentes apparences en cliquant sur celles-ci.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/>
@ -2456,7 +2457,7 @@ Sortie
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/>
<source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source> <source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source>
<translation type="unfinished"/> <translation>Cet ordinateur ne satisfait pas les minimum prérequis pour installer %1.&lt;br/&gt;L&apos;installation ne peut pas continuer. &lt;a href=&quot;#details&quot;&gt;Détails...&lt;/a&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/>
@ -2466,7 +2467,7 @@ Sortie
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/>
<source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source> <source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source>
<translation type="unfinished"/> <translation>Cet ordinateur ne satisfait pas certains des prérequis recommandés pour installer %1.&lt;br/&gt;L&apos;installation peut continuer, mais certaines fonctionnalités pourraient être désactivées.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/>
@ -2748,7 +2749,7 @@ Sortie
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="52"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="52"/>
<source>This is an overview of what will happen once you start the setup procedure.</source> <source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/> <translation>Ceci est un aperçu de ce qui va arriver lorsque vous commencerez l&apos;installation.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="55"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
@ -2872,12 +2873,12 @@ Sortie
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="115"/> <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;si plusieurs personnes utilisent cet ordinateur, vous pourrez créer plusieurs comptes après l&apos;installation.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="121"/> <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;si plusieurs personnes utilisent cet ordinateur, vous pourrez créer plusieurs comptes après l&apos;installation.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="312"/> <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
@ -3017,17 +3018,17 @@ Sortie
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
<source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Bienvenue dans l&apos;installateur Calamares pour %1.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/>
<source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Bienvenue dans l&apos;installation de %1.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/>
<source>About %1 setup</source> <source>About %1 setup</source>
<translation type="unfinished"/> <translation>À propos de l&apos;installation de %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/>

15
lang/calamares_he.ts
View File

@ -226,7 +226,7 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/>
<source>Cancel setup without changing the system.</source> <source>Cancel setup without changing the system.</source>
<translation type="unfinished"/> <translation>ביטול ההתקנה ללא שינוי המערכת.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/>
@ -237,7 +237,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/>
<source>Setup Failed</source> <source>Setup Failed</source>
<translation type="unfinished"/> <translation>ההתקנה נכשלה</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/>
@ -257,7 +257,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/>
<source>Continue with installation?</source> <source>Continue with installation?</source>
<translation type="unfinished"/> <translation>להמשיך בהתקנה?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/>
@ -282,12 +282,12 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/>
<source>Setup is complete. Close the setup program.</source> <source>Setup is complete. Close the setup program.</source>
<translation type="unfinished"/> <translation>ההתקנה הושלמה. נא לסגור את תכנית ההתקנה.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/>
<source>Cancel setup?</source> <source>Cancel setup?</source>
<translation type="unfinished"/> <translation>לבטל את ההתקנה?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/>
@ -298,7 +298,8 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/>
<source>Do you really want to cancel the current setup process? <source>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</source> The setup program will quit and all changes will be lost.</source>
<translation type="unfinished"/> <translation>לבטל את תהליך ההתקנה הנוכחי?
תכנית ההתקנה תצא וכל השינויים יאבדו.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/>
@ -391,7 +392,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="58"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="58"/>
<source>%1 Setup Program</source> <source>%1 Setup Program</source>
<translation type="unfinished"/> <translation>תכנית התקנת %1</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="59"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="59"/>

77
lang/calamares_hr.ts
View File

@ -115,12 +115,12 @@
<message> <message>
<location filename="../src/libcalamares/JobExample.cpp" line="39"/> <location filename="../src/libcalamares/JobExample.cpp" line="39"/>
<source>Job failed (%1)</source> <source>Job failed (%1)</source>
<translation type="unfinished"/> <translation>Posao nije uspio (%1)</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/JobExample.cpp" line="39"/> <location filename="../src/libcalamares/JobExample.cpp" line="39"/>
<source>Programmed job failure was explicitly requested.</source> <source>Programmed job failure was explicitly requested.</source>
<translation type="unfinished"/> <translation>Programski neuspjeh posla je izričito zatražen.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -136,7 +136,7 @@
<message> <message>
<location filename="../src/libcalamares/JobExample.cpp" line="27"/> <location filename="../src/libcalamares/JobExample.cpp" line="27"/>
<source>Example job (%1)</source> <source>Example job (%1)</source>
<translation type="unfinished"/> <translation>Primjer posla (%1)</translation>
</message> </message>
</context> </context>
<context> <context>
@ -190,17 +190,17 @@
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="147"/> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="147"/>
<source>Waiting for %n module(s).</source> <source>Waiting for %n module(s).</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> <translation><numerusform>Čekam %1 modul(a).</numerusform><numerusform>Čekam %1 modul(a).</numerusform><numerusform>Čekam %1 modul(a).</numerusform></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="148"/> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="148"/>
<source>(%n second(s))</source> <source>(%n second(s))</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> <translation><numerusform>(%n sekunda(e))</numerusform><numerusform>(%n sekunda(e))</numerusform><numerusform>(%n sekunda(e))</numerusform></translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="152"/> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="152"/>
<source>System-requirements checking is complete.</source> <source>System-requirements checking is complete.</source>
<translation type="unfinished"/> <translation>Provjera zahtjeva za instalaciju sustava je dovršena.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -226,7 +226,7 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/>
<source>Cancel setup without changing the system.</source> <source>Cancel setup without changing the system.</source>
<translation type="unfinished"/> <translation>Odustanite od instalacije bez promjena na sustavu.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/>
@ -237,7 +237,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/>
<source>Setup Failed</source> <source>Setup Failed</source>
<translation type="unfinished"/> <translation>Instalacija nije uspjela</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/>
@ -257,22 +257,22 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/>
<source>Continue with installation?</source> <source>Continue with installation?</source>
<translation type="unfinished"/> <translation>Nastaviti sa instalacijom?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/>
<source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source> <source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
<translation type="unfinished"/> <translation>Instalacijski program %1 će izvršiti promjene na vašem disku kako bi postavio %2. &lt;br/&gt;&lt;strong&gt;Ne možete poništiti te promjene.&lt;/strong&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/>
<source>&amp;Set up now</source> <source>&amp;Set up now</source>
<translation type="unfinished"/> <translation>&amp;Postaviti odmah</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/>
<source>&amp;Set up</source> <source>&amp;Set up</source>
<translation type="unfinished"/> <translation>&amp;Postaviti</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/>
@ -282,12 +282,12 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/>
<source>Setup is complete. Close the setup program.</source> <source>Setup is complete. Close the setup program.</source>
<translation type="unfinished"/> <translation>Instalacija je završena. Zatvorite instalacijski program.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/>
<source>Cancel setup?</source> <source>Cancel setup?</source>
<translation type="unfinished"/> <translation>Prekinuti instalaciju?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/>
@ -298,7 +298,8 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/>
<source>Do you really want to cancel the current setup process? <source>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</source> The setup program will quit and all changes will be lost.</source>
<translation type="unfinished"/> <translation>Stvarno želite prekinuti instalacijski proces?
Instalacijski program će izaći i sve promjene će biti izgubljene.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/>
@ -391,7 +392,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="58"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="58"/>
<source>%1 Setup Program</source> <source>%1 Setup Program</source>
<translation type="unfinished"/> <translation>%1 instalacijski program</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="59"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="59"/>
@ -1091,7 +1092,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="95"/> <location filename="../src/modules/finished/FinishedPage.ui" line="95"/>
<source>&lt;Restart checkbox tooltip&gt;</source> <source>&lt;Restart checkbox tooltip&gt;</source>
<translation type="unfinished"/> <translation>&lt;Restart checkbox tooltip&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="98"/> <location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
@ -1101,12 +1102,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="54"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="54"/>
<source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source> <source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Gotovo.&lt;/h1&gt;&lt;br/&gt;%1 je instaliran na vaše računalo.&lt;br/&gt;Sada možete koristiti vaš novi sustav.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="59"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="59"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kada je odabrana ova opcija, vaš sustav će se ponovno pokrenuti kada kliknete na &lt;span style=&quot;font-style:italic;&quot;&gt;Gotovo&lt;/span&gt; ili zatvorite instalacijski program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="67"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="67"/>
@ -1116,12 +1117,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="73"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="73"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kada je odabrana ova opcija, vaš sustav će se ponovno pokrenuti kada kliknete na &lt;span style=&quot;font-style:italic;&quot;&gt;Gotovo&lt;/span&gt; ili zatvorite instalacijski program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="132"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="132"/>
<source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source> <source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Instalacija nije uspijela&lt;/h1&gt;&lt;br/&gt;%1 nije instaliran na vaše računalo.&lt;br/&gt;Greška: %2.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="138"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="138"/>
@ -1139,7 +1140,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/>
<source>Setup Complete</source> <source>Setup Complete</source>
<translation type="unfinished"/> <translation>Instalacija je završena</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/>
@ -1149,7 +1150,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/>
<source>The setup of %1 is complete.</source> <source>The setup of %1 is complete.</source>
<translation type="unfinished"/> <translation>Instalacija %1 je završena.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/>
@ -1225,7 +1226,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/>
<source>The setup program is not running with administrator rights.</source> <source>The setup program is not running with administrator rights.</source>
<translation type="unfinished"/> <translation>Instalacijski program nije pokrenut sa administratorskim dozvolama.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/>
@ -1235,7 +1236,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/>
<source>The screen is too small to display the setup program.</source> <source>The screen is too small to display the setup program.</source>
<translation type="unfinished"/> <translation>Zaslon je premalen za prikaz instalacijskog programa.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/>
@ -2045,12 +2046,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="640"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="640"/>
<source>has at least one disk device available.</source> <source>has at least one disk device available.</source>
<translation type="unfinished"/> <translation>ima barem jedan disk dostupan.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="641"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="641"/>
<source>There are no partitons to install on.</source> <source>There are no partitons to install on.</source>
<translation type="unfinished"/> <translation>Nema particija na koje bi se izvršila instalacija.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2077,7 +2078,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/>
<source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source> <source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source>
<translation type="unfinished"/> <translation>Odaberite izgled KDE Plasme. Možete također preskočiti ovaj korak i konfigurirati izgled jednom kada sustav bude instaliran. Odabirom izgleda dobit ćete pregled uživo tog izgleda.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/>
@ -2226,7 +2227,7 @@ Izlaz:
<message> <message>
<location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="62"/> <location filename="../src/libcalamaresui/modulesystem/RequirementsChecker.cpp" line="62"/>
<source>Requirements checking for module &lt;i&gt;%1&lt;/i&gt; is complete.</source> <source>Requirements checking for module &lt;i&gt;%1&lt;/i&gt; is complete.</source>
<translation type="unfinished"/> <translation>Provjera zahtjeva za modul &lt;i&gt;%1&lt;/i&gt; je dovršena.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/utils/CalamaresUtilsGui.cpp" line="270"/> <location filename="../src/libcalamaresui/utils/CalamaresUtilsGui.cpp" line="270"/>
@ -2455,7 +2456,7 @@ Izlaz:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/>
<source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source> <source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source>
<translation type="unfinished"/> <translation>Ovo računalo ne zadovoljava minimalne zahtjeve za instalaciju %1.&lt;br/&gt;Instalacija se ne može nastaviti.&lt;a href=&quot;#details&quot;&gt;Detalji...&lt;/a&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/>
@ -2465,7 +2466,7 @@ Izlaz:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/>
<source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source> <source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source>
<translation type="unfinished"/> <translation>Računalo ne zadovoljava neke od preporučenih uvjeta za instalaciju %1.&lt;br/&gt;Instalacija se može nastaviti, ali neke značajke možda neće biti dostupne.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/>
@ -2747,7 +2748,7 @@ Izlaz:
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="52"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="52"/>
<source>This is an overview of what will happen once you start the setup procedure.</source> <source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/> <translation>Ovo je prikaz događaja koji će uslijediti jednom kad počne instalacijska procedura.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="55"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
@ -2871,12 +2872,12 @@ Izlaz:
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="115"/> <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;Ako će više osoba koristiti ovo računalo, možete postaviti više korisničkih računa poslije instalacije.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="121"/> <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;Ako će više osoba koristiti ovo računalo, možete postaviti više korisničkih računa poslije instalacije.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="312"/> <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
@ -3016,17 +3017,17 @@ Izlaz:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
<source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Dobrodošli u Calamares instalacijski program za %1.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/>
<source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Dobrodošli u %1 instalacijski program.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/>
<source>About %1 setup</source> <source>About %1 setup</source>
<translation type="unfinished"/> <translation>O %1 instalacijskom programu</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/>
@ -3036,7 +3037,7 @@ Izlaz:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="93"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="93"/>
<source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2019 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href=&quot;https://calamares.io/team/&quot;&gt;the Calamares team&lt;/a&gt; and the &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;https://calamares.io/&quot;&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source> <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2019 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href=&quot;https://calamares.io/team/&quot;&gt;the Calamares team&lt;/a&gt; and the &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;https://calamares.io/&quot;&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;za %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Autorska prava 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Autorska prava 2017-2019 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt; Hvala &lt;a href=&quot;https://calamares.io/team/&quot;&gt;Calamares timu&lt;/a&gt; i &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares timu za prevođenje&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;https://calamares.io/&quot;&gt;Calamares&lt;/a&gt; sponzorira &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="239"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="239"/>

57
lang/calamares_ko.ts
View File

@ -226,7 +226,7 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/>
<source>Cancel setup without changing the system.</source> <source>Cancel setup without changing the system.</source>
<translation type="unfinished"/> <translation>시스템을 변경 하지 않고 설치를 취소합니다.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/>
@ -237,7 +237,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/>
<source>Setup Failed</source> <source>Setup Failed</source>
<translation type="unfinished"/> <translation>설치 실패</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/>
@ -257,22 +257,22 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/>
<source>Continue with installation?</source> <source>Continue with installation?</source>
<translation type="unfinished"/> <translation>설치를 계속하시겠습니까?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/>
<source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source> <source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
<translation type="unfinished"/> <translation>%1 설치 프로그램이 %2을(를) 설정하기 위해 디스크를 변경하려고 하는 중입니다.&lt;br/&gt;&lt;strong&gt;이러한 변경은 취소할 수 없습니다.&lt;/strong&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/>
<source>&amp;Set up now</source> <source>&amp;Set up now</source>
<translation type="unfinished"/> <translation>지금 설치 (&amp;S)</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/>
<source>&amp;Set up</source> <source>&amp;Set up</source>
<translation type="unfinished"/> <translation>설치 (&amp;S)</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/>
@ -282,12 +282,12 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/>
<source>Setup is complete. Close the setup program.</source> <source>Setup is complete. Close the setup program.</source>
<translation type="unfinished"/> <translation>설치가 완료 되었습니다. 설치 프로그램을 닫습니다.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/>
<source>Cancel setup?</source> <source>Cancel setup?</source>
<translation type="unfinished"/> <translation>설치를 취소 하시겠습니까?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/>
@ -298,7 +298,8 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/>
<source>Do you really want to cancel the current setup process? <source>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</source> The setup program will quit and all changes will be lost.</source>
<translation type="unfinished"/> <translation>현재 설정 프로세스를 취소하시겠습니까?
설치 프로그램이 종료되고 모든 변경 내용이 손실됩니다.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/>
@ -391,7 +392,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="58"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="58"/>
<source>%1 Setup Program</source> <source>%1 Setup Program</source>
<translation type="unfinished"/> <translation>%1 설치 프로그램</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="59"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="59"/>
@ -1091,7 +1092,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="95"/> <location filename="../src/modules/finished/FinishedPage.ui" line="95"/>
<source>&lt;Restart checkbox tooltip&gt;</source> <source>&lt;Restart checkbox tooltip&gt;</source>
<translation type="unfinished"/> <translation>&lt;Restart checkbox tooltip&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="98"/> <location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
@ -1101,12 +1102,12 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="54"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="54"/>
<source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source> <source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;모두 완료.&lt;/h1&gt;&lt;br/&gt;%1이 컴퓨터에 설정되었습니다.&lt;br/&gt;이제 새 시스템을 사용할 수 있습니다.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="59"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="59"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;이 확인란을 선택하면 &lt;span style=&quot;font-style:italic;&quot;&gt;완료&lt;/span&gt;를 클릭하거나 설치 프로그램을 닫으면 시스템이 즉시 다시 시작됩니다.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="67"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="67"/>
@ -1116,12 +1117,12 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="73"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="73"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;이 확인란을 선택하면 &lt;span style=&quot;font-style:italic;&quot;&gt;완료&lt;/span&gt;를 클릭하거나 설치 관리자를 닫으면 시스템이 즉시 다시 시작됩니다.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="132"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="132"/>
<source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source> <source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;설치 실패&lt;/h1&gt;&lt;br/&gt;%1이 컴퓨터에 설정되지 않았습니다.&lt;br/&gt;오류 메시지 : %2.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="138"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="138"/>
@ -1139,7 +1140,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/>
<source>Setup Complete</source> <source>Setup Complete</source>
<translation type="unfinished"/> <translation>설치 완료</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/>
@ -1149,7 +1150,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/>
<source>The setup of %1 is complete.</source> <source>The setup of %1 is complete.</source>
<translation type="unfinished"/> <translation>%1 설치가 완료되었습니다.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/>
@ -1225,7 +1226,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/>
<source>The setup program is not running with administrator rights.</source> <source>The setup program is not running with administrator rights.</source>
<translation type="unfinished"/> <translation>설치 프로그램이 관리자 권한으로 실행되고 있지 않습니다.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/>
@ -1235,7 +1236,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/>
<source>The screen is too small to display the setup program.</source> <source>The screen is too small to display the setup program.</source>
<translation type="unfinished"/> <translation>화면이 너무 작아서 설정 프로그램을 표시할 수 없습니다.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/>
@ -2077,7 +2078,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/>
<source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source> <source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source>
<translation type="unfinished"/> <translation>KDE Plasma Desktop의 모양과 느낌을 선택하세요. 시스템을 설정한 후 이 단계를 건너뛰고 모양과 느낌을 구성할 수도 있습니다. 모양과 느낌 선택을 클릭하면 해당 모양을 미리 볼 수 있습니다.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/>
@ -2455,7 +2456,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/>
<source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source> <source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source>
<translation type="unfinished"/> <translation>이 컴퓨터는 %1 설치를 위한 최소 요구 사항을 충족하지 않습니다.&lt;br/&gt;설치를 계속할 수 없습니다.&lt;a href=&quot;#details&quot;&gt;세부 정보...&lt;/a&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/>
@ -2465,7 +2466,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/>
<source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source> <source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source>
<translation type="unfinished"/> <translation>이 컴퓨터는 %1 설치를 위한 권장 요구 사항 중 일부를 충족하지 않습니다.&lt;br/&gt;설치를 계속할 수는 있지만 일부 기능을 사용하지 않도록 설정할 수도 있습니다.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/>
@ -2747,7 +2748,7 @@ Output:
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="52"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="52"/>
<source>This is an overview of what will happen once you start the setup procedure.</source> <source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/> <translation>설치 절차를 시작하면 어떻게 되는지 간략히 설명합니다.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="55"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
@ -2871,12 +2872,12 @@ Output:
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="115"/> <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;둘 이상의 사용자가 이 컴퓨터를 사용할 경우, 설정 후 계정을 여러 개 만들 수 있습니다.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="121"/> <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;둘 이상의 사용자가 이 컴퓨터를 사용할 경우 설치 후 계정을 여러 개 만들 수 있습니다.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="312"/> <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
@ -3016,17 +3017,17 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
<source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;%1에 대한 Calamares 설정 프로그램에 오신 것을 환영합니다.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/>
<source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;%1 설치에 오신 것을 환영합니다.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/>
<source>About %1 setup</source> <source>About %1 setup</source>
<translation type="unfinished"/> <translation>%1 설치 정보</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/>

57
lang/calamares_lt.ts
View File

@ -226,7 +226,7 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/>
<source>Cancel setup without changing the system.</source> <source>Cancel setup without changing the system.</source>
<translation type="unfinished"/> <translation>Atsisakyti sąrankos, nieko sistemoje nekeičiant.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/>
@ -237,7 +237,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/>
<source>Setup Failed</source> <source>Setup Failed</source>
<translation type="unfinished"/> <translation>Sąranka patyrė nesėkmę</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/>
@ -257,22 +257,22 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/>
<source>Continue with installation?</source> <source>Continue with installation?</source>
<translation type="unfinished"/> <translation>Tęsti diegimą?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/>
<source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source> <source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
<translation type="unfinished"/> <translation>%1 sąrankos programa, siekdama nustatyti %2, ketina atlikti pakeitimus diske.&lt;br/&gt;&lt;strong&gt;Šių pakeitimų nebegalėsite atšaukti.&lt;/strong&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/>
<source>&amp;Set up now</source> <source>&amp;Set up now</source>
<translation type="unfinished"/> <translation>Nu&amp;statyti dabar</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/>
<source>&amp;Set up</source> <source>&amp;Set up</source>
<translation type="unfinished"/> <translation>Nu&amp;statyti</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/>
@ -282,12 +282,12 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/>
<source>Setup is complete. Close the setup program.</source> <source>Setup is complete. Close the setup program.</source>
<translation type="unfinished"/> <translation>Sąranka užbaigta. Užverkite sąrankos programą.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/>
<source>Cancel setup?</source> <source>Cancel setup?</source>
<translation type="unfinished"/> <translation>Atsisakyti sąrankos?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/>
@ -298,7 +298,8 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/>
<source>Do you really want to cancel the current setup process? <source>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</source> The setup program will quit and all changes will be lost.</source>
<translation type="unfinished"/> <translation>Ar tikrai norite atsisakyti dabartinio sąrankos proceso?
Sąrankos programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/>
@ -391,7 +392,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="58"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="58"/>
<source>%1 Setup Program</source> <source>%1 Setup Program</source>
<translation type="unfinished"/> <translation>%1 sąrankos programa</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="59"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="59"/>
@ -1091,7 +1092,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="95"/> <location filename="../src/modules/finished/FinishedPage.ui" line="95"/>
<source>&lt;Restart checkbox tooltip&gt;</source> <source>&lt;Restart checkbox tooltip&gt;</source>
<translation type="unfinished"/> <translation>&lt;Restart checkbox tooltip&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="98"/> <location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
@ -1101,12 +1102,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="54"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="54"/>
<source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source> <source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Viskas atlikta.&lt;/h1&gt;&lt;br/&gt;%1 sistema jūsų kompiuteryje jau nustatyta.&lt;br/&gt;Dabar galite pradėti naudotis savo naująja sistema.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="59"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="59"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pažymėjus šį langelį, jūsų sistema nedelsiant pasileis iš naujo, kai spustelėsite &lt;span style=&quot;font-style:italic;&quot;&gt;Atlikta&lt;/span&gt; ar užversite sąrankos programą.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="67"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="67"/>
@ -1116,12 +1117,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="73"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="73"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pažymėjus šį langelį, jūsų sistema nedelsiant pasileis iš naujo, kai spustelėsite &lt;span style=&quot;font-style:italic;&quot;&gt;Atlikta&lt;/span&gt; ar užversite diegimo programą.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="132"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="132"/>
<source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source> <source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Sąranka nepavyko&lt;/h1&gt;&lt;br/&gt;%1 nebuvo nustatyta jūsų kompiuteryje.&lt;br/&gt;Klaidos pranešimas buvo: %2.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="138"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="138"/>
@ -1139,7 +1140,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/>
<source>Setup Complete</source> <source>Setup Complete</source>
<translation type="unfinished"/> <translation>Sąranka užbaigta</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/>
@ -1149,7 +1150,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/>
<source>The setup of %1 is complete.</source> <source>The setup of %1 is complete.</source>
<translation type="unfinished"/> <translation>%1 sąranka yra užbaigta.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/>
@ -1225,7 +1226,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/>
<source>The setup program is not running with administrator rights.</source> <source>The setup program is not running with administrator rights.</source>
<translation type="unfinished"/> <translation>Sąrankos programa yra vykdoma be administratoriaus teisių.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/>
@ -1235,7 +1236,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/>
<source>The screen is too small to display the setup program.</source> <source>The screen is too small to display the setup program.</source>
<translation type="unfinished"/> <translation>Ekranas yra per mažas, kad būtų parodyta sąrankos programa.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/>
@ -2077,7 +2078,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/>
<source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source> <source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source>
<translation type="unfinished"/> <translation>Pasirinkite KDE Plasma darbalaukio išvaizdą ir turinį. Taip pat galite praleisti šį žingsnį ir konfigūruoti išvaizdą ir turinį, kai sistema bus nustatyta. Spustelėjus ant tam tikro išvaizdos ir turinio pasirinkimo, jums bus parodyta tiesioginė peržiūrą.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/>
@ -2455,7 +2456,7 @@ Išvestis:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/>
<source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source> <source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source>
<translation type="unfinished"/> <translation>Šis kompiuteris netenkina minimalių %1 nustatymo reikalavimų.&lt;br/&gt;Sąranka negali būti tęsiama. &lt;a href=&quot;#details&quot;&gt;Išsamiau...&lt;/a&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/>
@ -2465,7 +2466,7 @@ Išvestis:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/>
<source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source> <source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source>
<translation type="unfinished"/> <translation>Šis kompiuteris netenkina kai kurių %1 nustatymui rekomenduojamų reikalavimų.&lt;br/&gt;Sąranką galima tęsti, tačiau kai kurios funkcijos gali būti išjungtos.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/>
@ -2747,7 +2748,7 @@ Išvestis:
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="52"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="52"/>
<source>This is an overview of what will happen once you start the setup procedure.</source> <source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/> <translation>Tai yra apžvalga to, kas įvyks, prasidėjus sąrankos procedūrai.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="55"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
@ -2871,12 +2872,12 @@ Išvestis:
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="115"/> <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;Jei šiuo kompiuteriu naudosis keli žmonės, po sąrankos galite sukurti papildomas paskyras.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="121"/> <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;Jei šiuo kompiuteriu naudosis keli žmonės, po diegimo galite sukurti papildomas paskyras.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="312"/> <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
@ -3016,17 +3017,17 @@ Išvestis:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
<source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Jus sveikina Calamares sąrankos programa, skirta %1 sistemai.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/>
<source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Jus sveikina %1 sąranka.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/>
<source>About %1 setup</source> <source>About %1 setup</source>
<translation type="unfinished"/> <translation>Apie %1 sąranką</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/>

2
lang/calamares_pt_PT.ts
View File

@ -257,7 +257,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/>
<source>Continue with installation?</source> <source>Continue with installation?</source>
<translation type="unfinished"/> <translation>Continuar com a instalação?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/>

15
lang/calamares_sk.ts
View File

@ -226,7 +226,7 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/>
<source>Cancel setup without changing the system.</source> <source>Cancel setup without changing the system.</source>
<translation type="unfinished"/> <translation>Zrušenie inštalácie bez zmien v systéme.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/>
@ -237,7 +237,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/>
<source>Setup Failed</source> <source>Setup Failed</source>
<translation type="unfinished"/> <translation>Inštalácia zlyhala</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/>
@ -257,7 +257,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/>
<source>Continue with installation?</source> <source>Continue with installation?</source>
<translation type="unfinished"/> <translation>Pokračovať v inštalácii?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/>
@ -287,7 +287,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/>
<source>Cancel setup?</source> <source>Cancel setup?</source>
<translation type="unfinished"/> <translation>Zrušiť inštaláciu?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/>
@ -298,7 +298,8 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/>
<source>Do you really want to cancel the current setup process? <source>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</source> The setup program will quit and all changes will be lost.</source>
<translation type="unfinished"/> <translation>Naozaj chcete zrušiť aktuálny priebeh inštalácie?
Inštalačný program bude ukončený a zmeny budú stratené.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/>
@ -1139,7 +1140,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/>
<source>Setup Complete</source> <source>Setup Complete</source>
<translation type="unfinished"/> <translation>Inštalácia dokončená</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/>
@ -1149,7 +1150,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/>
<source>The setup of %1 is complete.</source> <source>The setup of %1 is complete.</source>
<translation type="unfinished"/> <translation>Inštalácia distribúcie %1 je dokončená.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/>

55
lang/calamares_sq.ts
View File

@ -226,7 +226,7 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/>
<source>Cancel setup without changing the system.</source> <source>Cancel setup without changing the system.</source>
<translation type="unfinished"/> <translation>Anuloje rregullimin pa ndryshuar sistemin.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/>
@ -237,7 +237,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/>
<source>Setup Failed</source> <source>Setup Failed</source>
<translation type="unfinished"/> <translation>Rregullimi Dështoi</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/>
@ -257,22 +257,22 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/>
<source>Continue with installation?</source> <source>Continue with installation?</source>
<translation type="unfinished"/> <translation>Të vazhdohet me instalimin?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/>
<source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source> <source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
<translation type="unfinished"/> <translation>Programi i rregullimit %1 është një hap larg nga bërja e ndryshimeve në diskun tuaj, që të mund të rregullojë %2.&lt;br/&gt;&lt;strong&gt;S’do të jeni në gjendje t’i zhbëni këto ndryshime.&lt;/strong&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/>
<source>&amp;Set up now</source> <source>&amp;Set up now</source>
<translation type="unfinished"/> <translation>&amp;Rregulloje tani</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/>
<source>&amp;Set up</source> <source>&amp;Set up</source>
<translation type="unfinished"/> <translation>&amp;Rregulloje</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/>
@ -282,12 +282,12 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/>
<source>Setup is complete. Close the setup program.</source> <source>Setup is complete. Close the setup program.</source>
<translation type="unfinished"/> <translation>Rregullimi është i plotë. Mbylleni programin e rregullimit.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/>
<source>Cancel setup?</source> <source>Cancel setup?</source>
<translation type="unfinished"/> <translation>Të anulohet rregullimi?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/>
@ -298,7 +298,8 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/>
<source>Do you really want to cancel the current setup process? <source>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</source> The setup program will quit and all changes will be lost.</source>
<translation type="unfinished"/> <translation>Doni vërtet të anulohet procesi i tanishëm i rregullimit?
Programi i rregullimit do të mbyllet dhe krejt ndryshimet do të humbin.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/>
@ -391,7 +392,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="58"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="58"/>
<source>%1 Setup Program</source> <source>%1 Setup Program</source>
<translation type="unfinished"/> <translation>Programi i Rregullimit të %1</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="59"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="59"/>
@ -1101,12 +1102,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="54"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="54"/>
<source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source> <source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Kaq qe.&lt;/h1&gt;&lt;br/&gt;%1 u rregullua në kompjuterin tuaj.&lt;br/&gt;Tani mundeni të filloni të përdorni sistemin tuaj të ri.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="59"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="59"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kur i vihet shenjë kësaj kutie, sistemi juaj do të riniset menjëherë, kur klikoni mbi &lt;span style=&quot; font-style:italic;&quot;&gt;U bë&lt;/span&gt; ose mbyllni programin e rregullimit.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="67"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="67"/>
@ -1116,12 +1117,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="73"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="73"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kur i vihet shenjë kësaj kutie, sistemi juaj do të riniset menjëherë, kur klikoni mbi &lt;span style=&quot; font-style:italic;&quot;&gt;U bë&lt;/span&gt; ose mbyllni instaluesin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="132"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="132"/>
<source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source> <source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Rregullimi Dështoi&lt;/h1&gt;&lt;br/&gt;%1 s’u rregullua në kompjuterin tuaj.&lt;br/&gt;Mesazhi i gabimit qe: %2.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="138"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="138"/>
@ -1139,7 +1140,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/>
<source>Setup Complete</source> <source>Setup Complete</source>
<translation type="unfinished"/> <translation>Rregullim i Plotësuar</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/>
@ -1149,7 +1150,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/>
<source>The setup of %1 is complete.</source> <source>The setup of %1 is complete.</source>
<translation type="unfinished"/> <translation>Rregullimi i %1 u plotësua.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/>
@ -1225,7 +1226,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/>
<source>The setup program is not running with administrator rights.</source> <source>The setup program is not running with administrator rights.</source>
<translation type="unfinished"/> <translation>Programi i rregullimit nuk po xhirohen me të drejta përgjegjësi.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/>
@ -1235,7 +1236,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/>
<source>The screen is too small to display the setup program.</source> <source>The screen is too small to display the setup program.</source>
<translation type="unfinished"/> <translation>Ekrani është shumë i vogël për të shfaqur programin e rregullimit.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/>
@ -2077,7 +2078,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/>
<source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source> <source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source>
<translation type="unfinished"/> <translation>Ju lutemi, zgjidhni një grup parametrash pamje-dhe-ndjesi për KDE Plasma Desktop. Mundeni edhe ta anashkaloni këtë hap dhe të formësoni pamje-dhe-ndjesi pasi të jetë rregulluar sistemi. Klikimi mbi një përzgjedhje pamje-dhe-ndjesi do t’ju japë një paraparje të atypëratyshme të saj.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/>
@ -2455,7 +2456,7 @@ Përfundim:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/>
<source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source> <source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source>
<translation type="unfinished"/> <translation>Ky kompjuter s’i plotëson kërkesat minimum për rregullimin e %1.&lt;br/&gt;Rregullimi s’mund të vazhdojë. &lt;a href=\&quot;#details\&quot;&gt;Hollësi…&lt;/a&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/>
@ -2465,7 +2466,7 @@ Përfundim:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/>
<source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source> <source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source>
<translation type="unfinished"/> <translation>Ky kompjuter s’i plotëson disa nga domosdoshmëritë e rekomanduara për rregullimin e %1.&lt;br/&gt;Rregullimi mund të vazhdojë, por disa veçori mund të përfundojnë të çaktivizuara.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/>
@ -2747,7 +2748,7 @@ Përfundim:
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="52"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="52"/>
<source>This is an overview of what will happen once you start the setup procedure.</source> <source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/> <translation>Kjo është një përmbledhje e asaj që do të ndodhë sapo të nisni procedurën e rregullimit.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="55"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
@ -2871,12 +2872,12 @@ Përfundim:
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="115"/> <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni disa llogari, pas rregullimit.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="121"/> <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni disa llogari, pas instalimit.&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="312"/> <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
@ -3016,17 +3017,17 @@ Përfundim:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
<source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Mirë se vini te programi i rregullimit Calamares për %1.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/>
<source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;Mirë se vini te rregullimi i %1.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/>
<source>About %1 setup</source> <source>About %1 setup</source>
<translation type="unfinished"/> <translation>Mbi rregullimin e %1</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/>

57
lang/calamares_zh_TW.ts
View File

@ -226,7 +226,7 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="78"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="305"/>
<source>Cancel setup without changing the system.</source> <source>Cancel setup without changing the system.</source>
<translation type="unfinished"/> <translation>取消安裝，不更改系統。</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="79"/>
@ -237,7 +237,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="166"/>
<source>Setup Failed</source> <source>Setup Failed</source>
<translation type="unfinished"/> <translation>設定失敗</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="191"/>
@ -257,22 +257,22 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="249"/>
<source>Continue with installation?</source> <source>Continue with installation?</source>
<translation type="unfinished"/> <translation>繼續安裝？</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="251"/>
<source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source> <source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
<translation type="unfinished"/> <translation>%1 設定程式將在您的磁碟上做出變更以設定 %2。&lt;br/&gt;&lt;strong&gt;您將無法復原這些變更。&lt;/strong&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="258"/>
<source>&amp;Set up now</source> <source>&amp;Set up now</source>
<translation type="unfinished"/> <translation>現在進行設定 (&amp;S)</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="299"/>
<source>&amp;Set up</source> <source>&amp;Set up</source>
<translation type="unfinished"/> <translation>設定 (&amp;S)</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/>
@ -282,12 +282,12 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="302"/>
<source>Setup is complete. Close the setup program.</source> <source>Setup is complete. Close the setup program.</source>
<translation type="unfinished"/> <translation>設定完成。關閉設定程式。</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="361"/>
<source>Cancel setup?</source> <source>Cancel setup?</source>
<translation type="unfinished"/> <translation>取消設定？</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="362"/>
@ -298,7 +298,8 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="364"/>
<source>Do you really want to cancel the current setup process? <source>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</source> The setup program will quit and all changes will be lost.</source>
<translation type="unfinished"/> <translation>您真的想要取消目前的設定程序嗎？
設定程式將會結束，所有變更都將會遺失。</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="366"/>
@ -391,7 +392,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="58"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="58"/>
<source>%1 Setup Program</source> <source>%1 Setup Program</source>
<translation type="unfinished"/> <translation>%1 設定程式</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="59"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="59"/>
@ -1091,7 +1092,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="95"/> <location filename="../src/modules/finished/FinishedPage.ui" line="95"/>
<source>&lt;Restart checkbox tooltip&gt;</source> <source>&lt;Restart checkbox tooltip&gt;</source>
<translation type="unfinished"/> <translation>&lt;Restart checkbox tooltip&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.ui" line="98"/> <location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
@ -1101,12 +1102,12 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="54"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="54"/>
<source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source> <source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;都完成了。&lt;/h1&gt;&lt;br/&gt;%1 已經在您的電腦上設定好了。&lt;br/&gt;您現在可能會想要開始使用您的新系統。</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="59"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="59"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;當這個勾選框被選取時，您的系統將會在按下&lt;span style=&quot;font-style:italic;&quot;&gt;完成&lt;/span&gt;或關閉設定程式時立刻重新啟動。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="67"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="67"/>
@ -1116,12 +1117,12 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="73"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="73"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style=&quot;font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;當這個勾選框被選取時，您的系統將會在按下&lt;span style=&quot;font-style:italic;&quot;&gt;完成&lt;/span&gt;或關閉安裝程式時立刻重新啟動。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="132"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="132"/>
<source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source> <source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;設定失敗&lt;/h1&gt;&lt;br/&gt;%1 並未在您的電腦設定好。&lt;br/&gt;錯誤訊息為：%2。</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="138"/> <location filename="../src/modules/finished/FinishedPage.cpp" line="138"/>
@ -1139,7 +1140,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="115"/>
<source>Setup Complete</source> <source>Setup Complete</source>
<translation type="unfinished"/> <translation>設定完成</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="116"/>
@ -1149,7 +1150,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="118"/>
<source>The setup of %1 is complete.</source> <source>The setup of %1 is complete.</source>
<translation type="unfinished"/> <translation>%1 的設定完成。</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/> <location filename="../src/modules/finished/FinishedViewStep.cpp" line="119"/>
@ -1225,7 +1226,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="142"/>
<source>The setup program is not running with administrator rights.</source> <source>The setup program is not running with administrator rights.</source>
<translation type="unfinished"/> <translation>設定程式並未以管理員權限執行。</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="143"/>
@ -1235,7 +1236,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="152"/>
<source>The screen is too small to display the setup program.</source> <source>The screen is too small to display the setup program.</source>
<translation type="unfinished"/> <translation>螢幕太小了，沒辦法顯示設定程式。</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="153"/>
@ -2077,7 +2078,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/>
<source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source> <source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source>
<translation type="unfinished"/> <translation>請為 KDE Plasma 桌面選擇外觀與感覺。您也可以跳過此步驟並在系統設定好之後再設定。在外觀與感覺小節點按將會給您特定外觀與感覺的即時預覽。</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/>
@ -2455,7 +2456,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="96"/>
<source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source> <source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source>
<translation type="unfinished"/> <translation>此電腦未滿足安裝 %1 的最低配備。&lt;br/&gt;設定無法繼續。&lt;a href=&quot;#details&quot;&gt;詳細資訊...&lt;/a&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="100"/>
@ -2465,7 +2466,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="118"/>
<source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source> <source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source>
<translation type="unfinished"/> <translation>此電腦未滿足一些安裝 %1 的推薦需求。&lt;br/&gt;設定可以繼續，但部份功能可能會被停用。</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="122"/>
@ -2747,7 +2748,7 @@ Output:
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="52"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="52"/>
<source>This is an overview of what will happen once you start the setup procedure.</source> <source>This is an overview of what will happen once you start the setup procedure.</source>
<translation type="unfinished"/> <translation>這是您開始安裝後所會發生的事的概覽。</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/summary/SummaryPage.cpp" line="55"/> <location filename="../src/modules/summary/SummaryPage.cpp" line="55"/>
@ -2871,12 +2872,12 @@ Output:
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="115"/> <location filename="../src/modules/users/UsersPage.cpp" line="115"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;如果將會有多於一人使用這臺電腦，您可以在安裝後設定多個帳號。&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="121"/> <location filename="../src/modules/users/UsersPage.cpp" line="121"/>
<source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source> <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source>
<translation type="unfinished"/> <translation>&lt;small&gt;如果將會有多於一人使用這臺電腦，您可以在安裝後設定多個帳號。&lt;/small&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="312"/> <location filename="../src/modules/users/UsersPage.cpp" line="312"/>
@ -3016,17 +3017,17 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
<source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;歡迎使用 %1 的 Calamares 安裝程式。&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="71"/>
<source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;歡迎使用 %1 安裝程式。&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="89"/>
<source>About %1 setup</source> <source>About %1 setup</source>
<translation type="unfinished"/> <translation>關於 %1 安裝程式</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="90"/>

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

Binary file not shown.

2
lang/python/cs_CZ/LC_MESSAGES/python.po
View File

@ -68,7 +68,7 @@ msgstr "Odpojit souborové systémy."
#: src/modules/unpackfs/main.py:40 #: src/modules/unpackfs/main.py:40
msgid "Filling up filesystems." msgid "Filling up filesystems."
msgstr "" msgstr "Naplňování souborových systémů."
#: src/modules/unpackfs/main.py:158 #: src/modules/unpackfs/main.py:158
msgid "rsync failed with error code {}." msgid "rsync failed with error code {}."

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

Binary file not shown.

2
lang/python/de/LC_MESSAGES/python.po
View File

@ -70,7 +70,7 @@ msgstr "Dateisysteme aushängen."
#: src/modules/unpackfs/main.py:40 #: src/modules/unpackfs/main.py:40
msgid "Filling up filesystems." msgid "Filling up filesystems."
msgstr "" msgstr "Auffüllen von Dateisystemen."
#: src/modules/unpackfs/main.py:158 #: src/modules/unpackfs/main.py:158
msgid "rsync failed with error code {}." msgid "rsync failed with error code {}."

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

Binary file not shown.

2
lang/python/he/LC_MESSAGES/python.po
View File

@ -68,7 +68,7 @@ msgstr "ניתוק עיגון מערכות קבצים."
#: src/modules/unpackfs/main.py:40 #: src/modules/unpackfs/main.py:40
msgid "Filling up filesystems." msgid "Filling up filesystems."
msgstr "" msgstr "מערכות הקבצים מתמלאות."
#: src/modules/unpackfs/main.py:158 #: src/modules/unpackfs/main.py:158
msgid "rsync failed with error code {}." msgid "rsync failed with error code {}."

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

Binary file not shown.

2
lang/python/hr/LC_MESSAGES/python.po
View File

@ -68,7 +68,7 @@ msgstr "Odmontiraj datotečne sustave."
#: src/modules/unpackfs/main.py:40 #: src/modules/unpackfs/main.py:40
msgid "Filling up filesystems." msgid "Filling up filesystems."
msgstr "" msgstr "Popunjavanje datotečnih sustava."
#: src/modules/unpackfs/main.py:158 #: src/modules/unpackfs/main.py:158
msgid "rsync failed with error code {}." msgid "rsync failed with error code {}."

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

Binary file not shown.

38
lang/python/hu/LC_MESSAGES/python.po
View File

@ -4,9 +4,9 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
# Translators: # Translators:
# miku84, 2017
# Adriaan de Groot <groot@kde.org>, 2018 # Adriaan de Groot <groot@kde.org>, 2018
# Balázs Meskó <meskobalazs@gmail.com>, 2018 # Balázs Meskó <meskobalazs@gmail.com>, 2018
# miku84, 2019
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
@ -15,7 +15,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-04-15 07:27-0400\n" "POT-Creation-Date: 2019-04-15 07:27-0400\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Balázs Meskó <meskobalazs@gmail.com>, 2018\n" "Last-Translator: miku84, 2019\n"
"Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n" "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\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"
@ -25,12 +25,12 @@ msgstr ""
#: src/modules/services-systemd/main.py:35 #: src/modules/services-systemd/main.py:35
msgid "Configure systemd services" msgid "Configure systemd services"
msgstr "" msgstr "systemd szolgáltatások beállítása"
#: src/modules/services-systemd/main.py:68 #: src/modules/services-systemd/main.py:68
#: src/modules/services-openrc/main.py:102 #: src/modules/services-openrc/main.py:102
msgid "Cannot modify service" msgid "Cannot modify service"
msgstr "" msgstr "a szolgáltatást nem lehet módosítani"
#: src/modules/services-systemd/main.py:69 #: src/modules/services-systemd/main.py:69
msgid "" msgid ""
@ -66,15 +66,15 @@ msgstr "Fájlrendszerek leválasztása."
#: src/modules/unpackfs/main.py:40 #: src/modules/unpackfs/main.py:40
msgid "Filling up filesystems." msgid "Filling up filesystems."
msgstr "" msgstr "Fájlrendszerek betöltése."
#: src/modules/unpackfs/main.py:158 #: src/modules/unpackfs/main.py:158
msgid "rsync failed with error code {}." msgid "rsync failed with error code {}."
msgstr "" msgstr "az rsync elhalt a(z) {} hibakóddal"
#: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237 #: src/modules/unpackfs/main.py:219 src/modules/unpackfs/main.py:237
msgid "Failed to unpack image \"{}\"" msgid "Failed to unpack image \"{}\""
msgstr "" msgstr "\"{}\" kép kicsomagolása nem sikerült"
#: src/modules/unpackfs/main.py:220 #: src/modules/unpackfs/main.py:220
msgid "" msgid ""
@ -84,7 +84,7 @@ msgstr ""
#: src/modules/unpackfs/main.py:313 #: src/modules/unpackfs/main.py:313
msgid "No mount point for root partition" msgid "No mount point for root partition"
msgstr "" msgstr "Nincs betöltési pont a root partíciónál"
#: src/modules/unpackfs/main.py:314 #: src/modules/unpackfs/main.py:314
msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
@ -92,7 +92,7 @@ msgstr ""
#: src/modules/unpackfs/main.py:319 #: src/modules/unpackfs/main.py:319
msgid "Bad mount point for root partition" msgid "Bad mount point for root partition"
msgstr "" msgstr "Rossz betöltési pont a root partíciónál"
#: src/modules/unpackfs/main.py:320 #: src/modules/unpackfs/main.py:320
msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
@ -105,15 +105,15 @@ msgstr ""
#: src/modules/unpackfs/main.py:334 #: src/modules/unpackfs/main.py:334
msgid "The filesystem for \"{}\" ({}) is not supported" msgid "The filesystem for \"{}\" ({}) is not supported"
msgstr "" msgstr "A(z) ({}) fájlrendszer nem támogatott a következőhöz: \"{}\""
#: src/modules/unpackfs/main.py:341 #: src/modules/unpackfs/main.py:341
msgid "The source filesystem \"{}\" does not exist" msgid "The source filesystem \"{}\" does not exist"
msgstr "" msgstr "A forrás fájlrendszer \"{}\" nem létezik"
#: src/modules/unpackfs/main.py:346 #: src/modules/unpackfs/main.py:346
msgid "The destination \"{}\" in the target system is not a directory" msgid "The destination \"{}\" in the target system is not a directory"
msgstr "" msgstr "Az elérés \"{}\" nem létező könyvtár a cél rendszerben"
#: src/modules/displaymanager/main.py:380 #: src/modules/displaymanager/main.py:380
msgid "Cannot write KDM configuration file" msgid "Cannot write KDM configuration file"
@ -173,11 +173,11 @@ msgstr "A kijelzőkezelő konfigurációja hiányos volt"
#: src/modules/rawfs/main.py:35 #: src/modules/rawfs/main.py:35
msgid "Installing data." msgid "Installing data."
msgstr "" msgstr "Adatok telepítése."
#: src/modules/services-openrc/main.py:38 #: src/modules/services-openrc/main.py:38
msgid "Configure OpenRC services" msgid "Configure OpenRC services"
msgstr "" msgstr "OpenRC szolgáltatások beállítása"
#: src/modules/services-openrc/main.py:66 #: src/modules/services-openrc/main.py:66
msgid "Cannot add service {name!s} to run-level {level!s}." msgid "Cannot add service {name!s} to run-level {level!s}."
@ -185,7 +185,7 @@ msgstr ""
#: src/modules/services-openrc/main.py:68 #: src/modules/services-openrc/main.py:68
msgid "Cannot remove service {name!s} from run-level {level!s}." msgid "Cannot remove service {name!s} from run-level {level!s}."
msgstr "" msgstr "Nem lehet törölni a {name!s} szolgáltatást a {level!s} futás-szintből"
#: src/modules/services-openrc/main.py:70 #: src/modules/services-openrc/main.py:70
msgid "" msgid ""
@ -200,7 +200,7 @@ msgstr ""
#: src/modules/services-openrc/main.py:110 #: src/modules/services-openrc/main.py:110
msgid "Target runlevel does not exist" msgid "Target runlevel does not exist"
msgstr "" msgstr "A cél futási szint nem létezik"
#: src/modules/services-openrc/main.py:111 #: src/modules/services-openrc/main.py:111
msgid "" msgid ""
@ -210,7 +210,7 @@ msgstr ""
#: src/modules/services-openrc/main.py:119 #: src/modules/services-openrc/main.py:119
msgid "Target service does not exist" msgid "Target service does not exist"
msgstr "" msgstr "A cél szolgáltatás nem létezik"
#: src/modules/services-openrc/main.py:120 #: src/modules/services-openrc/main.py:120
msgid "" msgid ""
@ -220,7 +220,7 @@ msgstr ""
#: src/modules/plymouthcfg/main.py:36 #: src/modules/plymouthcfg/main.py:36
msgid "Configure Plymouth theme" msgid "Configure Plymouth theme"
msgstr "" msgstr "Plymouth téma beállítása"
#: src/modules/machineid/main.py:36 #: src/modules/machineid/main.py:36
msgid "Generate machine-id." msgid "Generate machine-id."
@ -251,7 +251,7 @@ msgstr[1] "%(num)d csomag eltávolítása."
#: src/modules/removeuser/main.py:34 #: src/modules/removeuser/main.py:34
msgid "Remove live user from target system" msgid "Remove live user from target system"
msgstr "" msgstr "Éles felhasználó eltávolítása a cél rendszerből"
#: src/modules/dummypython/main.py:44 #: src/modules/dummypython/main.py:44
msgid "Dummy python job." msgid "Dummy python job."

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

Binary file not shown.

2
lang/python/ko/LC_MESSAGES/python.po
View File

@ -67,7 +67,7 @@ msgstr "파일 시스템 마운트를 해제합니다."
#: src/modules/unpackfs/main.py:40 #: src/modules/unpackfs/main.py:40
msgid "Filling up filesystems." msgid "Filling up filesystems."
msgstr "" msgstr "파일 시스템을 채우는 중."
#: src/modules/unpackfs/main.py:158 #: src/modules/unpackfs/main.py:158
msgid "rsync failed with error code {}." msgid "rsync failed with error code {}."

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

Binary file not shown.

2
lang/python/lt/LC_MESSAGES/python.po
View File

@ -68,7 +68,7 @@ msgstr "Atjungti failų sistemas."
#: src/modules/unpackfs/main.py:40 #: src/modules/unpackfs/main.py:40
msgid "Filling up filesystems." msgid "Filling up filesystems."
msgstr "" msgstr "Užpildomos failų sistemos."
#: src/modules/unpackfs/main.py:158 #: src/modules/unpackfs/main.py:158
msgid "rsync failed with error code {}." msgid "rsync failed with error code {}."

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

Binary file not shown.

2
lang/python/sq/LC_MESSAGES/python.po
View File

@ -68,7 +68,7 @@ msgstr "Çmontoni sisteme kartelash."
#: src/modules/unpackfs/main.py:40 #: src/modules/unpackfs/main.py:40
msgid "Filling up filesystems." msgid "Filling up filesystems."
msgstr "" msgstr "Po mbushen sisteme kartelash."
#: src/modules/unpackfs/main.py:158 #: src/modules/unpackfs/main.py:158
msgid "rsync failed with error code {}." msgid "rsync failed with error code {}."

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

Binary file not shown.

2
lang/python/zh_TW/LC_MESSAGES/python.po
View File

@ -66,7 +66,7 @@ msgstr "解除掛載檔案系統。"
#: src/modules/unpackfs/main.py:40 #: src/modules/unpackfs/main.py:40
msgid "Filling up filesystems." msgid "Filling up filesystems."
msgstr "" msgstr "填滿檔案系統。"
#: src/modules/unpackfs/main.py:158 #: src/modules/unpackfs/main.py:158
msgid "rsync failed with error code {}." msgid "rsync failed with error code {}."

2
src/calamares/CMakeLists.txt
View File

@ -38,10 +38,10 @@ set( final_src ${calamaresSources} ${calamaresRc} ${trans_outfile} )
add_executable( calamares_bin ${final_src} ) add_executable( calamares_bin ${final_src} )
set_target_properties(calamares_bin set_target_properties(calamares_bin
PROPERTIES PROPERTIES
AUTOMOC TRUE
ENABLE_EXPORTS TRUE ENABLE_EXPORTS TRUE
RUNTIME_OUTPUT_NAME calamares RUNTIME_OUTPUT_NAME calamares
) )
calamares_automoc( calamares_bin )
if( WITH_KF5Crash ) if( WITH_KF5Crash )
set( LINK_LIBRARIES set( LINK_LIBRARIES

4
src/calamares/progresstree/ProgressTreeItem.cpp
View File

@ -84,9 +84,7 @@ ProgressTreeRoot::ProgressTreeRoot()
QVariant QVariant
ProgressTreeRoot::data( int role ) const ProgressTreeRoot::data( int ) const
{ {
if ( role == ProgressTreeModel::ProgressTreeItemRole )
return this;
return QVariant(); return QVariant();
} }

6
src/calamares/progresstree/ProgressTreeModel.cpp
View File

@ -98,9 +98,9 @@ ProgressTreeModel::data( const QModelIndex& index, int role ) const
QVariant QVariant
ProgressTreeModel::headerData( int section, Qt::Orientation orientation, int role ) const ProgressTreeModel::headerData( int section, Qt::Orientation orientation, int role ) const
{ {
Q_UNUSED( section ); Q_UNUSED( section )
Q_UNUSED( orientation ); Q_UNUSED( orientation )
Q_UNUSED( role ); Q_UNUSED( role )
return QVariant(); return QVariant();
} }

1
src/calamares/progresstree/ProgressTreeModel.h
View File

@ -35,7 +35,6 @@ class ProgressTreeModel : public QAbstractItemModel
public: public:
enum Role enum Role
{ {
ProgressTreeItemRole = Qt::UserRole + 10,
ProgressTreeItemCurrentRole = Qt::UserRole + 11 ProgressTreeItemCurrentRole = Qt::UserRole + 11
}; };

4
src/calamares/progresstree/ViewStepItem.cpp
View File

@ -46,15 +46,13 @@ void
ViewStepItem::appendChild( ProgressTreeItem* item ) ViewStepItem::appendChild( ProgressTreeItem* item )
{ {
Q_ASSERT( false ); Q_ASSERT( false );
Q_UNUSED( item ); Q_UNUSED( item )
} }
QVariant QVariant
ViewStepItem::data( int role ) const ViewStepItem::data( int role ) const
{ {
if ( role == ProgressTreeModel::ProgressTreeItemRole )
return this;
if ( role == Qt::DisplayRole ) if ( role == Qt::DisplayRole )
{ {
return m_step ? m_step->prettyName() return m_step ? m_step->prettyName()

5
src/libcalamares/CMakeLists.txt
View File

@ -23,6 +23,7 @@ set( utilsSources
utils/CalamaresUtils.cpp utils/CalamaresUtils.cpp
utils/CalamaresUtilsSystem.cpp utils/CalamaresUtilsSystem.cpp
utils/CommandList.cpp utils/CommandList.cpp
utils/LocaleLabel.cpp
utils/Logger.cpp utils/Logger.cpp
utils/PluginFactory.cpp utils/PluginFactory.cpp
utils/Retranslator.cpp utils/Retranslator.cpp
@ -84,10 +85,10 @@ endif()
add_library( calamares SHARED ${libSources} ${kdsagSources} ${utilsSources} ) add_library( calamares SHARED ${libSources} ${kdsagSources} ${utilsSources} )
set_target_properties( calamares set_target_properties( calamares
PROPERTIES PROPERTIES
AUTOMOC TRUE
VERSION ${CALAMARES_VERSION_SHORT} VERSION ${CALAMARES_VERSION_SHORT}
SOVERSION ${CALAMARES_VERSION_SHORT} SOVERSION ${CALAMARES_VERSION_SHORT}
) )
calamares_automoc( calamares )
target_link_libraries( calamares target_link_libraries( calamares
LINK_PRIVATE LINK_PRIVATE
@ -114,7 +115,7 @@ if ( ECM_FOUND AND BUILD_TESTING )
Qt5::Core Qt5::Core
Qt5::Test Qt5::Test
) )
set_target_properties( libcalamarestest PROPERTIES AUTOMOC TRUE ) calamares_automoc( libcalamarestest )
endif() endif()
# Make symlink lib/calamares/libcalamares.so to lib/libcalamares.so.VERSION so # Make symlink lib/calamares/libcalamares.so to lib/libcalamares.so.VERSION so

2
src/libcalamares/CppJob.cpp
View File

@ -41,7 +41,7 @@ CppJob::setModuleInstanceKey( const QString& instanceKey )
void void
CppJob::setConfigurationMap( const QVariantMap& configurationMap ) CppJob::setConfigurationMap( const QVariantMap& configurationMap )
{ {
Q_UNUSED( configurationMap ); Q_UNUSED( configurationMap )
} }
} }

9
src/libcalamares/JobQueue.cpp
View File

@ -35,7 +35,6 @@ namespace Calamares
class JobThread : public QThread class JobThread : public QThread
{ {
Q_OBJECT
public: public:
JobThread( JobQueue* queue ) JobThread( JobQueue* queue )
: QThread( queue ) : QThread( queue )
@ -44,6 +43,8 @@ public:
{ {
} }
virtual ~JobThread() override;
void setJobs( const JobList& jobs ) void setJobs( const JobList& jobs )
{ {
m_jobs = jobs; m_jobs = jobs;
@ -122,6 +123,10 @@ private:
} }
}; };
JobThread::~JobThread()
{
}
JobQueue* JobQueue::s_instance = nullptr; JobQueue* JobQueue::s_instance = nullptr;
@ -184,5 +189,3 @@ JobQueue::enqueue( const JobList& jobs )
} }
} // namespace Calamares } // namespace Calamares
#include "JobQueue.moc"

2
src/libcalamares/PythonJob.cpp
View File

@ -92,7 +92,7 @@ BOOST_PYTHON_MODULE( libcalamares )
bp::object utilsModule( bp::handle<>( bp::borrowed( PyImport_AddModule( "libcalamares.utils" ) ) ) ); bp::object utilsModule( bp::handle<>( bp::borrowed( PyImport_AddModule( "libcalamares.utils" ) ) ) );
bp::scope().attr( "utils" ) = utilsModule; bp::scope().attr( "utils" ) = utilsModule;
bp::scope utilsScope = utilsModule; bp::scope utilsScope = utilsModule;
Q_UNUSED( utilsScope ); Q_UNUSED( utilsScope )
bp::def( bp::def(
"debug", "debug",

2
src/libcalamares/Settings.cpp
View File

@ -27,8 +27,6 @@
#include <QFile> #include <QFile>
#include <QPair> #include <QPair>
#include <yaml-cpp/yaml.h>
static bool static bool
hasValue( const YAML::Node& v ) hasValue( const YAML::Node& v )
{ {

2
src/libcalamares/kdsingleapplicationguard/kdsingleapplicationguard.h
View File

@ -34,7 +34,7 @@ public:
explicit KDSingleApplicationGuard( QObject * parent=nullptr ); explicit KDSingleApplicationGuard( QObject * parent=nullptr );
explicit KDSingleApplicationGuard( Policy policy, QObject * parent=nullptr ); explicit KDSingleApplicationGuard( Policy policy, QObject * parent=nullptr );
explicit KDSingleApplicationGuard( const QStringList & arguments, QObject * parent=nullptr ); explicit KDSingleApplicationGuard( const QStringList & arguments, QObject * parent=nullptr );
explicit KDSingleApplicationGuard( const QStringList & arguments, Policy policy, QObject * parent=0 ); explicit KDSingleApplicationGuard( const QStringList & arguments, Policy policy, QObject * parent=nullptr );
~KDSingleApplicationGuard(); ~KDSingleApplicationGuard();
bool isOperational() const; bool isOperational() const;

2
src/libcalamares/kdsingleapplicationguard/kdtoolsglobal.cpp
View File

@ -27,7 +27,7 @@ static Version kdParseQtVersion( const char * const version ) {
return result; return result;
} }
bool _kdCheckQtVersion_impl( int major, int minor, int patchlevel ) { bool _kdCheckQtVersion_impl( unsigned int major, unsigned int minor, unsigned int patchlevel ) {
static const Version actual = kdParseQtVersion( qVersion() ); // do this only once each run... static const Version actual = kdParseQtVersion( qVersion() ); // do this only once each run...
const Version requested = { { static_cast< unsigned char >( major ), const Version requested = { { static_cast< unsigned char >( major ),
static_cast< unsigned char >( minor ), static_cast< unsigned char >( minor ),

2
src/libcalamares/kdsingleapplicationguard/kdtoolsglobal.h
View File

@ -78,7 +78,7 @@ inline T & __kdtools__dereference_for_methodcall( T * o ) {
#define KDAB_SET_OBJECT_NAME( x ) __kdtools__dereference_for_methodcall( x ).setObjectName( QLatin1String( #x ) ) #define KDAB_SET_OBJECT_NAME( x ) __kdtools__dereference_for_methodcall( x ).setObjectName( QLatin1String( #x ) )
KDTOOLSCORE_EXPORT bool _kdCheckQtVersion_impl( int major, int minor=0, int patchlevel=0 ); KDTOOLSCORE_EXPORT bool _kdCheckQtVersion_impl( unsigned int major, unsigned int minor=0, unsigned int patchlevel=0 );
static inline bool kdCheckQtVersion( unsigned int major, unsigned int minor=0, unsigned int patchlevel=0 ) { static inline bool kdCheckQtVersion( unsigned int major, unsigned int minor=0, unsigned int patchlevel=0 ) {
return (major<<16|minor<<8|patchlevel) <= static_cast<unsigned int>(QT_VERSION) return (major<<16|minor<<8|patchlevel) <= static_cast<unsigned int>(QT_VERSION)
|| _kdCheckQtVersion_impl( major, minor, patchlevel ); || _kdCheckQtVersion_impl( major, minor, patchlevel );

6
src/libcalamares/kdsingleapplicationguard/pimpl_ptr.h
View File

@ -1,5 +1,5 @@
#ifndef KDTOOLSCORE__PIMPL_PTR_H #ifndef KDTOOLSCORE_PIMPL_PTR_H
#define KDTOOLSCORE__PIMPL_PTR_H #define KDTOOLSCORE_PIMPL_PTR_H
#include "kdtoolsglobal.h" #include "kdtoolsglobal.h"
@ -40,5 +40,5 @@ namespace kdtools {
} // namespace kdtools } // namespace kdtools
#endif #endif
#endif /* KDTOOLSCORE__PIMPL_PTR_H */ #endif /* KDTOOLSCORE_PIMPL_PTR_H */

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

@ -38,6 +38,41 @@
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
/** @brief When logging commands, don't log everything.
*
* The command-line arguments to some commands may contain the
* encrypted password set by the user. Don't log that password,
* since the log may get posted to bug reports, or stored in
* the target system.
*/
struct RedactedList
{
RedactedList( const QStringList& l )
: list(l)
{
}
const QStringList& list;
} ;
QDebug&
operator<<( QDebug& s, const RedactedList& l )
{
// Special case logging: don't log the (encrypted) password.
if ( l.list.contains( "usermod" ) )
{
for ( const auto& item : l.list )
if ( item.startsWith( "$6$" ) )
s << "<password>";
else
s << item;
}
else
s << l.list;
return s;
}
namespace CalamaresUtils namespace CalamaresUtils
{ {
@ -158,7 +193,7 @@ System::runCommand(
return -3; return -3;
} }
cDebug() << "Running" << program << arguments; cDebug() << "Running" << program << RedactedList( arguments );
process.start(); process.start();
if ( !process.waitForStarted() ) if ( !process.waitForStarted() )
{ {
@ -191,7 +226,7 @@ System::runCommand(
cDebug() << "Finished. Exit code:" << r; cDebug() << "Finished. Exit code:" << r;
if ( ( r != 0 ) || Calamares::Settings::instance()->debugMode() ) if ( ( r != 0 ) || Calamares::Settings::instance()->debugMode() )
{ {
cDebug() << "Target cmd:" << args; cDebug() << "Target cmd:" << RedactedList( args );
cDebug().noquote().nospace() << "Target output:\n" << output; cDebug().noquote().nospace() << "Target output:\n" << output;
} }
return ProcessResult(r, output); return ProcessResult(r, output);

73
src/libcalamares/utils/LocaleLabel.cpp Normal file
View File

@ -0,0 +1,73 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Calamares is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include "LocaleLabel.h"
namespace CalamaresUtils
{
LocaleLabel::LocaleLabel()
: m_locale( QLocale() )
{
m_localeId = m_locale.name();
setLabels( QString(), LabelFormat::IfNeededWithCountry );
}
LocaleLabel::LocaleLabel( const QString& locale, LabelFormat format )
: m_locale( LocaleLabel::getLocale( locale ) )
, m_localeId( locale )
{
setLabels( locale, format );
}
void
LocaleLabel::setLabels( const QString& locale, LabelFormat format )
{
//: language[name] (country[name])
QString longFormat = QObject::tr( "%1 (%2)" );
QString languageName = m_locale.nativeLanguageName();
QString englishName = m_locale.languageToString( m_locale.language() );
QString countryName;
if ( languageName.isEmpty() )
languageName = QString( "* %1 (%2)" ).arg( locale, englishName );
bool needsCountryName = ( format == LabelFormat::AlwaysWithCountry ) ||
(locale.contains( '_' ) && QLocale::countriesForLanguage( m_locale.language() ).count() > 1 );
if ( needsCountryName )
countryName = m_locale.nativeCountryName();
m_label = needsCountryName ? longFormat.arg( languageName, countryName ) : languageName;
m_englishLabel = needsCountryName ? longFormat.arg( englishName, QLocale::countryToString( m_locale.country() ) ) : englishName;
}
QLocale LocaleLabel::getLocale( const QString& localeName )
{
if ( localeName.contains( "@latin" ) )
{
QLocale loc( localeName ); // Ignores @latin
return QLocale( loc.language(), QLocale::Script::LatinScript, loc.country() );
}
else
return QLocale( localeName );
}
} // namespace

113
src/libcalamares/utils/LocaleLabel.h Normal file
View File

@ -0,0 +1,113 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Calamares is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBCALAMARES_LOCALELABEL_H
#define LIBCALAMARES_LOCALELABEL_H
#include <QLocale>
#include <QString>
namespace CalamaresUtils
{
/**
* @brief Consistent locale (language + country) naming.
*
* Support class to turn locale names (as used by Calamares's
* translation system) into QLocales, and also into consistent
* human-readable text labels.
*/
class LocaleLabel
{
public:
/** @brief Formatting option for label -- add (country) to label. */
enum class LabelFormat { AlwaysWithCountry, IfNeededWithCountry } ;
/** @brief Empty locale. This uses the system-default locale. */
LocaleLabel();
/** @brief Construct from a locale name.
*
* The @p localeName should be one that Qt recognizes, e.g. en_US or ar_EY.
* The @p format determines whether the country name is always present
* in the label (human-readable form) or only if needed for disambiguation.
*/
LocaleLabel( const QString& localeName, LabelFormat format = LabelFormat::IfNeededWithCountry );
/** @brief Define a sorting order.
*
* English (@see isEnglish() -- it means en_US) is sorted at the top.
*/
bool operator <( const LocaleLabel& other ) const
{
return m_localeId < other.m_localeId;
}
/** @brief Is this locale English?
*
* en_US and en (American English) is defined as English. The Queen's
* English -- proper English -- is relegated to non-English status.
*/
bool isEnglish() const
{
return m_localeId == QLatin1Literal( "en_US" ) || m_localeId == QLatin1Literal( "en" );
}
/** @brief Get the human-readable name for this locale. */
QString label() const
{
return m_label;
}
/** @brief Get the *English* human-readable name for this locale. */
QString englishLabel() const
{
return m_englishLabel;
}
/** @brief Get the Qt locale. */
QLocale locale() const
{
return m_locale;
}
QString name() const
{
return m_locale.name();
}
/** @brief Get a Qt locale for the given @p localeName
*
* This special-cases `sr@latin`, which is used as a translation
* name in Calamares, while Qt recognizes `sr@latn`.
*/
static QLocale getLocale( const QString& localeName );
protected:
void setLabels( const QString& name, LabelFormat format );
QLocale m_locale;
QString m_localeId; // the locale identifier, e.g. "en_GB"
QString m_label; // the native name of the locale
QString m_englishLabel;
} ;
} // namespace CalamaresUtils
#endif // LIBCALAMARES_LOCALELABEL_H

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

@ -99,12 +99,10 @@ log( const char* msg, unsigned int debugLevel )
static void static void
CalamaresLogHandler( QtMsgType type, const QMessageLogContext& context, const QString& msg ) CalamaresLogHandler( QtMsgType type, const QMessageLogContext&, const QString& msg )
{ {
static QMutex s_mutex; static QMutex s_mutex;
Q_UNUSED( context );
QByteArray ba = msg.toUtf8(); QByteArray ba = msg.toUtf8();
const char* message = ba.constData(); const char* message = ba.constData();

2
src/libcalamares/utils/NamedEnum.h
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* Copyright 2019, Adriaan de Groot <groot@kde.org> * Copyright 2019, Adriaan de Groot <groot@kde.org>
* Copyright 2019, Collabora Ltd <arnaud.ferraris@collabora.com>
* *
* Calamares is free software: you can redistribute it and/or modify * 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
@ -30,6 +31,7 @@
#include <QString> #include <QString>
#include <vector>
#include <type_traits> #include <type_traits>
#include <initializer_list> #include <initializer_list>

2
src/libcalamares/utils/PluginFactory.h
View File

@ -269,7 +269,7 @@ protected:
template<class impl, class ParentType> template<class impl, class ParentType>
static QObject* createInstance( QWidget* parentWidget, QObject* parent ) static QObject* createInstance( QWidget* parentWidget, QObject* parent )
{ {
Q_UNUSED( parentWidget ); Q_UNUSED( parentWidget )
ParentType* p = nullptr; ParentType* p = nullptr;
if ( parent ) if ( parent )
{ {

2
src/libcalamares/utils/YamlUtils.cpp
View File

@ -20,8 +20,6 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include <yaml-cpp/yaml.h>
#include <QByteArray> #include <QByteArray>
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>

20
src/libcalamares/utils/YamlUtils.h
View File

@ -26,11 +26,21 @@
class QByteArray; class QByteArray;
class QFileInfo; class QFileInfo;
namespace YAML // The yaml-cpp headers are not C++11 warning-proof, especially
{ // with picky compilers like Clang 8. Since we use Clang for the
class Node; // find-all-the-warnings case, switch those warnings off for
class Exception; // the we-can't-change-them system headers.
} #ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
#pragma clang diagnostic ignored "-Wshadow"
#endif
#include <yaml-cpp/yaml.h>
#ifdef __clang__
#pragma clang diagnostic pop
#endif
/// @brief Appends all te elements of @p node to the string list @p v /// @brief Appends all te elements of @p node to the string list @p v
void operator>>( const YAML::Node& node, QStringList& v ); void operator>>( const YAML::Node& node, QStringList& v );

4
src/libcalamares/utils/moc-warnings.h Normal file
View File

@ -0,0 +1,4 @@
#ifdef __clang__
#pragma clang diagnostic ignored "-Wextra-semi-stmt"
#pragma clang diagnostic ignored "-Wredundant-parens"
#endif

3
src/libcalamaresui/Branding.cpp
View File

@ -32,9 +32,6 @@
#include <QPixmap> #include <QPixmap>
#include <QVariantMap> #include <QVariantMap>
#include <yaml-cpp/yaml.h>
namespace Calamares namespace Calamares
{ {

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

@ -36,8 +36,6 @@
#include "PythonQtViewModule.h" #include "PythonQtViewModule.h"
#endif #endif
#include <yaml-cpp/yaml.h>
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>

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

@ -28,8 +28,6 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/YamlUtils.h" #include "utils/YamlUtils.h"
#include <yaml-cpp/yaml.h>
#include <QApplication> #include <QApplication>
#include <QDir> #include <QDir>
#include <QTimer> #include <QTimer>

45
src/libcalamaresui/utils/CalamaresUtilsGui.cpp
View File

@ -40,7 +40,7 @@ static int s_defaultFontHeight = 0;
QPixmap QPixmap
defaultPixmap( ImageType type, ImageMode mode, const QSize& size ) defaultPixmap( ImageType type, ImageMode mode, const QSize& size )
{ {
Q_UNUSED( mode ); Q_UNUSED( mode )
QPixmap pixmap; QPixmap pixmap;
switch ( type ) switch ( type )
@ -262,45 +262,4 @@ clearLayout( QLayout* layout )
} }
} }
LocaleLabel::LocaleLabel( const QString& locale, LabelFormat format ) } // namespace
: m_locale( LocaleLabel::getLocale( locale ) )
, m_localeId( locale )
{
//: language[name] (country[name])
QString longFormat = QObject::tr( "%1 (%2)" );
QString sortKey = QLocale::languageToString( m_locale.language() );
QString languageName = m_locale.nativeLanguageName();
QString countryName;
if ( languageName.isEmpty() )
languageName = QString( QLatin1Literal( "* %1 (%2)" ) ).arg( locale, sortKey );
bool needsCountryName = ( format == LabelFormat::AlwaysWithCountry ) ||
(locale.contains( '_' ) && QLocale::countriesForLanguage( m_locale.language() ).count() > 1 );
if ( needsCountryName )
{
sortKey.append( '+' );
sortKey.append( QLocale::countryToString( m_locale.country() ) );
countryName = m_locale.nativeCountryName();
}
m_sortKey = sortKey;
m_label = needsCountryName ? longFormat.arg( languageName ).arg( countryName ) : languageName;
}
QLocale LocaleLabel::getLocale( const QString& localeName )
{
if ( localeName.contains( "@latin" ) )
{
QLocale loc( localeName ); // Ignores @latin
return QLocale( loc.language(), QLocale::Script::LatinScript, loc.country() );
}
else
return QLocale( localeName );
}
}

70
src/libcalamaresui/utils/CalamaresUtilsGui.h
View File

@ -127,76 +127,6 @@ constexpr int windowMinimumHeight = 520;
constexpr int windowPreferredWidth = 1024; constexpr int windowPreferredWidth = 1024;
constexpr int windowPreferredHeight = 520; constexpr int windowPreferredHeight = 520;
/**
* @brief Consistent locale (language + country) naming.
*
* Support class to turn locale names (as used by Calamares's
* translation system) into QLocales, and also into consistent
* human-readable text labels.
*/
class LocaleLabel
{
public:
/** @brief Formatting option for label -- add (country) to label. */
enum class LabelFormat { AlwaysWithCountry, IfNeededWithCountry } ;
/** @brief Construct from a locale name.
*
* The @p localeName should be one that Qt recognizes, e.g. en_US or ar_EY.
* The @p format determines whether the country name is always present
* in the label (human-readable form) or only if needed for disambiguation.
*/
LocaleLabel( const QString& localeName, LabelFormat format = LabelFormat::IfNeededWithCountry );
/** @brief Define a sorting order.
*
* English (@see isEnglish() -- it means en_US) is sorted at the top.
*/
bool operator <( const LocaleLabel& other ) const
{
if ( isEnglish() )
return !other.isEnglish();
if ( other.isEnglish() )
return false;
return m_sortKey < other.m_sortKey;
}
/** @brief Is this locale English?
*
* en_US and en (American English) is defined as English. The Queen's
* English -- proper English -- is relegated to non-English status.
*/
bool isEnglish() const
{
return m_localeId == QLatin1Literal( "en_US" ) || m_localeId == QLatin1Literal( "en" );
}
/** @brief Get the human-readable name for this locale. */
QString label() const
{
return m_label;
}
/** @brief Get the Qt locale. */
QLocale locale() const
{
return m_locale;
}
/** @brief Get a Qt locale for the given @p localeName
*
* This special-cases `sr@latin`, which is used as a translation
* name in Calamares, while Qt recognizes `sr@latn`.
*/
static QLocale getLocale( const QString& localeName );
protected:
QLocale m_locale;
QString m_localeId; // the locale identifier, e.g. "en_GB"
QString m_sortKey; // the English name of the locale
QString m_label; // the native name of the locale
} ;
} // namespace CalamaresUtils } // namespace CalamaresUtils
#endif // CALAMARESUTILSGUI_H #endif // CALAMARESUTILSGUI_H

2
src/libcalamaresui/viewpages/ViewStep.cpp
View File

@ -71,7 +71,7 @@ ViewStep::setModuleInstanceKey( const QString& instanceKey )
void void
ViewStep::setConfigurationMap( const QVariantMap& configurationMap ) ViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{ {
Q_UNUSED( configurationMap ); Q_UNUSED( configurationMap )
} }

2
src/libcalamaresui/widgets/FixedAspectRatioLabel.cpp
View File

@ -43,7 +43,7 @@ FixedAspectRatioLabel::setPixmap( const QPixmap& pixmap )
void void
FixedAspectRatioLabel::resizeEvent( QResizeEvent* event ) FixedAspectRatioLabel::resizeEvent( QResizeEvent* event )
{ {
Q_UNUSED( event ); Q_UNUSED( event )
QLabel::setPixmap( m_pixmap.scaled( QLabel::setPixmap( m_pixmap.scaled(
contentsRect().size(), contentsRect().size(),
Qt::KeepAspectRatio, Qt::KeepAspectRatio,

28
src/modules/bootloader/main.py
View File

@ -11,7 +11,7 @@
# Copyright 2015-2018, Philip Mueller <philm@manjaro.org> # Copyright 2015-2018, Philip Mueller <philm@manjaro.org>
# Copyright 2016-2017, Teo Mrnjavac <teo@kde.org> # Copyright 2016-2017, Teo Mrnjavac <teo@kde.org>
# Copyright 2017, Alf Gaida <agaida@siduction.org> # Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2017-2018, Adriaan de Groot <groot@kde.org> # Copyright 2017-2019, Adriaan de Groot <groot@kde.org>
# Copyright 2017, Gabriel Craciunescu <crazy@frugalware.org> # Copyright 2017, Gabriel Craciunescu <crazy@frugalware.org>
# Copyright 2017, Ben Green <Bezzy1999@hotmail.com> # Copyright 2017, Ben Green <Bezzy1999@hotmail.com>
# #
@ -37,6 +37,17 @@ import libcalamares
from libcalamares.utils import check_target_env_call from libcalamares.utils import check_target_env_call
import gettext
_ = gettext.translation("calamares-python",
localedir=libcalamares.utils.gettext_path(),
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
def pretty_name():
return _("Install bootloader.")
def get_uuid(): def get_uuid():
""" """
Checks and passes 'uuid' to other routine. Checks and passes 'uuid' to other routine.
@ -424,21 +435,16 @@ def run():
fw_type = libcalamares.globalstorage.value("firmwareType") fw_type = libcalamares.globalstorage.value("firmwareType")
if (libcalamares.globalstorage.value("bootLoader") is None if (libcalamares.globalstorage.value("bootLoader") is None and fw_type != "efi"):
and fw_type != "efi"): libcalamares.utils.warning( "Non-EFI system, and no bootloader is set." )
return None return None
partitions = libcalamares.globalstorage.value("partitions") partitions = libcalamares.globalstorage.value("partitions")
if fw_type == "efi": if fw_type == "efi":
esp_found = False efi_system_partition = libcalamares.globalstorage.value("efiSystemPartition")
esp_found = [ p for p in partitions if p["mountPoint"] == efi_system_partition ]
for partition in partitions:
if (partition["mountPoint"] ==
libcalamares.globalstorage.value("efiSystemPartition")):
esp_found = True
if not esp_found: if not esp_found:
libcalamares.utils.warning( "EFI system, but nothing mounted on {!s}".format(efi_system_partition) )
return None return None
prepare_bootloader(fw_type) prepare_bootloader(fw_type)

2
src/modules/contextualprocess/CMakeLists.txt
View File

@ -21,5 +21,5 @@ if( ECM_FOUND AND BUILD_TESTING )
Qt5::Core Qt5::Core
Qt5::Test Qt5::Test
) )
set_target_properties( contextualprocesstest PROPERTIES AUTOMOC TRUE ) calamares_automoc( contextualprocesstest )
endif() endif()

2
src/modules/contextualprocess/Tests.cpp
View File

@ -22,8 +22,6 @@
#include "utils/CommandList.h" #include "utils/CommandList.h"
#include "utils/YamlUtils.h" #include "utils/YamlUtils.h"
#include <yaml-cpp/yaml.h>
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QFileInfo> #include <QFileInfo>

16
src/modules/dracut/main.py
View File

@ -6,6 +6,7 @@
# Copyright 2014-2015, Philip Müller <philm@manjaro.org> # Copyright 2014-2015, Philip Müller <philm@manjaro.org>
# Copyright 2014, Teo Mrnjavac <teo@kde.org> # Copyright 2014, Teo Mrnjavac <teo@kde.org>
# Copyright 2017, Alf Gaida <agaid@siduction.org> # Copyright 2017, Alf Gaida <agaid@siduction.org>
# Copyright 2019, 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
@ -24,6 +25,17 @@ import libcalamares
from libcalamares.utils import target_env_call from libcalamares.utils import target_env_call
import gettext
_ = gettext.translation("calamares-python",
localedir=libcalamares.utils.gettext_path(),
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
def pretty_name():
return _("Creating initramfs with dracut.")
def run_dracut(): def run_dracut():
""" """
Creates initramfs, even when initramfs already exists. Creates initramfs, even when initramfs already exists.
@ -43,5 +55,5 @@ def run():
return_code = run_dracut() return_code = run_dracut()
if return_code != 0: if return_code != 0:
return ("Failed to run dracut on the target", return ( _("Failed to run dracut on the target"),
"The exit code was {}".format(return_code)) _("The exit code was {}").format(return_code) )

2
src/modules/finished/FinishedPage.cpp
View File

@ -125,7 +125,7 @@ FinishedPage::focusInEvent( QFocusEvent* e )
void void
FinishedPage::onInstallationFailed( const QString& message, const QString& details ) FinishedPage::onInstallationFailed( const QString& message, const QString& details )
{ {
Q_UNUSED( details ); Q_UNUSED( details )
if ( Calamares::Settings::instance()->isSetupMode() ) if ( Calamares::Settings::instance()->isSetupMode() )
ui->mainText->setText( tr( "<h1>Setup Failed</h1><br/>" ui->mainText->setText( tr( "<h1>Setup Failed</h1><br/>"
"%1 has not been set up on your computer.<br/>" "%1 has not been set up on your computer.<br/>"

4
src/modules/finished/FinishedViewStep.cpp
View File

@ -148,8 +148,8 @@ FinishedViewStep::jobs() const
void void
FinishedViewStep::onInstallationFailed( const QString& message, const QString& details ) FinishedViewStep::onInstallationFailed( const QString& message, const QString& details )
{ {
Q_UNUSED( message ); Q_UNUSED( message )
Q_UNUSED( details ); Q_UNUSED( details )
installFailed = true; installFailed = true;
} }

2
src/modules/fsresizer/Tests.cpp
View File

@ -25,8 +25,6 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/YamlUtils.h" #include "utils/YamlUtils.h"
#include <yaml-cpp/yaml.h>
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QFileInfo> #include <QFileInfo>

11
src/modules/fstab/main.py
View File

@ -6,6 +6,7 @@
# Copyright 2014, Aurélien Gâteau <agateau@kde.org> # Copyright 2014, Aurélien Gâteau <agateau@kde.org>
# Copyright 2016, Teo Mrnjavac <teo@kde.org> # Copyright 2016, Teo Mrnjavac <teo@kde.org>
# Copyright 2017, Alf Gaida <agaida@siduction.org> # Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2019, 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
@ -26,6 +27,16 @@ import subprocess
import libcalamares import libcalamares
import gettext
_ = gettext.translation("calamares-python",
localedir=libcalamares.utils.gettext_path(),
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
def pretty_name():
return _("Writing fstab.")
FSTAB_HEADER = """# /etc/fstab: static file system information. FSTAB_HEADER = """# /etc/fstab: static file system information.
# #

12
src/modules/grubcfg/main.py
View File

@ -6,7 +6,7 @@
# Copyright 2014-2015, Philip Müller <philm@manjaro.org> # Copyright 2014-2015, Philip Müller <philm@manjaro.org>
# Copyright 2015-2017, Teo Mrnjavac <teo@kde.org> # Copyright 2015-2017, Teo Mrnjavac <teo@kde.org>
# Copyright 2017, Alf Gaida <agaida@siduction.org> # Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2017, Adriaan de Groot <groot@kde.org> # Copyright 2017, 2019, Adriaan de Groot <groot@kde.org>
# Copyright 2017-2018, Gabriel Craciunescu <crazy@frugalware.org> # Copyright 2017-2018, 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
@ -26,6 +26,16 @@ import libcalamares
import os import os
import re import re
import gettext
_ = gettext.translation("calamares-python",
localedir=libcalamares.utils.gettext_path(),
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
def pretty_name():
return _("Configure GRUB.")
def modify_grub_default(partitions, root_mount_point, distributor): def modify_grub_default(partitions, root_mount_point, distributor):
""" """

12
src/modules/hwclock/main.py
View File

@ -7,6 +7,7 @@
# Copyright 2014, Teo Mrnjavac <teo@kde.org> # Copyright 2014, Teo Mrnjavac <teo@kde.org>
# Copyright 2017, Alf Gaida <agaida@siduction.org> # Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2017-2018, Gabriel Craciunescu <crazy@frugalware.org> # Copyright 2017-2018, Gabriel Craciunescu <crazy@frugalware.org>
# Copyright 2019, 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
@ -23,6 +24,17 @@
import libcalamares import libcalamares
import gettext
_ = gettext.translation("calamares-python",
localedir=libcalamares.utils.gettext_path(),
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
def pretty_name():
return _("Setting hardware clock.")
def run(): def run():
""" """
Set hardware clock. Set hardware clock.

11
src/modules/initcpio/main.py
View File

@ -4,6 +4,7 @@
# === This file is part of Calamares - <https://github.com/calamares> === # === This file is part of Calamares - <https://github.com/calamares> ===
# #
# Copyright 2014, Philip Müller <philm@manjaro.org> # Copyright 2014, Philip Müller <philm@manjaro.org>
# Copyright 2019, 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
@ -21,6 +22,16 @@
import libcalamares import libcalamares
from libcalamares.utils import check_target_env_call from libcalamares.utils import check_target_env_call
import gettext
_ = gettext.translation("calamares-python",
localedir=libcalamares.utils.gettext_path(),
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
def pretty_name():
return _("Creating initramfs with mkinitcpio.")
def run_mkinitcpio(): def run_mkinitcpio():
""" Runs mkinitcpio with given kernel profile """ """ Runs mkinitcpio with given kernel profile """

11
src/modules/initcpiocfg/main.py
View File

@ -6,6 +6,7 @@
# Copyright 2014, Rohan Garg <rohan@kde.org> # Copyright 2014, Rohan Garg <rohan@kde.org>
# Copyright 2015, Philip Müller <philm@manjaro.org> # Copyright 2015, Philip Müller <philm@manjaro.org>
# Copyright 2017, Alf Gaida <agaida@sidution.org> # Copyright 2017, Alf Gaida <agaida@sidution.org>
# Copyright 2019, 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
@ -24,6 +25,16 @@ import libcalamares
import os import os
from collections import OrderedDict from collections import OrderedDict
import gettext
_ = gettext.translation("calamares-python",
localedir=libcalamares.utils.gettext_path(),
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
def pretty_name():
return _("Configuring mkinitcpio.")
def cpuinfo(): def cpuinfo():
""" """

18
src/modules/initramfs/main.py
View File

@ -5,6 +5,7 @@
# #
# Copyright 2014, Philip Müller <philm@manjaro.org> # Copyright 2014, Philip Müller <philm@manjaro.org>
# Copyright 2017, Alf Gaida <agaida@siduction.org> # Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2019, 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
@ -19,9 +20,21 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Calamares. If not, see <http://www.gnu.org/licenses/>. # along with Calamares. If not, see <http://www.gnu.org/licenses/>.
import libcalamares
from libcalamares.utils import target_env_call from libcalamares.utils import target_env_call
import gettext
_ = gettext.translation("calamares-python",
localedir=libcalamares.utils.gettext_path(),
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
def pretty_name():
return _("Creating initramfs.")
def run(): def run():
""" Generate an initramfs image. """ Generate an initramfs image.
@ -31,7 +44,8 @@ def run():
"-t"]) "-t"])
if return_code != 0: if return_code != 0:
libcalamares.utils.debug("update-initramfs returned {}".format(return_code)
return ( return (
"Failed to run update-initramfs on the target", _("Failed to run update-initramfs on the target"),
"The exit code was {}".format(return_code) _("The exit code was {}").format(return_code)
) )

13
src/modules/initramfscfg/main.py
View File

@ -8,7 +8,7 @@
# Copyright 2016, David McKinney <mckinney@subgraph.com> # Copyright 2016, David McKinney <mckinney@subgraph.com>
# Copyright 2016, Kevin Kofler <kevin.kofler@chello.at> # Copyright 2016, Kevin Kofler <kevin.kofler@chello.at>
# Copyright 2017, Alf Gaida <agaida@siduction.org> # Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2017, Adriaan de Groot <groot@kde.org> # Copyright 2017, 2019, Adriaan de Groot <groot@kde.org>
# #
# Calamares is free software: you can redistribute it and/or modify # 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
@ -30,6 +30,17 @@ import os
import shutil import shutil
import gettext
_ = gettext.translation("calamares-python",
localedir=libcalamares.utils.gettext_path(),
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
def pretty_name():
return _("Configuring initramfs.")
def copy_initramfs_hooks(partitions, root_mount_point): def copy_initramfs_hooks(partitions, root_mount_point):
""" """
Copies initramfs hooks so they are picked up by update-initramfs Copies initramfs hooks so they are picked up by update-initramfs

2
src/modules/keyboard/KeyboardLayoutModel.cpp
View File

@ -32,7 +32,7 @@ KeyboardLayoutModel::KeyboardLayoutModel( QObject* parent )
int int
KeyboardLayoutModel::rowCount( const QModelIndex& parent ) const KeyboardLayoutModel::rowCount( const QModelIndex& parent ) const
{ {
Q_UNUSED( parent ); Q_UNUSED( parent )
return m_layouts.count(); return m_layouts.count();
} }

22
src/modules/keyboard/KeyboardPage.cpp
View File

@ -216,12 +216,12 @@ QString
KeyboardPage::prettyStatus() const KeyboardPage::prettyStatus() const
{ {
QString status; QString status;
status += tr( "Set keyboard model to %1.<br/>" ) status += tr( "Set keyboard model to %1.<br/>" ).arg( ui->comboBoxModel->currentText() );
.arg( ui->comboBoxModel->currentText() );
status += tr( "Set keyboard layout to %1/%2." ) QString layout = ui->listLayout->currentIndex().data().toString();
.arg( ui->listLayout->currentIndex().data().toString() ) QString variant = ui->listVariant->currentItem() ? ui->listVariant->currentItem()->text() : QString( "<default>" );
.arg( ui->listVariant->currentItem()->text() ); status += tr( "Set keyboard layout to %1/%2." ).arg( layout, variant );
return status; return status;
} }
@ -436,7 +436,7 @@ void
KeyboardPage::onListLayoutCurrentItemChanged( const QModelIndex& current, KeyboardPage::onListLayoutCurrentItemChanged( const QModelIndex& current,
const QModelIndex& previous ) const QModelIndex& previous )
{ {
Q_UNUSED( previous ); Q_UNUSED( previous )
if ( !current.isValid() ) if ( !current.isValid() )
return; return;
@ -446,9 +446,9 @@ KeyboardPage::onListLayoutCurrentItemChanged( const QModelIndex& current,
/* Returns stringlist with suitable setxkbmap command-line arguments /* Returns stringlist with suitable setxkbmap command-line arguments
* to set the given @p layout and @p variant. * to set the given @p layout and @p variant.
*/ */
static inline QStringList xkbmap_args( QStringList&& r, const QString& layout, const QString& variant ) static inline QStringList xkbmap_args( const QString& layout, const QString& variant )
{ {
r << "-layout" << layout; QStringList r{ "-layout", layout };
if ( !variant.isEmpty() ) if ( !variant.isEmpty() )
r << "-variant" << variant; r << "-variant" << variant;
return r; return r;
@ -457,7 +457,7 @@ static inline QStringList xkbmap_args( QStringList&& r, const QString& layout, c
void void
KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWidgetItem* previous ) KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWidgetItem* previous )
{ {
Q_UNUSED( previous ); Q_UNUSED( previous )
QPersistentModelIndex layoutIndex = ui->listLayout->currentIndex(); QPersistentModelIndex layoutIndex = ui->listLayout->currentIndex();
LayoutItem* variantItem = dynamic_cast< LayoutItem* >( current ); LayoutItem* variantItem = dynamic_cast< LayoutItem* >( current );
@ -483,7 +483,7 @@ KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWi
connect( &m_setxkbmapTimer, &QTimer::timeout, connect( &m_setxkbmapTimer, &QTimer::timeout,
this, [=] this, [=]
{ {
QProcess::execute( "setxkbmap", xkbmap_args( QStringList(), layout, variant ) ); QProcess::execute( "setxkbmap", xkbmap_args( layout, variant ) );
cDebug() << "xkbmap selection changed to: " << layout << '-' << variant; cDebug() << "xkbmap selection changed to: " << layout << '-' << variant;
m_setxkbmapTimer.disconnect( this ); m_setxkbmapTimer.disconnect( this );
} ); } );

174
src/modules/keyboard/keyboardwidget/keyboardglobal.cpp
View File

@ -1,11 +1,14 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* Copyright 2014, Teo Mrnjavac <teo@kde.org> * Copyright 2014, Teo Mrnjavac <teo@kde.org>
* Copyright 2019, Adriaan de Groot <groot@kde.org>
* *
* Originally from the Manjaro Installation Framework * Originally from the Manjaro Installation Framework
* by Roland Singer <roland@manjaro.org> * by Roland Singer <roland@manjaro.org>
* Copyright (C) 2007 Free Software Foundation, Inc. * Copyright (C) 2007 Free Software Foundation, Inc.
* *
* Source by Georg Grabler <ggrabler@gmail.com>
*
* 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
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
@ -24,66 +27,70 @@
#include "utils/Logger.h" #include "utils/Logger.h"
//### #ifdef Q_OS_FREEBSD
//### Public methods static const char XKB_FILE[] = "/usr/local/share/X11/xkb/rules/base.lst";
//### #else
static const char XKB_FILE[] = "/usr/share/X11/xkb/rules/base.lst";
#endif
// The xkb rules file is made of several "sections". Each section
// starts with a line "! <sectionname>". The static methods here
// handle individual sections.
QMap<QString, KeyboardGlobal::KeyboardInfo> KeyboardGlobal::getKeyboardLayouts() { /** @brief Scans a file for a named section
return parseKeyboardLayouts(XKB_FILE); *
} * Reads from @p fh incrementally until it finds a section named @p name
* or hits end-of-file. Returns true if the section is found. The
* @p name must include the "! " section marker as well.
QMap<QString, QString> KeyboardGlobal::getKeyboardModels() { */
return parseKeyboardModels(XKB_FILE); static bool findSection( QFile& fh, const char* name )
}
//###
//### Private methods
//###
//### Source by Georg Grabler <ggrabler@gmail.com> ###//
QMap<QString, QString> KeyboardGlobal::parseKeyboardModels(QString filepath)
{ {
QMap<QString, QString> models; while ( !fh.atEnd() )
{
QByteArray line = fh.readLine();
if ( line.startsWith( name ) )
return true;
}
return false;
}
QFile fh(filepath); static KeyboardGlobal::ModelsMap parseKeyboardModels( const char* filepath )
fh.open(QIODevice::ReadOnly); {
KeyboardGlobal::ModelsMap models;
if (!fh.isOpen()) { QFile fh( filepath );
fh.open( QIODevice::ReadOnly );
if ( !fh.isOpen() )
{
cDebug() << "X11 Keyboard model definitions not found!"; cDebug() << "X11 Keyboard model definitions not found!";
return models; return models;
} }
bool modelsFound = false; bool modelsFound = findSection( fh, "! model" );
// read the file until the end or until we break the loop // read the file until the end or until we break the loop
while (!fh.atEnd()) { while ( modelsFound && !fh.atEnd() )
{
QByteArray line = fh.readLine(); QByteArray line = fh.readLine();
// check if we start with the model section in the file // check if we start a new section
if (!modelsFound && line.startsWith("! model")) if ( line.startsWith( '!' ) )
modelsFound = true;
else if (modelsFound && line.startsWith ("!"))
break; break;
else if (!modelsFound)
continue;
// here we are in the model section, otherwhise we would continue or break // here we are in the model section, otherwhise we would continue or break
QRegExp rx; QRegExp rx;
rx.setPattern("^\\s+(\\S+)\\s+(\\w.*)\n$"); rx.setPattern( "^\\s+(\\S+)\\s+(\\w.*)\n$" );
// insert into the model map // insert into the model map
if (rx.indexIn(line) != -1) { if ( rx.indexIn( line ) != -1 )
QString modelDesc = rx.cap(2); {
QString model = rx.cap(1); QString modelDesc = rx.cap( 2 );
QString model = rx.cap( 1 );
if (model == "pc105") if ( model == "pc105" )
modelDesc += " - " + QObject::tr("Default Keyboard Model"); modelDesc += " - " + QObject::tr( "Default Keyboard Model" );
models.insert(modelDesc, model); models.insert( modelDesc, model );
} }
} }
@ -91,43 +98,40 @@ QMap<QString, QString> KeyboardGlobal::parseKeyboardModels(QString filepath)
} }
KeyboardGlobal::LayoutsMap parseKeyboardLayouts( const char* filepath )
QMap< QString, KeyboardGlobal::KeyboardInfo > KeyboardGlobal::parseKeyboardLayouts(QString filepath)
{ {
QMap< QString, KeyboardInfo > layouts; KeyboardGlobal::LayoutsMap layouts;
//### Get Layouts ###// //### Get Layouts ###//
QFile fh(filepath); QFile fh( filepath );
fh.open(QIODevice::ReadOnly); fh.open( QIODevice::ReadOnly );
if (!fh.isOpen()) { if ( !fh.isOpen() )
{
cDebug() << "X11 Keyboard layout definitions not found!"; cDebug() << "X11 Keyboard layout definitions not found!";
return layouts; return layouts;
} }
bool layoutsFound = false; bool layoutsFound = findSection( fh, "! layout" );
// read the file until the end or we break the loop // read the file until the end or we break the loop
while (!fh.atEnd()) { while ( layoutsFound && !fh.atEnd() )
{
QByteArray line = fh.readLine(); QByteArray line = fh.readLine();
// find the layout section otherwhise continue. If the layout section is at it's end, break the loop if ( line.startsWith( '!' ) )
if (!layoutsFound && line.startsWith("! layout"))
layoutsFound = true;
else if (layoutsFound && line.startsWith ("!"))
break; break;
else if (!layoutsFound)
continue;
QRegExp rx; QRegExp rx;
rx.setPattern("^\\s+(\\S+)\\s+(\\w.*)\n$"); rx.setPattern( "^\\s+(\\S+)\\s+(\\w.*)\n$" );
// insert into the layout map // insert into the layout map
if (rx.indexIn(line) != -1) { if ( rx.indexIn( line ) != -1 )
KeyboardInfo info; {
info.description = rx.cap(2); KeyboardGlobal::KeyboardInfo info;
info.variants.insert(QObject::tr("Default"), ""); info.description = rx.cap( 2 );
layouts.insert(rx.cap(1), info); info.variants.insert( QObject::tr( "Default" ), "" );
layouts.insert( rx.cap( 1 ), info );
} }
} }
@ -136,38 +140,50 @@ QMap< QString, KeyboardGlobal::KeyboardInfo > KeyboardGlobal::parseKeyboardLayou
//### Get Variants ###// //### Get Variants ###//
bool variantsFound = false; bool variantsFound = findSection( fh, "! variant" );
// read the file until the end or until we break // read the file until the end or until we break
while (!fh.atEnd()) { while ( variantsFound && !fh.atEnd() )
{
QByteArray line = fh.readLine(); QByteArray line = fh.readLine();
// continue until we found the variant section. If found, read until the next section is found if ( line.startsWith( '!' ) )
if (!variantsFound && line.startsWith("! variant")) {
variantsFound = true;
continue;
} else if (variantsFound && line.startsWith ("!"))
break; break;
else if (!variantsFound)
continue;
QRegExp rx; QRegExp rx;
rx.setPattern("^\\s+(\\S+)\\s+(\\S+): (\\w.*)\n$"); rx.setPattern( "^\\s+(\\S+)\\s+(\\S+): (\\w.*)\n$" );
// insert into the variants multimap, if the pattern matches // insert into the variants multimap, if the pattern matches
if (rx.indexIn(line) != -1) { if ( rx.indexIn( line ) != -1 )
if (layouts.find(rx.cap(2)) != layouts.end()) { {
if ( layouts.find( rx.cap( 2 ) ) != layouts.end() )
{
// in this case we found an entry in the multimap, and add the values to the multimap // in this case we found an entry in the multimap, and add the values to the multimap
layouts.find(rx.cap(2)).value().variants.insert(rx.cap(3), rx.cap(1)); layouts.find( rx.cap( 2 ) ).value().variants.insert( rx.cap( 3 ), rx.cap( 1 ) );
} else { }
else
{
// create a new map in the multimap - the value was not found. // create a new map in the multimap - the value was not found.
KeyboardInfo info; KeyboardGlobal::KeyboardInfo info;
info.description = rx.cap(2); info.description = rx.cap( 2 );
info.variants.insert(QObject::tr("Default"), ""); info.variants.insert( QObject::tr( "Default" ), "" );
info.variants.insert(rx.cap(3), rx.cap(1)); info.variants.insert( rx.cap( 3 ), rx.cap( 1 ) );
layouts.insert(rx.cap(2), info); layouts.insert( rx.cap( 2 ), info );
} }
} }
} }
return layouts; return layouts;
} }
KeyboardGlobal::LayoutsMap KeyboardGlobal::getKeyboardLayouts()
{
return parseKeyboardLayouts( XKB_FILE );
}
KeyboardGlobal::ModelsMap KeyboardGlobal::getKeyboardModels()
{
return parseKeyboardModels( XKB_FILE );
}

12
src/modules/keyboard/keyboardwidget/keyboardglobal.h
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, Teo Mrnjavac <teo@kde.org> * Copyright 2014, Teo Mrnjavac <teo@kde.org>
* Copyright 2017, Adriaan de Groot <groot@kde.org> * Copyright 2017, 2019, Adriaan de Groot <groot@kde.org>
* *
* Originally from the Manjaro Installation Framework * Originally from the Manjaro Installation Framework
* by Roland Singer <roland@manjaro.org> * by Roland Singer <roland@manjaro.org>
@ -35,8 +35,6 @@
#include <QRegExp> #include <QRegExp>
#include <QDebug> #include <QDebug>
#define XKB_FILE "/usr/share/X11/xkb/rules/base.lst"
class KeyboardGlobal class KeyboardGlobal
{ {
public: public:
@ -46,14 +44,10 @@ public:
}; };
using LayoutsMap = QMap< QString, KeyboardInfo >; using LayoutsMap = QMap< QString, KeyboardInfo >;
using ModelsMap = QMap< QString, QString >;
static LayoutsMap getKeyboardLayouts(); static LayoutsMap getKeyboardLayouts();
static QMap< QString, QString > getKeyboardModels(); static ModelsMap getKeyboardModels();
private:
static QMap< QString, QString > parseKeyboardModels(QString filepath);
static LayoutsMap parseKeyboardLayouts(QString filepath);
}; };
#endif // KEYBOARDGLOBAL_H #endif // KEYBOARDGLOBAL_H

3
src/modules/license/LicensePage.cpp
View File

@ -87,8 +87,7 @@ LicensePage::LicensePage(QWidget *parent)
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(
ui->acceptCheckBox->setText( tr( "I accept the terms and conditions above." ) ); ui->acceptCheckBox->setText( tr( "I accept the terms and conditions above." ) );
); )
} }

5
src/modules/locale/CMakeLists.txt
View File

@ -54,7 +54,7 @@ if( ECM_FOUND AND BUILD_TESTING )
${geoip_libs} ${geoip_libs}
${YAMLCPP_LIBRARY} ${YAMLCPP_LIBRARY}
) )
set_target_properties( geoiptest PROPERTIES AUTOMOC TRUE ) calamares_automoc( geoiptest )
ecm_add_test( ecm_add_test(
Tests.cpp Tests.cpp
@ -65,10 +65,11 @@ if( ECM_FOUND AND BUILD_TESTING )
calamares calamares
Qt5::Test Qt5::Test
) )
set_target_properties( localetest PROPERTIES AUTOMOC TRUE ) calamares_automoc( localetest )
endif() endif()
if( BUILD_TESTING ) if( BUILD_TESTING )
add_executable( test_geoip test_geoip.cpp ${geoip_src} ) add_executable( test_geoip test_geoip.cpp ${geoip_src} )
target_link_libraries( test_geoip calamaresui Qt5::Network ${geoip_libs} ${YAMLCPP_LIBRARY} ) target_link_libraries( test_geoip calamaresui Qt5::Network ${geoip_libs} ${YAMLCPP_LIBRARY} )
calamares_automoc( test_geoip )
endif() endif()

2
src/modules/locale/GeoIPJSON.cpp
View File

@ -25,8 +25,6 @@
#include <QByteArray> #include <QByteArray>
#include <yaml-cpp/yaml.h>
GeoIPJSON::GeoIPJSON(const QString& attribute) GeoIPJSON::GeoIPJSON(const QString& attribute)
: GeoIP( attribute.isEmpty() ? QStringLiteral( "time_zone" ) : attribute ) : GeoIP( attribute.isEmpty() ? QStringLiteral( "time_zone" ) : attribute )
{ {

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

@ -19,23 +19,25 @@
#include "LocalePage.h" #include "LocalePage.h"
#include "timezonewidget/timezonewidget.h"
#include "SetTimezoneJob.h" #include "SetTimezoneJob.h"
#include "utils/CalamaresUtilsGui.h" #include "timezonewidget/timezonewidget.h"
#include "utils/Logger.h"
#include "utils/Retranslator.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "LCLocaleDialog.h" #include "LCLocaleDialog.h"
#include "Settings.h" #include "Settings.h"
#include "utils/CalamaresUtilsGui.h"
#include "utils/LocaleLabel.h"
#include "utils/Logger.h"
#include "utils/Retranslator.h"
#include <QBoxLayout> #include <QBoxLayout>
#include <QComboBox> #include <QComboBox>
#include <QLabel> #include <QLabel>
#include <QPushButton> #include <QPushButton>
#include <QProcess> #include <QProcess>
LocalePage::LocalePage( QWidget* parent ) LocalePage::LocalePage( QWidget* parent )
: QWidget( parent ) : QWidget( parent )
, m_blockTzWidgetSet( false ) , m_blockTzWidgetSet( false )
@ -101,7 +103,7 @@ LocalePage::LocalePage( QWidget* parent )
static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ), static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ),
[this]( int currentIndex ) [this]( int currentIndex )
{ {
Q_UNUSED( currentIndex ); Q_UNUSED( currentIndex )
QHash< QString, QList< LocaleGlobal::Location > > regions = LocaleGlobal::getLocations(); QHash< QString, QList< LocaleGlobal::Location > > regions = LocaleGlobal::getLocations();
if ( !regions.contains( m_regionCombo->currentData().toString() ) ) if ( !regions.contains( m_regionCombo->currentData().toString() ) )
return; return;

2
src/modules/locale/LocaleViewStep.cpp
View File

@ -42,8 +42,6 @@
#include <QNetworkReply> #include <QNetworkReply>
#include <QtConcurrent/QtConcurrentRun> #include <QtConcurrent/QtConcurrentRun>
#include <yaml-cpp/yaml.h>
CALAMARES_PLUGIN_FACTORY_DEFINITION( LocaleViewStepFactory, registerPlugin<LocaleViewStep>(); ) CALAMARES_PLUGIN_FACTORY_DEFINITION( LocaleViewStepFactory, registerPlugin<LocaleViewStep>(); )

8
src/modules/locale/timezonewidget/localeglobal.cpp
View File

@ -148,18 +148,18 @@ LocaleGlobal::initLocations() {
continue; continue;
Location location; Location location;
QStringList timezone = list.at(2).split('/', QString::SkipEmptyParts); QStringList timezoneParts = list.at(2).split('/', QString::SkipEmptyParts);
int cooSplitPos = QString(list.at(1)).remove(0, 1).indexOf(QRegExp("[-+]")) + 1; int cooSplitPos = QString(list.at(1)).remove(0, 1).indexOf(QRegExp("[-+]")) + 1;
if (timezone.size() < 2) if (timezoneParts.size() < 2)
continue; continue;
QString countryCode = list.at(0).trimmed(); QString countryCode = list.at(0).trimmed();
if (countryCode.size() != 2) if (countryCode.size() != 2)
continue; continue;
location.region = timezone.takeFirst(); location.region = timezoneParts.takeFirst();
location.zone = timezone.join( '/' ); location.zone = timezoneParts.join( '/' );
location.latitude = getRightGeoLocation(list.at(1).mid(0, cooSplitPos)); location.latitude = getRightGeoLocation(list.at(1).mid(0, cooSplitPos));
location.longitude = getRightGeoLocation(list.at(1).mid(cooSplitPos)); location.longitude = getRightGeoLocation(list.at(1).mid(cooSplitPos));
location.country = countryCode; location.country = countryCode;

13
src/modules/localecfg/main.py
View File

@ -7,7 +7,7 @@
# Copyright 2015, Philip Müller <philm@manjaro.org> # Copyright 2015, Philip Müller <philm@manjaro.org>
# Copyright 2016, Teo Mrnjavac <teo@kde.org> # Copyright 2016, Teo Mrnjavac <teo@kde.org>
# Copyright 2018, AlmAck <gluca86@gmail.com> # Copyright 2018, AlmAck <gluca86@gmail.com>
# Copyright 2018, Adriaan de Groot <groot@kde.org> # Copyright 2018-2019, Adriaan de Groot <groot@kde.org>
# #
# Calamares is free software: you can redistribute it and/or modify # 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
@ -26,6 +26,17 @@ import os
import re import re
import shutil import shutil
import gettext
_ = gettext.translation("calamares-python",
localedir=libcalamares.utils.gettext_path(),
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
def pretty_name():
return _("Configuring locales.")
RE_IS_COMMENT = re.compile("^ *#") RE_IS_COMMENT = re.compile("^ *#")
def is_comment(line): def is_comment(line):
""" """

20
src/modules/luksbootkeyfile/main.py
View File

@ -5,7 +5,7 @@
# #
# Copyright 2016, Teo Mrnjavac <teo@kde.org> # Copyright 2016, Teo Mrnjavac <teo@kde.org>
# Copyright 2017, Alf Gaida <agaida@siduction.org> # Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2017, Adriaan de Groot <groot@kde.org> # Copyright 2017, 2019, Adriaan de Groot <groot@kde.org>
# #
# Calamares is free software: you can redistribute it and/or modify # 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
@ -21,10 +21,20 @@
# along with Calamares. If not, see <http://www.gnu.org/licenses/>. # along with Calamares. If not, see <http://www.gnu.org/licenses/>.
import libcalamares import libcalamares
from libcalamares.utils import check_target_env_call from libcalamares.utils import check_target_env_call
import gettext
_ = gettext.translation("calamares-python",
localedir=libcalamares.utils.gettext_path(),
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
def pretty_name():
return _("Configuring LUKS key file.")
def run(): def run():
""" """
This module sets up a file crypto_keyfile.bin on the rootfs, assuming the This module sets up a file crypto_keyfile.bin on the rootfs, assuming the
@ -54,10 +64,10 @@ def run():
return None return None
if not luks_root_passphrase: if not luks_root_passphrase:
libcalamares.utils.debug("No LUKS passphrase, root {!s}".format(luks_root_device))
return ( return (
"Encrypted rootfs setup error", _("Encrypted rootfs setup error"),
"Rootfs partition {!s} is LUKS but no passphrase found." _("Rootfs partition {!s} is LUKS but no passphrase found.").format(luks_root_device))
.format(luks_root_device))
# Generate random keyfile # Generate random keyfile
check_target_env_call(["dd", check_target_env_call(["dd",

16
src/modules/luksopenswaphookcfg/main.py
View File

@ -5,6 +5,7 @@
# #
# Copyright 2016, Teo Mrnjavac <teo@kde.org> # Copyright 2016, Teo Mrnjavac <teo@kde.org>
# Copyright 2017, Alf Gaida <agaida@siduction.org> # Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2019, 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
@ -23,6 +24,17 @@ import libcalamares
import os.path import os.path
import gettext
_ = gettext.translation("calamares-python",
localedir=libcalamares.utils.gettext_path(),
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
def pretty_name():
return _("Configuring encrypted swap.")
def write_openswap_conf(partitions, root_mount_point, openswap_conf_path): def write_openswap_conf(partitions, root_mount_point, openswap_conf_path):
swap_outer_uuid = "" swap_outer_uuid = ""
swap_mapper_name = "" swap_mapper_name = ""
@ -80,6 +92,4 @@ def run():
openswap_conf_path = openswap_conf_path.lstrip('/') openswap_conf_path = openswap_conf_path.lstrip('/')
return write_openswap_conf( return write_openswap_conf(partitions, root_mount_point, openswap_conf_path)
partitions, root_mount_point, openswap_conf_path
)

11
src/modules/mount/main.py
View File

@ -5,6 +5,7 @@
# #
# Copyright 2014, Aurélien Gâteau <agateau@kde.org> # Copyright 2014, Aurélien Gâteau <agateau@kde.org>
# Copyright 2017, Alf Gaida <agaida@siduction.org> # Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2019, 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
@ -24,6 +25,16 @@ import subprocess
import libcalamares import libcalamares
import gettext
_ = gettext.translation("calamares-python",
localedir=libcalamares.utils.gettext_path(),
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
def pretty_name():
return _("Mounting partitions.")
def mount_partitions(root_mount_point, partitions): def mount_partitions(root_mount_point, partitions):
""" """

2
src/modules/netinstall/NetInstallPage.cpp
View File

@ -36,8 +36,6 @@
#include <QHeaderView> #include <QHeaderView>
#include <yaml-cpp/yaml.h>
using CalamaresUtils::yamlToVariant; using CalamaresUtils::yamlToVariant;
NetInstallPage::NetInstallPage( QWidget* parent ) NetInstallPage::NetInstallPage( QWidget* parent )

2
src/modules/netinstall/PackageModel.cpp
View File

@ -127,7 +127,7 @@ bool
PackageModel::setHeaderData( int section, Qt::Orientation orientation, PackageModel::setHeaderData( int section, Qt::Orientation orientation,
const QVariant& value, int role ) const QVariant& value, int role )
{ {
Q_UNUSED( role ); Q_UNUSED( role )
if ( orientation == Qt::Horizontal ) if ( orientation == Qt::Horizontal )
{ {

5
src/modules/netinstall/PackageModel.h
View File

@ -27,7 +27,10 @@
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <yaml-cpp/yaml.h> namespace YAML
{
class Node;
}
class PackageModel : public QAbstractItemModel class PackageModel : public QAbstractItemModel
{ {

11
src/modules/networkcfg/main.py
View File

@ -6,6 +6,7 @@
# Copyright 2014, Philip Müller <philm@manjaro.org> # Copyright 2014, Philip Müller <philm@manjaro.org>
# Copyright 2014, Teo Mrnjavac <teo@kde.org> # Copyright 2014, Teo Mrnjavac <teo@kde.org>
# Copyright 2017, Alf Gaida <agaida@siduction.org> # Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2019, 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
@ -25,6 +26,16 @@ import shutil
import libcalamares import libcalamares
import gettext
_ = gettext.translation("calamares-python",
localedir=libcalamares.utils.gettext_path(),
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
def pretty_name():
return _("Saving network configuration.")
def run(): def run():
""" """

15
src/modules/openrcdmcryptcfg/main.py
View File

@ -4,6 +4,7 @@
# === This file is part of Calamares - <https://github.com/calamares> === # === This file is part of Calamares - <https://github.com/calamares> ===
# #
# Copyright 2017, Ghiunhan Mamut <venerix@redcorelinux.org> # Copyright 2017, Ghiunhan Mamut <venerix@redcorelinux.org>
# Copyright 2019, 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
@ -18,9 +19,21 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Calamares. If not, see <http://www.gnu.org/licenses/>. # along with Calamares. If not, see <http://www.gnu.org/licenses/>.
import libcalamares
import os.path import os.path
import libcalamares
import gettext
_ = gettext.translation("calamares-python",
localedir=libcalamares.utils.gettext_path(),
languages=libcalamares.utils.gettext_languages(),
fallback=True).gettext
def pretty_name():
return _("Configuring OpenRC dmcrypt service.")
def write_dmcrypt_conf(partitions, root_mount_point, dmcrypt_conf_path): def write_dmcrypt_conf(partitions, root_mount_point, dmcrypt_conf_path):
crypto_target = "" crypto_target = ""
crypto_source = "" crypto_source = ""

23
src/modules/partition/core/DeviceList.cpp
View File

@ -54,17 +54,22 @@ hasRootPartition( Device* device )
} }
static bool static bool
isIso9660( const Device* device ) blkIdCheckIso9660( const QString& path )
{ {
QString path = device->deviceNode();
if ( path.isEmpty() )
return false;
QProcess blkid; QProcess blkid;
blkid.start( "blkid", { path } ); blkid.start( "blkid", { path } );
blkid.waitForFinished(); blkid.waitForFinished();
QString output = QString::fromLocal8Bit( blkid.readAllStandardOutput() ); QString output = QString::fromLocal8Bit( blkid.readAllStandardOutput() );
if ( output.contains( "iso9660" ) ) return output.contains( "iso9660" );
}
static bool
isIso9660( const Device* device )
{
const QString path = device->deviceNode();
if ( path.isEmpty() )
return false;
if ( blkIdCheckIso9660( path ) )
return true; return true;
if ( device->partitionTable() && if ( device->partitionTable() &&
@ -72,11 +77,7 @@ isIso9660( const Device* device )
{ {
for ( const Partition* partition : device->partitionTable()->children() ) for ( const Partition* partition : device->partitionTable()->children() )
{ {
path = partition->partitionPath(); if ( blkIdCheckIso9660( partition->partitionPath() ) )
blkid.start( "blkid", { path } );
blkid.waitForFinished();
QString output = QString::fromLocal8Bit( blkid.readAllStandardOutput() );
if ( output.contains( "iso9660" ) )
return true; return true;
} }
} }

309
src/modules/partition/core/PartUtils.cpp
View File

@ -43,6 +43,216 @@
namespace PartUtils namespace PartUtils
{ {
static const NamedEnumTable<SizeUnit>&
unitSuffixes()
{
static const NamedEnumTable<SizeUnit> names{
{ QStringLiteral( "%" ), SizeUnit::Percent },
{ QStringLiteral( "B" ), SizeUnit::Byte },
{ QStringLiteral( "K" ), SizeUnit::KiB },
{ QStringLiteral( "M" ), SizeUnit::MiB },
{ QStringLiteral( "G" ), SizeUnit::GiB }
};
return names;
}
PartSize::PartSize( const QString& s )
: NamedSuffix( unitSuffixes(), s )
{
if ( ( unit() == SizeUnit::Percent ) && ( value() > 100 || value() < 0 ) )
{
cDebug() << "Percent value" << value() << "is not valid.";
m_value = 0;
}
if ( m_unit == SizeUnit::None )
{
m_value = s.toInt();
if ( m_value > 0 )
m_unit = SizeUnit::Byte;
}
if ( m_value <= 0 )
{
m_value = 0;
m_unit = SizeUnit::None;
}
}
qint64
PartSize::toSectors( qint64 totalSectors, qint64 sectorSize ) const
{
if ( !isValid() )
return -1;
if ( totalSectors < 1 || sectorSize < 1 )
return -1;
switch ( m_unit )
{
case unit_t::None:
return -1;
case unit_t::Percent:
if ( value() == 100 )
return totalSectors; // Common-case, avoid futzing around
else
return totalSectors * value() / 100;
case unit_t::Byte:
case unit_t::KiB:
case unit_t::MiB:
case unit_t::GiB:
return bytesToSectors ( toBytes(), sectorSize );
}
return -1;
}
qint64
PartSize::toBytes( qint64 totalSectors, qint64 sectorSize ) const
{
if ( !isValid() )
return -1;
switch ( m_unit )
{
case unit_t::None:
return -1;
case unit_t::Percent:
if ( totalSectors < 1 || sectorSize < 1 )
return -1;
if ( value() == 100 )
return totalSectors * sectorSize; // Common-case, avoid futzing around
else
return totalSectors * value() / 100;
case unit_t::Byte:
case unit_t::KiB:
case unit_t::MiB:
case unit_t::GiB:
return toBytes();
}
// notreached
return -1;
}
qint64
PartSize::toBytes( qint64 totalBytes ) const
{
if ( !isValid() )
return -1;
switch ( m_unit )
{
case unit_t::None:
return -1;
case unit_t::Percent:
if ( totalBytes < 1 )
return -1;
if ( value() == 100 )
return totalBytes; // Common-case, avoid futzing around
else
return totalBytes * value() / 100;
case unit_t::Byte:
case unit_t::KiB:
case unit_t::MiB:
case unit_t::GiB:
return toBytes();
}
// notreached
return -1;
}
qint64
PartSize::toBytes() const
{
if ( !isValid() )
return -1;
switch ( m_unit )
{
case unit_t::Byte:
return value();
case unit_t::KiB:
return CalamaresUtils::KiBtoBytes( static_cast<unsigned long long>( value() ) );
case unit_t::MiB:
return CalamaresUtils::MiBtoBytes( static_cast<unsigned long long>( value() ) );
case unit_t::GiB:
return CalamaresUtils::GiBtoBytes( static_cast<unsigned long long>( value() ) );
default:
break;
}
// Reached only when unit is Percent or None
return -1;
}
bool
PartSize::operator< ( const PartSize& other ) const
{
if ( ( m_unit == SizeUnit::None || other.m_unit == SizeUnit::None ) ||
( m_unit == SizeUnit::Percent && other.m_unit != SizeUnit::Percent ) ||
( m_unit != SizeUnit::Percent && other.m_unit == SizeUnit::Percent ) )
return false;
switch ( m_unit )
{
case SizeUnit::Percent:
return ( m_value < other.m_value );
case SizeUnit::Byte:
case SizeUnit::KiB:
case SizeUnit::MiB:
case SizeUnit::GiB:
return ( toBytes() < other.toBytes () );
}
return false;
}
bool
PartSize::operator> ( const PartSize& other ) const
{
if ( ( m_unit == SizeUnit::None || other.m_unit == SizeUnit::None ) ||
( m_unit == SizeUnit::Percent && other.m_unit != SizeUnit::Percent ) ||
( m_unit != SizeUnit::Percent && other.m_unit == SizeUnit::Percent ) )
return false;
switch ( m_unit )
{
case SizeUnit::Percent:
return ( m_value > other.m_value );
case SizeUnit::Byte:
case SizeUnit::KiB:
case SizeUnit::MiB:
case SizeUnit::GiB:
return ( toBytes() > other.toBytes () );
}
return false;
}
bool
PartSize::operator== ( const PartSize& other ) const
{
if ( ( m_unit == SizeUnit::None || other.m_unit == SizeUnit::None ) ||
( m_unit == SizeUnit::Percent && other.m_unit != SizeUnit::Percent ) ||
( m_unit != SizeUnit::Percent && other.m_unit == SizeUnit::Percent ) )
return false;
switch ( m_unit )
{
case SizeUnit::Percent:
return ( m_value == other.m_value );
case SizeUnit::Byte:
case SizeUnit::KiB:
case SizeUnit::MiB:
case SizeUnit::GiB:
return ( toBytes() == other.toBytes () );
}
return false;
}
QString QString
convenienceName( const Partition* const candidate ) convenienceName( const Partition* const candidate )
{ {
@ -163,14 +373,14 @@ canBeResized( Partition* candidate )
} }
else if ( ok ) else if ( ok )
{ {
auto deb = cDebug(); Logger::CDebug deb;
deb << Logger::SubEntry << "NO, insufficient storage"; deb << Logger::SubEntry << "NO, insufficient storage";
deb << Logger::Continuation << "Required storage B:" << advisedStorageB deb << Logger::Continuation << "Required storage B:" << advisedStorageB
<< QString( "(%1GB)" ).arg( advisedStorageGB ); << QString( "(%1GB)" ).arg( advisedStorageGB );
deb << Logger::Continuation << "Available storage B:" << availableStorageB deb << Logger::Continuation << "Available storage B:" << availableStorageB
<< QString( "(%1GB)" ).arg( availableStorageB / 1024 / 1024 / 1024 ) << QString( "(%1GB)" ).arg( availableStorageB / 1024 / 1024 / 1024 )
<< "for" << convenienceName( candidate ) << " length:" << candidate->length() << "for" << convenienceName( candidate ) << "length:" << candidate->length()
<< " sectorsUsed:" << candidate->sectorsUsed() << " fsType:" << candidate->fileSystem().name(); << "sectorsUsed:" << candidate->sectorsUsed() << "fsType:" << candidate->fileSystem().name();
return false; return false;
} }
else else
@ -484,99 +694,6 @@ findFS( QString fsName, FileSystem::Type* fsType )
return fsName; return fsName;
} }
static qint64
sizeToBytes( double size, SizeUnit unit, qint64 totalSize )
{
qint64 bytes;
switch ( unit )
{
case SizeUnit::Percent:
bytes = qint64( static_cast<double>( totalSize ) * size / 100.0L );
break;
case SizeUnit::KiB:
bytes = CalamaresUtils::KiBtoBytes(size);
break;
case SizeUnit::MiB:
bytes = CalamaresUtils::MiBtoBytes(size);
break;
case SizeUnit::GiB:
bytes = CalamaresUtils::GiBtoBytes(size);
break;
default:
bytes = size;
break;
}
return bytes;
}
double
parseSizeString( const QString& sizeString, SizeUnit* unit )
{
double value;
bool ok;
QString valueString;
QString unitString;
QRegExp rx( "[KkMmGg%]" );
int pos = rx.indexIn( sizeString );
if (pos > 0)
{
valueString = sizeString.mid( 0, pos );
unitString = sizeString.mid( pos );
}
else
valueString = sizeString;
value = valueString.toDouble( &ok );
if ( !ok )
{
/*
* In case the conversion fails, a size of 100% allows a few cases to pass
* anyway (e.g. when it is the last partition of the layout)
*/
*unit = SizeUnit::Percent;
return 100.0L;
}
if ( unitString.length() > 0 )
{
if ( unitString.at(0) == '%' )
*unit = SizeUnit::Percent;
else if ( unitString.at(0).toUpper() == 'K' )
*unit = SizeUnit::KiB;
else if ( unitString.at(0).toUpper() == 'M' )
*unit = SizeUnit::MiB;
else if ( unitString.at(0).toUpper() == 'G' )
*unit = SizeUnit::GiB;
else
*unit = SizeUnit::Byte;
}
else
{
*unit = SizeUnit::Byte;
}
return value;
}
qint64
parseSizeString( const QString& sizeString, qint64 totalSize )
{
SizeUnit unit;
double value = parseSizeString( sizeString, &unit );
return sizeToBytes( value, unit, totalSize );
}
qint64
sizeToSectors( double size, SizeUnit unit, qint64 totalSectors, qint64 logicalSize )
{
qint64 bytes = sizeToBytes( size, unit, totalSectors * logicalSize );
return bytesToSectors( static_cast<unsigned long long>( bytes ), logicalSize );
}
} // nmamespace PartUtils } // nmamespace PartUtils
/* Implementation of methods for FstabEntry, from OsproberEntry.h */ /* Implementation of methods for FstabEntry, from OsproberEntry.h */

Some files were not shown because too many files have changed in this diff Show More