diff --git a/CHANGES-3.2 b/CHANGES-3.2
index b897c1b353eb07b9296cd75edc19c060ba057063..acb774e81247916a86a8f6c5f85db0029ab9b276 100644
--- a/CHANGES-3.2
+++ b/CHANGES-3.2
@@ -10,16 +10,52 @@ website will have to do for older versions.
> Note that the 3.2 series is now in LTS / bug-fix-only mode.
-# 3.2.60 (unreleased) #
+# 3.2.61 (2022-08-24) #
+
+This is the second community-maintainence release of Calamares 3.2.
+It corrects a handful of bugs foud in the stable release. There
+are also translation updates.
This release contains contributions from (alphabetically by first name):
- - No external contributors yet
+ - Adriaan de Groot
+ - Anke Boersma
## Core ##
- - No core changes yet
+ - The "About" and "Debug" buttons in a QWidgets-based panel were no
+ longer translated. This has been fixed (by re-using translations
+ of the same buttons from the QML module. #2030 (Thanks Anke)
## Modules ##
- - No module changes yet
+ - *bootloader* Python code slipped in that was incompatible with
+ the minimum required Python version. #2033 (Thanks Adriaan)
+ - *locale* fixes a large regression introduced with 3.2.60, where
+ the location picked for many locales was not the same as in 3.2.59,
+ and generally peculiar (e.g. picking "English" led to "en_AG" which
+ is nice if you are in Bermuda, but not expected in the rest of the
+ world). #2008
+ - *luksopenswaphookcfg* Remove duplicate options. #1659 (Thanks Anke)
+
+
+# 3.2.60 (2022-06-19) #
+
+This is the first community-maintainence release of Calamares 3.2.
+Somewhat ironically, all the commits in the branch come from
+Adriaan de Groot -- the community is working in the 3.3 (*calamares*)
+branch.
+
+## Core ##
+ - No core changes
+
+## Modules ##
+ - *fstab* now warns when the mount options are empty (which is non-
+ sensical, and indicates that the configuration is bad).
+ - *locale* does a better job of preserving Catalan (Valencia)
+ across modules; previously it dropped the *Valencia*
+ after the locale module unless you specifically re-selected
+ `ca@valencia` in the locale module. (Reported by Lliurex)
+ - *welcome* now has text labels on the special buttons (nominally,
+ this is part of the core, but the *About* button was always on the
+ welcome page).
# 3.2.59 (2022-05-29) #
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80a8170bd217423dfc2094b37da7807dec81546f..4782e11fde9bcdfce50d80255273e3a3fc1e8153 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@
# TODO:3.3: Require CMake 3.12
cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
project( CALAMARES
- VERSION 3.2.60
+ VERSION 3.2.61
LANGUAGES C CXX
)
diff --git a/calamares.desktop b/calamares.desktop
index 9a1416e16b51932023d0eaac3d46bf5ef5b92337..97ad28de8067f0d40e2ff7fd61b6f9dbf5ab6a01 100644
--- a/calamares.desktop
+++ b/calamares.desktop
@@ -229,6 +229,10 @@ Name[uk]=Встановити Систему
Icon[uk]=calamares
GenericName[uk]=Встановлювач системи
Comment[uk]=Calamares - Встановлювач системи
+Name[uz]=O'rnatish
+Icon[uz]=calamares
+GenericName[uz]=Sistema o'rnatuvchisi
+Comment[uz]=Calamares — Sistema o'rnatuvchisi
Name[vi]=Cài đặt hệ thống
Icon[vi]=calamares
GenericName[vi]=Bộ cài đặt hệ thống
diff --git a/ci/abicheck.sh b/ci/abicheck.sh
new file mode 100755
index 0000000000000000000000000000000000000000..31e50e6997c64031b3792676ce00df5b80fd1adc
--- /dev/null
+++ b/ci/abicheck.sh
@@ -0,0 +1,74 @@
+#! /bin/sh
+#
+# SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Compares the ABI of the current working tree with the ABI
+# from a base-version. Uses libabigail for the actual comparison.
+#
+# To use the tool, just run the script. It will build Calamares at
+# least once, maybe twice (if it needs the base-version ABI information
+# and hasn't cached it).
+
+# The base version can be a tag or git-hash; it will be checked-out
+# in a worktree.
+#
+# Note that the hash here now is 3.2.60, which is sort-of-the
+# start of LTS releases. We try to keep ABI compatibility from
+# there on out.
+BASE_VERSION=b11ee3abc583e571e588fd00afb99d1a528373e6
+
+### Build a tree and cache the ABI info into ci/
+#
+#
+do_build() {
+ LABEL=$1
+ SOURCE_DIR=$2
+
+ BUILD_DIR=build-abi-$LABEL
+ rm -rf $BUILD_DIR
+ mkdir $BUILD_DIR
+
+ if ( cd $BUILD_DIR && cmake $SOURCE_DIR -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-Og -g -gdwarf" -DCMAKE_C_FLAGS="-Og -g -gdwarf" && make -j12 ) > /dev/null 2>&1
+ then
+ ls -1 $BUILD_DIR/libcalamares*.so.*
+ # Copy the un-versioned files; .so is a symlink to the just-built one
+ for lib in $BUILD_DIR/libcalamares*.so
+ do
+ cp $lib ci/`basename $lib`.$LABEL
+ done
+ else
+ echo "! failed to build $LABEL"
+ exit 1
+ fi
+}
+
+### Build current tree and get ABI info
+#
+#
+do_build current `pwd -P`
+
+### Build ABI base version
+#
+# We cache this to save on some build time, if we are chasing a
+# single branch from an unchanging base version.
+#
+if test -f ci/libcalamares.so.$BASE_VERSION
+then
+ # The ABI version is cached, so we're good
+ :
+else
+ git worktree remove --force tree-abi-$BASE_VERSION
+ git worktree add tree-abi-$BASE_VERSION $BASE_VERSION > /dev/null 2>&1 || { echo "! could not create worktree for $BASE_VERSION" ; exit 1 ; }
+ do_build $BASE_VERSION $( cd tree-abi-$BASE_VERSION && pwd -P )
+fi
+
+### Compare & Report
+#
+# abidiff compares the Application Binary Interfaces (ABI) of two
+# shared libraries in ELF format. It emits a meaningful report describing
+# the differences between the two ABIs.
+#
+# -l prints only the leaf changes, leaving out explanations of why.
+#
+abidiff -l ci/libcalamares.so.$BASE_VERSION ci/libcalamares.so.current
diff --git a/ci/txcheck.sh b/ci/txcheck.sh
index cedae6682bb5e3965c0e0887b21f2a51b0260567..78b7f00b18d4ee3e653ffce216a897bef11abc19 100755
--- a/ci/txcheck.sh
+++ b/ci/txcheck.sh
@@ -120,7 +120,7 @@ tx_sum()
WORKTREE_NAME="$1"
WORKTREE_TAG="$2"
- git worktree add $WORKTREE_NAME $WORKTREE_TAG > /dev/null 2>&1 || { echo "! Could not create worktree." ; exit 1 ; }
+ git worktree add -d $WORKTREE_NAME $WORKTREE_TAG > /dev/null 2>&1 || { echo "! Could not create worktree." ; exit 1 ; }
( cd $WORKTREE_NAME && sh "$CURDIR"/ci/txpush.sh --no-tx ) > /dev/null 2>&1 || { echo "! Could not re-create translations." ; exit 1 ; }
# Remove linenumbers from .ts (XML) and .pot
diff --git a/ci/txpush.sh b/ci/txpush.sh
index ac806a2fa4dcdcecfde0194f2a05f9e6ddf5422e..1a0a7249b6e619323f79a8a9e115a908a7b1a972 100755
--- a/ci/txpush.sh
+++ b/ci/txpush.sh
@@ -124,8 +124,8 @@ tx push --source --no-interactive -r calamares.fdo
PYGETTEXT="xgettext --keyword=_n:1,2 -L python"
SHARED_PYTHON=""
-for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do
- FILES=$(find "$MODULE_DIR" -name "*.py" -a -type f)
+for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d | sort) ; do
+ FILES=$(find "$MODULE_DIR" -name "*.py" -a -type f | sort)
if test -n "$FILES" ; then
MODULE_NAME=$(basename ${MODULE_DIR})
if [ -d ${MODULE_DIR}/lang ]; then
diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts
index dddf401e6464a775873be221bdc887c59c01431a..089084a93ca381985887aa2b9956706e7a95daef 100644
--- a/lang/calamares_ar.ts
+++ b/lang/calamares_ar.ts
@@ -511,12 +511,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 المثبت</translation>
</message>
@@ -785,27 +785,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>اضبط طراز لوحة المفتاتيح ليكون %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>اضبط تخطيط لوحة المفاتيح إلى %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3140,7 +3140,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4172,14 +4172,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>التدقيق</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>أظهر معلومات التّنقيح</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_as.ts b/lang/calamares_as.ts
index 522894af46c2341e38c522887724baeca2eb8190..1f9bfcff58126d1bde099b77423bd8dc99e0d660 100644
--- a/lang/calamares_as.ts
+++ b/lang/calamares_as.ts
@@ -503,12 +503,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 চেত্ আপ প্ৰোগ্ৰেম</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 ইনস্তলাৰ</translation>
</message>
@@ -777,27 +777,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>কিবোৰ্ডৰ মডেল %1ত চেট্ কৰক।<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>কিবোৰ্ডৰ লেআউট %1/%2 চেট্ কৰক।</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>সময় অঞ্চলৰ সিদ্ধান্ত কৰক %`1%2</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>চিছটেমৰ ভাষা %1লৈ সলনি কৰা হ'ব।</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>সংখ্যা আৰু তাৰিখ স্থানীয় %1লৈ সলনি কৰা হ'ব।</translation>
</message>
@@ -3101,7 +3101,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4134,14 +4134,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>সম্পর্কে</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>দিবাগ তথ্য দেখাওক</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts
index 86ced11f3992e8f136608723ed2e3572a7694d2e..a3f4496c617a56b896bf82fe390188aa4868150d 100644
--- a/lang/calamares_ast.ts
+++ b/lang/calamares_ast.ts
@@ -503,12 +503,12 @@ L'instalador va colar y van perdese tolos cambeos.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Programa de configuración de %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Instalador de %1</translation>
</message>
@@ -777,27 +777,27 @@ L'instalador va colar y van perdese tolos cambeos.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Va afitase'l modelu del tecláu a %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Va afitase la distrubución del tecláu a %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>La llingua del sistema va afitase a %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>La númberación y data van afitase en %1.</translation>
</message>
@@ -3099,7 +3099,7 @@ Salida:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4134,14 +4134,26 @@ Salida:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Amosar la depuración</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts
index 45e5d6c9050fdf088875d84b4916b2538433105f..7ac53da2e3ee6be4b1a86be450b503a7af988638 100644
--- a/lang/calamares_az.ts
+++ b/lang/calamares_az.ts
@@ -507,12 +507,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 Quraşdırıcı proqram</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Quraşdırıcı</translation>
</message>
@@ -781,27 +781,27 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Klaviatura modelini %1 olaraq təyin etmək.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Klaviatura qatını %1/%2 olaraq təyin etmək.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Saat quraşağını təyin etmək %1/%2</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Sistem dili %1 təyin ediləcək.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Yerli say və tarix formatı %1 təyin olunacaq.</translation>
</message>
@@ -3106,7 +3106,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4141,14 +4141,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Haqqında</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Sazlama</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Calamares haqqında məlumatlar göstərilsin</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Sazlama məlumatlarını göstərmək</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts
index 7949ea4a8a6de82ace54e8c8894da890a6530f33..68df091b1f14fa3c3d2c2393ccd110c180c76933 100644
--- a/lang/calamares_az_AZ.ts
+++ b/lang/calamares_az_AZ.ts
@@ -507,12 +507,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 Quraşdırıcı proqram</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Quraşdırıcı</translation>
</message>
@@ -781,27 +781,27 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Klaviatura modelini %1 olaraq təyin etmək.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Klaviatura qatını %1/%2 olaraq təyin etmək.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Saat quraşağını təyin etmək %1/%2</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Sistem dili %1 təyin ediləcək.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Yerli say və tarix formatı %1 təyin olunacaq.</translation>
</message>
@@ -3106,7 +3106,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4141,14 +4141,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Haqqında</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Sazlama</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Calamares haqqında məlumatlar göstərilsin</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Sazlama məlumatlarını göstərmək</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts
index 6eaa90eca8d1c062b8ebfe284b4c977c6199aae7..3df0147cba00a82070ed19476cf052abad9f528b 100644
--- a/lang/calamares_be.ts
+++ b/lang/calamares_be.ts
@@ -505,12 +505,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Праграма ўсталёўкі %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Праграма ўсталёўкі %1</translation>
</message>
@@ -779,27 +779,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Вызначыць мадэль клавіятуры %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Вызначыць раскладку клавіятуры %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Вызначыць часавы пояс %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Сістэмнай мовай будзе зроблена %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Рэгіянальным фарматам лічбаў і датаў будзе %1.</translation>
</message>
@@ -3121,7 +3121,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4156,14 +4156,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Пра праграму</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Паказаць адладачную інфармацыю</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts
index a3a4804c5f6f83f0313d54aeb41de5136f8a3962..2c54c87b1f296d8a799f3ad535ca87cf7b214523 100644
--- a/lang/calamares_bg.ts
+++ b/lang/calamares_bg.ts
@@ -6,18 +6,18 @@
<message>
<location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
<source><h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/></source>
- <translation type="unfinished"/>
+ <translation><h1> %1</h1><br/><strong>%2<br/> за %3</strong><br/><br/></translation>
</message>
<message>
<location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
<source>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
- <translation type="unfinished"/>
+ <translation>Благодарности на <a href="https://calamares.io/team/"> екипа на Calamares </a> и на <a href="https://www.transifex.com/calamares/calamares/"> преводачите на Calamares </a>.<br/><br/><a href="https://calamares.io/">Calamares</a> е спонсориран от <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
<location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
<source>Copyright %1-%2 %3 &lt;%4&gt;<br/></source>
<extracomment>Copyright year-year Name <email-address></extracomment>
- <translation type="unfinished"/>
+ <translation>Copyright %1-%2 %3 &lt;%4&gt;<br/></translation>
</message>
</context>
<context>
@@ -25,7 +25,7 @@
<message>
<location filename="../src/modules/partition/jobs/AutoMountManagementJob.cpp" line="22"/>
<source>Manage auto-mount settings</source>
- <translation type="unfinished"/>
+ <translation>Управление на настройките за автоматично монтиране</translation>
</message>
</context>
<context>
@@ -123,37 +123,37 @@
<message>
<location filename="../src/calamares/DebugWindow.ui" line="102"/>
<source>Crashes Calamares, so that Dr. Konqui can look at it.</source>
- <translation type="unfinished"/>
+ <translation>Предизвиква срив на Calamares, за да може Dr.Konqui да го анализира.</translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="115"/>
<source>Reloads the stylesheet from the branding directory.</source>
- <translation type="unfinished"/>
+ <translation>Презарежда стиловата таблица от директорията за брандиране.</translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="141"/>
<source>Uploads the session log to the configured pastebin.</source>
- <translation type="unfinished"/>
+ <translation>Качете дневника на сесията в конфигурирания pastebin.</translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="144"/>
<source>Send Session Log</source>
- <translation type="unfinished"/>
+ <translation>Изпращане на дневника на сесията</translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="118"/>
<source>Reload Stylesheet</source>
- <translation type="unfinished"/>
+ <translation>Презареждане на таблицата със стилове</translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="128"/>
<source>Displays the tree of widget names in the log (for stylesheet debugging).</source>
- <translation type="unfinished"/>
+ <translation>Показва в йерархичен вид имената на уиджети в дневника (за отстраняване на грешки в таблицата със стилове).</translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.ui" line="131"/>
<source>Widget Tree</source>
- <translation type="unfinished"/>
+ <translation>Структура на уиджети</translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.cpp" line="244"/>
@@ -166,7 +166,7 @@
<message>
<location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="118"/>
<source>Set up</source>
- <translation type="unfinished"/>
+ <translation>Настройване</translation>
</message>
<message>
<location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="118"/>
@@ -184,7 +184,7 @@
<message>
<location filename="../src/libcalamares/JobExample.cpp" line="30"/>
<source>Programmed job failure was explicitly requested.</source>
- <translation type="unfinished"/>
+ <translation>Изрично е поискан отказ на програмираната задача.</translation>
</message>
</context>
<context>
@@ -208,12 +208,12 @@
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="42"/>
<source>Run command '%1' in target system.</source>
- <translation type="unfinished"/>
+ <translation>Изпълнение на команда "%1" в целевата система.</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="42"/>
<source> Run command '%1'.</source>
- <translation type="unfinished"/>
+ <translation>Изпълняване на команда '%1'.</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="49"/>
@@ -259,17 +259,17 @@
<message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="67"/>
<source>Loading ...</source>
- <translation type="unfinished"/>
+ <translation>Зареждане...</translation>
</message>
<message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="88"/>
<source>QML Step <i>%1</i>.</source>
- <translation type="unfinished"/>
+ <translation>QML Стъпка <i>%1</i>.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="268"/>
<source>Loading failed.</source>
- <translation type="unfinished"/>
+ <translation>Неуспешно зареждане.</translation>
</message>
</context>
<context>
@@ -277,28 +277,28 @@
<message>
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="94"/>
<source>Requirements checking for module <i>%1</i> is complete.</source>
- <translation type="unfinished"/>
+ <translation>Проверката на изискванията на модул <i>%1</i> е завършена.</translation>
</message>
<message numerus="yes">
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="118"/>
<source>Waiting for %n module(s).</source>
- <translation type="unfinished">
- <numerusform/>
- <numerusform/>
+ <translation>
+ <numerusform>Изчакване на %n модул.</numerusform>
+ <numerusform>Изчакване на %n модули.</numerusform>
</translation>
</message>
<message numerus="yes">
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="119"/>
<source>(%n second(s))</source>
- <translation type="unfinished">
- <numerusform/>
- <numerusform/>
+ <translation>
+ <numerusform>(%n секунда)</numerusform>
+ <numerusform>(%n секунди)</numerusform>
</translation>
</message>
<message>
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="124"/>
<source>System-requirements checking is complete.</source>
- <translation type="unfinished"/>
+ <translation>Проверката на системните изисквания е завършена.</translation>
</message>
</context>
<context>
@@ -306,7 +306,7 @@
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="160"/>
<source>Setup Failed</source>
- <translation type="unfinished"/>
+ <translation>Настройването е неуспешно</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="160"/>
@@ -336,12 +336,12 @@
<message>
<location filename="../src/libcalamaresui/utils/Paste.cpp" line="184"/>
<source>Install Log Paste URL</source>
- <translation type="unfinished"/>
+ <translation>Инсталиране на дневник Вмъкване на URL адрес</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/Paste.cpp" line="166"/>
<source>The upload was unsuccessful. No web-paste was done.</source>
- <translation type="unfinished"/>
+ <translation>Качването беше неуспешно. Не беше направено поставяне в мрежата.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/Paste.cpp" line="178"/>
@@ -350,7 +350,11 @@
%1
Link copied to clipboard</source>
- <translation type="unfinished"/>
+ <translation>Дневникът на инсталирането е публикуван в
+
+%1
+
+Връзката е копирана в клипборда</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="189"/>
@@ -375,12 +379,12 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="310"/>
<source>Continue with installation?</source>
- <translation type="unfinished"/>
+ <translation>Да се продължи ли инсталирането?</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="312"/>
<source>The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong></source>
- <translation type="unfinished"/>
+ <translation>Програмата за настройване на %1 е на път да направи промени на вашия диск, за да инсталира %2. <br/><strong> Няма да можете да отмените тези промени.</strong></translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="315"/>
@@ -390,7 +394,7 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="318"/>
<source>&Set up now</source>
- <translation type="unfinished"/>
+ <translation>& Настройване сега</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="318"/>
@@ -405,7 +409,7 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="376"/>
<source>&Set up</source>
- <translation type="unfinished"/>
+ <translation>&Настройване</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="376"/>
@@ -415,7 +419,7 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="378"/>
<source>Setup is complete. Close the setup program.</source>
- <translation type="unfinished"/>
+ <translation>Настройката е завършена. Затворете програмата за настройка.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="379"/>
@@ -425,7 +429,7 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="381"/>
<source>Cancel setup without changing the system.</source>
- <translation type="unfinished"/>
+ <translation>Отмяна на настройването без промяна на системата.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="382"/>
@@ -455,7 +459,7 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="495"/>
<source>Cancel setup?</source>
- <translation type="unfinished"/>
+ <translation>Отмяна на настройването?</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="495"/>
@@ -466,7 +470,8 @@ Link copied to clipboard</source>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="496"/>
<source>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</source>
- <translation type="unfinished"/>
+ <translation>Наистина ли искате да анулирате текущия процес на настройване?
+Инсталирането ще се отмени и всички промени ще бъдат загубени.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="498"/>
@@ -502,12 +507,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
- <translation type="unfinished"/>
+ <translation>%1 програма за настройка</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Инсталатор</translation>
</message>
@@ -517,12 +522,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="32"/>
<source>Set filesystem label on %1.</source>
- <translation type="unfinished"/>
+ <translation>Задаване на етикета на файловата система на %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="39"/>
<source>Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.</source>
- <translation type="unfinished"/>
+ <translation>Задаване на етикет на файлова система <strong>%1 </strong> в дял <strong>%2 </strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="70"/>
@@ -581,7 +586,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1048"/>
<source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source>
- <translation type="unfinished"/>
+ <translation> %1 ще бъде намален до %2MiB и ще бъде създаден нов %3MiB дял за %4.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1106"/>
@@ -655,42 +660,42 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1554"/>
<source>This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/></source>
- <translation type="unfinished"/>
+ <translation>Това устройство за съхранение вече има операционна система върху него, но таблицатас дялове <strong>%1 </strong> е различна от необходимата <strong>%2 </strong>.<br/></translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1577"/>
<source>This storage device has one of its partitions <strong>mounted</strong>.</source>
- <translation type="unfinished"/>
+ <translation>Това устройство за съхранение има <strong> монтиран </strong> дял.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1582"/>
<source>This storage device is a part of an <strong>inactive RAID</strong> device.</source>
- <translation type="unfinished"/>
+ <translation>Това устройство за съхранение е част от <strong> неактивно RAID </strong> устройство.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1701"/>
<source>No Swap</source>
- <translation type="unfinished"/>
+ <translation>Без swap</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1710"/>
<source>Reuse Swap</source>
- <translation type="unfinished"/>
+ <translation>Повторно използване на swap</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1713"/>
<source>Swap (no Hibernate)</source>
- <translation type="unfinished"/>
+ <translation>Swap (без Хибернация)</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1716"/>
<source>Swap (with Hibernate)</source>
- <translation type="unfinished"/>
+ <translation>Swap (с Хибернация)</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1719"/>
<source>Swap to file</source>
- <translation type="unfinished"/>
+ <translation>Swap във файл</translation>
</message>
</context>
<context>
@@ -698,27 +703,27 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="272"/>
<source>Successfully unmounted %1.</source>
- <translation type="unfinished"/>
+ <translation>Успешно демонтиране на %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="279"/>
<source>Successfully disabled swap %1.</source>
- <translation type="unfinished"/>
+ <translation>Успешно деактивиране на swap %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="305"/>
<source>Successfully cleared swap %1.</source>
- <translation type="unfinished"/>
+ <translation>Успешно изчистване на swap %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="319"/>
<source>Successfully closed mapper device %1.</source>
- <translation type="unfinished"/>
+ <translation>Успешно затваряне на mapper устройство %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="332"/>
<source>Successfully disabled volume group %1.</source>
- <translation type="unfinished"/>
+ <translation>Успешно деактивиране на група дялове %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="371"/>
@@ -776,34 +781,34 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Постави модел на клавиатурата на %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Постави оформлението на клавиатурата на %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
- <translation type="unfinished"/>
+ <translation>Задаване на часовата зона на %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Системният език ще бъде %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Форматът на цифрите и датата ще бъде %1.</translation>
</message>
<message>
<location filename="../src/modules/netinstall/Config.cpp" line="53"/>
<source>Network Installation. (Disabled: Incorrect configuration)</source>
- <translation type="unfinished"/>
+ <translation>Мрежова инсталация. (Деактивирано: Неправилна конфигурация)</translation>
</message>
<message>
<location filename="../src/modules/netinstall/Config.cpp" line="55"/>
@@ -813,12 +818,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/netinstall/Config.cpp" line="57"/>
<source>Network Installation. (Disabled: Internal error)</source>
- <translation type="unfinished"/>
+ <translation>Мрежова инсталация. (Деактивирано: Вътрешна грешка)</translation>
</message>
<message>
<location filename="../src/modules/netinstall/Config.cpp" line="61"/>
<source>Network Installation. (Disabled: No package list)</source>
- <translation type="unfinished"/>
+ <translation>Мрежова инсталация. (Деактивирано: няма списък с пакети)</translation>
</message>
<message>
<location filename="../src/modules/netinstall/Config.cpp" line="77"/>
@@ -833,7 +838,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="56"/>
<source>This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a></source>
- <translation type="unfinished"/>
+ <translation>Този компютър не отговаря на минималните изисквания за настройване на %1.<br/> Настройката не може да продължи. <a href="#details"> Подробности...</a></translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="60"/>
@@ -844,7 +849,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="67"/>
<source>This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.</source>
- <translation type="unfinished"/>
+ <translation>Този компютър не удовлетворява някои от препоръчителните изисквания занастройването на %1. <br/> Настройката може да продължи, но някои функции могат да бъдат деактивирани.</translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="71"/>
@@ -859,22 +864,22 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="269"/>
<source><h1>Welcome to the Calamares setup program for %1</h1></source>
- <translation type="unfinished"/>
+ <translation><h1> Добре дошли в програмата за настройване на Calamares за %1 </h1></translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="270"/>
<source><h1>Welcome to %1 setup</h1></source>
- <translation type="unfinished"/>
+ <translation><h1> Добре дошли в %1 настройка </h1></translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="274"/>
<source><h1>Welcome to the Calamares installer for %1</h1></source>
- <translation type="unfinished"/>
+ <translation><h1> Добре дошли в инсталатора на Calamares за %1 </h1></translation>
</message>
<message>
<location filename="../src/modules/welcome/Config.cpp" line="275"/>
<source><h1>Welcome to the %1 installer</h1></source>
- <translation type="unfinished"/>
+ <translation><h1> Добре дошли в инсталатора %1 </h1></translation>
</message>
<message>
<location filename="../src/modules/users/Config.cpp" line="236"/>
@@ -884,17 +889,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/Config.cpp" line="252"/>
<source>'%1' is not allowed as username.</source>
- <translation type="unfinished"/>
+ <translation>"%1" не е разрешено като потребителско име.</translation>
</message>
<message>
<location filename="../src/modules/users/Config.cpp" line="242"/>
<source>Your username must start with a lowercase letter or underscore.</source>
- <translation type="unfinished"/>
+ <translation>Вашето потребителско име трябва да започне с малки букви или долна черта.</translation>
</message>
<message>
<location filename="../src/modules/users/Config.cpp" line="246"/>
<source>Only lowercase letters, numbers, underscore and hyphen are allowed.</source>
- <translation type="unfinished"/>
+ <translation>Разрешени са само малки букви, цифри, долна черта и тире.</translation>
</message>
<message>
<location filename="../src/modules/users/Config.cpp" line="301"/>
@@ -909,12 +914,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/Config.cpp" line="311"/>
<source>'%1' is not allowed as hostname.</source>
- <translation type="unfinished"/>
+ <translation>"%1" не е разрешено като име на хост. </translation>
</message>
<message>
<location filename="../src/modules/users/Config.cpp" line="316"/>
<source>Only letters, numbers, underscore and hyphen are allowed.</source>
- <translation type="unfinished"/>
+ <translation>Разрешени са само букви, цифри, долна черта и тире.</translation>
</message>
<message>
<location filename="../src/modules/users/Config.cpp" line="585"/>
@@ -924,12 +929,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/Config.cpp" line="599"/>
<source>OK!</source>
- <translation type="unfinished"/>
+ <translation>OK!</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="145"/>
<source>Setup Failed</source>
- <translation type="unfinished"/>
+ <translation>Настройването е неуспешно</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="145"/>
@@ -939,17 +944,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/finished/Config.cpp" line="147"/>
<source>The setup of %1 did not complete successfully.</source>
- <translation type="unfinished"/>
+ <translation>Настройката на %1 не завърши успешно.</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="148"/>
<source>The installation of %1 did not complete successfully.</source>
- <translation type="unfinished"/>
+ <translation>Инсталирането на %1 не завърши успешно.</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="152"/>
<source>Setup Complete</source>
- <translation type="unfinished"/>
+ <translation>Настройването завърши.</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="153"/>
@@ -959,7 +964,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/finished/Config.cpp" line="154"/>
<source>The setup of %1 is complete.</source>
- <translation type="unfinished"/>
+ <translation>Настройката на %1 е пълна.</translation>
</message>
<message>
<location filename="../src/modules/finished/Config.cpp" line="155"/>
@@ -969,27 +974,27 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/packagechooser/Config.cpp" line="111"/>
<source>Package Selection</source>
- <translation type="unfinished"/>
+ <translation>Избор на пакети</translation>
</message>
<message>
<location filename="../src/modules/packagechooser/Config.cpp" line="113"/>
<source>Please pick a product from the list. The selected product will be installed.</source>
- <translation type="unfinished"/>
+ <translation>Моля, изберете продукт от списъка. Избраният продукт ще бъде инсталиран.</translation>
</message>
<message>
<location filename="../src/modules/packagechooser/Config.cpp" line="243"/>
<source>Packages</source>
- <translation type="unfinished"/>
+ <translation>Пакети</translation>
</message>
<message>
<location filename="../src/modules/packagechooser/Config.cpp" line="249"/>
<source>Install option: <strong>%1</strong></source>
- <translation type="unfinished"/>
+ <translation>Опция за инсталиране: <strong>%1</strong></translation>
</message>
<message>
<location filename="../src/modules/packagechooser/Config.cpp" line="249"/>
<source>None</source>
- <translation type="unfinished"/>
+ <translation>Без</translation>
</message>
<message>
<location filename="../src/modules/summary/Config.cpp" line="94"/>
@@ -999,7 +1004,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/summary/Config.cpp" line="98"/>
<source>This is an overview of what will happen once you start the setup procedure.</source>
- <translation type="unfinished"/>
+ <translation>Това е преглед на това, което ще се случи, след като започнете процедурата за настройване.</translation>
</message>
<message>
<location filename="../src/modules/summary/Config.cpp" line="103"/>
@@ -1040,7 +1045,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="71"/>
<source>Primar&y</source>
- <translation type="unfinished"/>
+ <translation>&Основен</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="81"/>
@@ -1070,12 +1075,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="224"/>
<source>Label for the filesystem</source>
- <translation type="unfinished"/>
+ <translation>Етикет на файловата система</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="234"/>
<source>FS Label:</source>
- <translation type="unfinished"/>
+ <translation>Етикет на ФС:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="66"/>
@@ -1105,7 +1110,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/PartitionDialogHelpers.cpp" line="96"/>
<source>Mountpoint must start with a <tt>/</tt>.</source>
- <translation type="unfinished"/>
+ <translation>Точката на монтиране трябва да започва с <tt>/</tt>.</translation>
</message>
</context>
<context>
@@ -1113,32 +1118,32 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="187"/>
<source>Create new %1MiB partition on %3 (%2) with entries %4.</source>
- <translation type="unfinished"/>
+ <translation>Създаване на нов %1МiB дял на %3 ( %2) с записи %4.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="195"/>
<source>Create new %1MiB partition on %3 (%2).</source>
- <translation type="unfinished"/>
+ <translation>Създаване на нов %1mib дял на %3 ( %2).</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="202"/>
<source>Create new %2MiB partition on %4 (%3) with file system %1.</source>
- <translation type="unfinished"/>
+ <translation>Създаване на нов %2mib дял на %4 ( %3) с файлова система %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="219"/>
<source>Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.</source>
- <translation type="unfinished"/>
+ <translation>Създаване на нов <strong>%1MiB </strong> дял на <strong>%3 </strong> (%2) сзаписи <em>%4 </em>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="228"/>
<source>Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).</source>
- <translation type="unfinished"/>
+ <translation>Създаване на нов <strong>%1MiB </strong> дял на <strong>%3 </strong> (%2).</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="235"/>
<source>Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.</source>
- <translation type="unfinished"/>
+ <translation>Създаване на нов <strong>%2Mib </strong> дял на <strong>%4 </strong> (%3) сфайлова система <strong>%1 </strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="260"/>
@@ -1218,23 +1223,23 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="125"/>
<source>Preserving home directory</source>
- <translation type="unfinished"/>
+ <translation>Запазване на домашната директория</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="49"/>
<location filename="../src/modules/users/CreateUserJob.cpp" line="142"/>
<source>Creating user %1</source>
- <translation type="unfinished"/>
+ <translation>Създаване на потребител %1</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="150"/>
<source>Configuring user %1</source>
- <translation type="unfinished"/>
+ <translation>Конфигуриране на потребител %1</translation>
</message>
<message>
<location filename="../src/modules/users/CreateUserJob.cpp" line="158"/>
<source>Setting file permissions</source>
- <translation type="unfinished"/>
+ <translation>Задаване на разрешения за файлове</translation>
</message>
</context>
<context>
@@ -1242,7 +1247,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/CreateVolumeGroupDialog.cpp" line="28"/>
<source>Create Volume Group</source>
- <translation type="unfinished"/>
+ <translation>Създаване на група дялове</translation>
</message>
</context>
<context>
@@ -1250,22 +1255,22 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="32"/>
<source>Create new volume group named %1.</source>
- <translation type="unfinished"/>
+ <translation>Създаване на нова група дялове с име %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="38"/>
<source>Create new volume group named <strong>%1</strong>.</source>
- <translation type="unfinished"/>
+ <translation>Създаване на нова група дялове с име <strong>%1 </strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="44"/>
<source>Creating new volume group named %1.</source>
- <translation type="unfinished"/>
+ <translation>Създаване на нова група дялове с име %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="51"/>
<source>The installer failed to create a volume group named '%1'.</source>
- <translation type="unfinished"/>
+ <translation>Инсталаторът не успя да създаде група дялове с име „%1 “.</translation>
</message>
</context>
<context>
@@ -1274,17 +1279,17 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="26"/>
<location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="38"/>
<source>Deactivate volume group named %1.</source>
- <translation type="unfinished"/>
+ <translation>Деактивиране на група дялове с име %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="32"/>
<source>Deactivate volume group named <strong>%1</strong>.</source>
- <translation type="unfinished"/>
+ <translation>Деактивиране на група дялове с име <strong>%1 </strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="46"/>
<source>The installer failed to deactivate a volume group named %1.</source>
- <translation type="unfinished"/>
+ <translation>Инсталаторът не успя да деактивира група дялове с име %1.</translation>
</message>
</context>
<context>
@@ -1355,7 +1360,7 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/partition/core/DeviceModel.cpp" line="93"/>
<source>%1 - (%2)</source>
<extracomment>device[name] - (device-node[name])</extracomment>
- <translation type="unfinished"/>
+ <translation>%1 - (%2)</translation>
</message>
</context>
<context>
@@ -1394,7 +1399,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="54"/>
<source>Con&tent:</source>
- <translation type="unfinished"/>
+ <translation>&Съдържание:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="64"/>
@@ -1439,22 +1444,22 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="179"/>
<source>Label for the filesystem</source>
- <translation type="unfinished"/>
+ <translation>Етикет на файловата система</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="189"/>
<source>FS Label:</source>
- <translation type="unfinished"/>
+ <translation>Етикет на ФС:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="259"/>
<source>Passphrase for existing partition</source>
- <translation type="unfinished"/>
+ <translation>Пасфраза за съществуващ дял</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
<source>Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
- <translation type="unfinished"/>
+ <translation>Дял %1 не може да бъде декриптиран с дадената парола. <br/><br/> Редактирайтеотново дялът и дайте правилната парола или го изтрийте и създайте нов криптиран дял.</translation>
</message>
</context>
<context>
@@ -1472,7 +1477,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/EncryptWidget.ui" line="43"/>
<source>Your system does not seem to support encryption well enough to encrypt the entire system. You may enable encryption, but performance may suffer.</source>
- <translation type="unfinished"/>
+ <translation>Изглежда, че вашата система е слаба за криптиране на цялата система. Може да активирате криптирането, но производителността може да спадне .</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EncryptWidget.ui" line="59"/>
@@ -1496,12 +1501,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/libcalamaresui/widgets/ErrorDialog.ui" line="40"/>
<source>Details:</source>
- <translation type="unfinished"/>
+ <translation>Подробности:</translation>
</message>
<message>
<location filename="../src/libcalamaresui/widgets/ErrorDialog.ui" line="56"/>
<source>Would you like to paste the install log to the web?</source>
- <translation type="unfinished"/>
+ <translation>Искате ли да поставите дневника за инсталиране в мрежата?</translation>
</message>
</context>
<context>
@@ -1514,7 +1519,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="201"/>
<source>Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em></source>
- <translation type="unfinished"/>
+ <translation>Инсталиране на %1 на <strong> нов </strong> %2 системен дял с функции <em> %3 </em></translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="209"/>
@@ -1524,27 +1529,27 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="218"/>
<source>Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.</source>
- <translation type="unfinished"/>
+ <translation>Настройване на <strong> нов </strong> %2 дял с монтиране на точка <strong> %1 </strong> и характеристики <em>%3 </em>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="226"/>
<source>Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.</source>
- <translation type="unfinished"/>
+ <translation>Настройване на <strong> нов </strong> %2 дял с монтиране на точка <strong> %1 </strong>%3.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="240"/>
<source>Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.</source>
- <translation type="unfinished"/>
+ <translation>Инсталиране на %2 на %3 системен дял <strong> %1 </strong> с функции <em> %4 </em>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="259"/>
<source>Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.</source>
- <translation type="unfinished"/>
+ <translation>Настройване на %3 дял <strong>%1 </strong> с точка на монтиране <strong>%2 </strong>и функции <em>%4 </em>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="268"/>
<source>Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.</source>
- <translation type="unfinished"/>
+ <translation>Настройване на %3 дял <strong>%1 </strong> с точка на монтиране <strong>%2 </strong>%4.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="249"/>
@@ -1577,12 +1582,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="75"/>
<source><h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system.</source>
- <translation type="unfinished"/>
+ <translation><h1> Всичко е готово.</h1><br/>%1 е инсталиран на вашия компютър. <br/> Сега може дазапочнете да използвате новата си система.</translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="79"/>
<source><html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html></source>
- <translation type="unfinished"/>
+ <translation><html><head/><body><p> Когато това поле бъде отметнато, вашата система ще се рестартираведнага , когато щракнете върху <span style="font-style:italic;"> Готово </span>или затворите програмата за инсталиране.</p></ody></html></translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="87"/>
@@ -1592,12 +1597,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="92"/>
<source><html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html></source>
- <translation type="unfinished"/>
+ <translation><html><head/><body><p> Когато това поле бъде отметнато, вашата система ще се рестартираведнага, когато щракнете върху <span style="font-style:italic;">Готово </span>или затворете инсталатора.</p></ody></html></translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="105"/>
<source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source>
- <translation type="unfinished"/>
+ <translation><h1> Инсталирането е неуспешно </h1><br/>%1 не е инсталиран на вашия компютър. <br/>Съобщението за грешка беше: %2.</translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="113"/>
@@ -1610,7 +1615,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/finishedq/FinishedQmlViewStep.cpp" line="35"/>
<source>Finish</source>
- <translation>Завърши</translation>
+ <translation>Завършване</translation>
</message>
</context>
<context>
@@ -1626,12 +1631,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="39"/>
<source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source>
- <translation type="unfinished"/>
+ <translation>Форматиране на дял %1 (файлова система: %2, размер: %3 MiB) на %4.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="50"/>
<source>Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.</source>
- <translation type="unfinished"/>
+ <translation>Форматиране на <strong>%3MiB </strong> дял <strong>%1 </strong> с файлова система<strong>%2 </strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/>
@@ -1655,22 +1660,22 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="156"/>
<source>has at least %1 GiB available drive space</source>
- <translation type="unfinished"/>
+ <translation>има поне %1 GiB свободно място на диска</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="158"/>
<source>There is not enough drive space. At least %1 GiB is required.</source>
- <translation type="unfinished"/>
+ <translation>Няма достатъчно място на диска. Необходими са най-малко %1 GiB.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="166"/>
<source>has at least %1 GiB working memory</source>
- <translation type="unfinished"/>
+ <translation>има поне %1 GiB работна памет</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="168"/>
<source>The system does not have enough working memory. At least %1 GiB is required.</source>
- <translation type="unfinished"/>
+ <translation>Системата няма достатъчно работна памет. Необходими са поне %1 GIB.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="177"/>
@@ -1695,12 +1700,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="193"/>
<source>is running the installer as an administrator (root)</source>
- <translation type="unfinished"/>
+ <translation>изпълнява инсталатора като администратор (root)</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="197"/>
<source>The setup program is not running with administrator rights.</source>
- <translation type="unfinished"/>
+ <translation>Програмата за настройване не се изпълнява с права на администратор.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="198"/>
@@ -1710,12 +1715,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="206"/>
<source>has a screen large enough to show the whole installer</source>
- <translation type="unfinished"/>
+ <translation>Има екран, достатъчно голям, за да покаже целия прозорец на инсталатора.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="210"/>
<source>The screen is too small to display the setup program.</source>
- <translation type="unfinished"/>
+ <translation>Екранът е твърде малък, за да се покаже програмата за инсталиране.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="211"/>
@@ -1728,7 +1733,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/hostinfo/HostInfoJob.cpp" line="42"/>
<source>Collecting information about your machine.</source>
- <translation type="unfinished"/>
+ <translation>Събиране на информация за вашата машина.</translation>
</message>
</context>
<context>
@@ -1739,22 +1744,22 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/oemid/IDJob.cpp" line="52"/>
<location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
<source>OEM Batch Identifier</source>
- <translation type="unfinished"/>
+ <translation>OEM -партиден идентификатор</translation>
</message>
<message>
<location filename="../src/modules/oemid/IDJob.cpp" line="40"/>
<source>Could not create directories <code>%1</code>.</source>
- <translation type="unfinished"/>
+ <translation>Неуспех при създаването на директории <code>%1 </code>.</translation>
</message>
<message>
<location filename="../src/modules/oemid/IDJob.cpp" line="53"/>
<source>Could not open file <code>%1</code>.</source>
- <translation type="unfinished"/>
+ <translation>Грешка при отваряне на файла <code>%1</code>.</translation>
</message>
<message>
<location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
<source>Could not write to file <code>%1</code>.</source>
- <translation type="unfinished"/>
+ <translation>Не може да се извърши запис във файл <code>%1</code>.</translation>
</message>
</context>
<context>
@@ -1762,7 +1767,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/initcpio/InitcpioJob.cpp" line="32"/>
<source>Creating initramfs with mkinitcpio.</source>
- <translation type="unfinished"/>
+ <translation>Създаване на initramfs с mkinitcpio.</translation>
</message>
</context>
<context>
@@ -1770,7 +1775,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/initramfs/InitramfsJob.cpp" line="28"/>
<source>Creating initramfs.</source>
- <translation type="unfinished"/>
+ <translation>Създаване на initramfs.</translation>
</message>
</context>
<context>
@@ -1843,22 +1848,22 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/luksopenswaphookcfg/LOSHJob.cpp" line="36"/>
<source>Configuring encrypted swap.</source>
- <translation type="unfinished"/>
+ <translation>Конфигуриране на криптиран swap.</translation>
</message>
<message>
<location filename="../src/modules/luksopenswaphookcfg/LOSHJob.cpp" line="88"/>
<source>No target system available.</source>
- <translation type="unfinished"/>
+ <translation>Няма налична целева система.</translation>
</message>
<message>
<location filename="../src/modules/luksopenswaphookcfg/LOSHJob.cpp" line="96"/>
<source>No rootMountPoint is set.</source>
- <translation type="unfinished"/>
+ <translation>Не е зададен RootMountpoint.</translation>
</message>
<message>
<location filename="../src/modules/luksopenswaphookcfg/LOSHJob.cpp" line="101"/>
<source>No configFilePath is set.</source>
- <translation type="unfinished"/>
+ <translation>Не е зададен configFilePath.</translation>
</message>
</context>
<context>
@@ -1871,7 +1876,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/license/LicensePage.ui" line="26"/>
<source><h1>License Agreement</h1></source>
- <translation type="unfinished"/>
+ <translation><h1>Лицензно споразумение</h1></translation>
</message>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="135"/>
@@ -1881,27 +1886,27 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="137"/>
<source>Please review the End User License Agreements (EULAs).</source>
- <translation type="unfinished"/>
+ <translation>Моля, прегледайте лицензионните споразумения за краен потребител (EULAS).</translation>
</message>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="142"/>
<source>This setup procedure will install proprietary software that is subject to licensing terms.</source>
- <translation type="unfinished"/>
+ <translation>Тази процедура за настройка ще инсталира патентован софтуер, който подлежи налицензионни условия.</translation>
</message>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="145"/>
<source>If you do not agree with the terms, the setup procedure cannot continue.</source>
- <translation type="unfinished"/>
+ <translation>Ако не сте съгласни с условията, процедурата за инсталиране не може да продължи.</translation>
</message>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="150"/>
<source>This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.</source>
- <translation type="unfinished"/>
+ <translation>С цел да се осигурят допълнителни функции и да се подобри работата на потребителя, процедурата може да инсталира софтуер, който е обект на лицензионни условия.</translation>
</message>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="155"/>
<source>If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.</source>
- <translation type="unfinished"/>
+ <translation>Ако не сте съгласни с условията, патентованият софтуер няма да бъде инсталиран и вместо него ще бъдат използвани алтернативи с отворен код.</translation>
</message>
</context>
<context>
@@ -1917,7 +1922,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="88"/>
<source>URL: %1</source>
- <translation type="unfinished"/>
+ <translation>URL: %1</translation>
</message>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="109"/>
@@ -1954,22 +1959,22 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="163"/>
<source>File: %1</source>
- <translation type="unfinished"/>
+ <translation>Файл: %1</translation>
</message>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="186"/>
<source>Hide license text</source>
- <translation type="unfinished"/>
+ <translation>Скриване на текста на лиценза</translation>
</message>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="186"/>
<source>Show the license text</source>
- <translation type="unfinished"/>
+ <translation>Показване на текста на лиценза</translation>
</message>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="190"/>
<source>Open license agreement in browser.</source>
- <translation type="unfinished"/>
+ <translation>Отваряне на лицензионното споразумение в браузъра.</translation>
</message>
</context>
<context>
@@ -2004,7 +2009,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/libcalamares/locale/Tests.cpp" line="273"/>
<source>Quit</source>
- <translation type="unfinished"/>
+ <translation>Изход</translation>
</message>
</context>
<context>
@@ -2020,35 +2025,35 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="33"/>
<source>Configuring LUKS key file.</source>
- <translation type="unfinished"/>
+ <translation>Конфигуриране на ключов файл LUKS.</translation>
</message>
<message>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="235"/>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="243"/>
<source>No partitions are defined.</source>
- <translation type="unfinished"/>
+ <translation>Няма зададени дялове.</translation>
</message>
<message>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="279"/>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="286"/>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="300"/>
<source>Encrypted rootfs setup error</source>
- <translation type="unfinished"/>
+ <translation>Грешка при настройване на криптирана rootfs</translation>
</message>
<message>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="280"/>
<source>Root partition %1 is LUKS but no passphrase has been set.</source>
- <translation type="unfinished"/>
+ <translation>Root дял %1 е LUKS, но не е зададена парола.</translation>
</message>
<message>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="287"/>
<source>Could not create LUKS key file for root partition %1.</source>
- <translation type="unfinished"/>
+ <translation>Не можа да се създаде ключов файл LUKS за root дял %1.</translation>
</message>
<message>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="301"/>
<source>Could not configure LUKS key file on partition %1.</source>
- <translation type="unfinished"/>
+ <translation>Неуспешно конфигуриране на ключов файл на LUKS на дял %1.</translation>
</message>
</context>
<context>
@@ -2056,17 +2061,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/machineid/MachineIdJob.cpp" line="37"/>
<source>Generate machine-id.</source>
- <translation>Генерирай machine-id.</translation>
+ <translation>Генериране на machine-id.</translation>
</message>
<message>
<location filename="../src/modules/machineid/MachineIdJob.cpp" line="53"/>
<source>Configuration Error</source>
- <translation type="unfinished"/>
+ <translation>Грешка в конфигурацията</translation>
</message>
<message>
<location filename="../src/modules/machineid/MachineIdJob.cpp" line="54"/>
<source>No root mount point is set for MachineId.</source>
- <translation type="unfinished"/>
+ <translation>Не е зададена точка за монтиране на root за MachineID.</translation>
</message>
</context>
<context>
@@ -2074,14 +2079,16 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/localeq/Map.qml" line="237"/>
<source>Timezone: %1</source>
- <translation type="unfinished"/>
+ <translation>Часова зона: %1</translation>
</message>
<message>
<location filename="../src/modules/localeq/Map.qml" line="258"/>
<source>Please select your preferred location on the map so the installer can suggest the locale
and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging
to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming.</source>
- <translation type="unfinished"/>
+ <translation>Моля, изберете предпочитаното от вас местоположение на картата, за да може инсталаторът да предложи съответните регионални настройки
+ и настройките на часовия пояс. Можете да направите точна корекция на предложените настройки по-долу. Премествайте картата с влачене
+ и с помощта на бутоните +/- или колелцето на мишката променяйте мащаба, за да намерите местоположението.</translation>
</message>
</context>
<context>
@@ -2094,104 +2101,104 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="51"/>
<source>Office software</source>
- <translation type="unfinished"/>
+ <translation>Офис софтуер</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="52"/>
<source>Office package</source>
- <translation type="unfinished"/>
+ <translation>Офис пакет</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="53"/>
<source>Browser software</source>
- <translation type="unfinished"/>
+ <translation>Софтуер за браузър</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="54"/>
<source>Browser package</source>
- <translation type="unfinished"/>
+ <translation>Пакет на браузър</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="55"/>
<source>Web browser</source>
- <translation type="unfinished"/>
+ <translation>Уеб браузър</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="56"/>
<source>Kernel</source>
<comment>label for netinstall module, Linux kernel</comment>
- <translation type="unfinished"/>
+ <translation>Ядро</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="57"/>
<source>Services</source>
<comment>label for netinstall module, system services</comment>
- <translation type="unfinished"/>
+ <translation>Услуги</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="58"/>
<source>Login</source>
<comment>label for netinstall module, choose login manager</comment>
- <translation type="unfinished"/>
+ <translation>Вход</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="59"/>
<source>Desktop</source>
<comment>label for netinstall module, choose desktop environment</comment>
- <translation type="unfinished"/>
+ <translation>Работен плот</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="61"/>
<source>Communication</source>
<comment>label for netinstall module</comment>
- <translation type="unfinished"/>
+ <translation>Комуникация</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="62"/>
<source>Development</source>
<comment>label for netinstall module</comment>
- <translation type="unfinished"/>
+ <translation>Разработка</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="63"/>
<source>Office</source>
<comment>label for netinstall module</comment>
- <translation type="unfinished"/>
+ <translation>Офис</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="64"/>
<source>Multimedia</source>
<comment>label for netinstall module</comment>
- <translation type="unfinished"/>
+ <translation>Мултимедия</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="65"/>
<source>Internet</source>
<comment>label for netinstall module</comment>
- <translation type="unfinished"/>
+ <translation>Интернет</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="66"/>
<source>Theming</source>
<comment>label for netinstall module</comment>
- <translation type="unfinished"/>
+ <translation>Стилове и теми</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="67"/>
<source>Gaming</source>
<comment>label for netinstall module</comment>
- <translation type="unfinished"/>
+ <translation>Игри</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="68"/>
<source>Utilities</source>
<comment>label for netinstall module</comment>
- <translation type="unfinished"/>
+ <translation>Помощни програми</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="60"/>
<source>Applications</source>
- <translation type="unfinished"/>
+ <translation>Приложения</translation>
</message>
</context>
<context>
@@ -2199,7 +2206,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/notesqml/NotesQmlViewStep.cpp" line="23"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Бележки</translation>
</message>
</context>
<context>
@@ -2207,17 +2214,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/oemid/OEMPage.ui" line="32"/>
<source>Ba&tch:</source>
- <translation type="unfinished"/>
+ <translation>Ba&tch:</translation>
</message>
<message>
<location filename="../src/modules/oemid/OEMPage.ui" line="42"/>
<source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
- <translation type="unfinished"/>
+ <translation><html><head/><body><p>Въведете batch идентификатор тук. Той ще се съхранява в целевата система</p></body></html></translation>
</message>
<message>
<location filename="../src/modules/oemid/OEMPage.ui" line="52"/>
<source><html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html></source>
- <translation type="unfinished"/>
+ <translation><html><head/><body><h1>OEM Конфигурация</h1><p>Calamares ще използва OEM настройки при конфигуриране на целевата система</p></body></html></translation>
</message>
</context>
<context>
@@ -2225,12 +2232,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/oemid/OEMViewStep.cpp" line="122"/>
<source>OEM Configuration</source>
- <translation type="unfinished"/>
+ <translation>OEM конфигурация</translation>
</message>
<message>
<location filename="../src/modules/oemid/OEMViewStep.cpp" line="128"/>
<source>Set the OEM Batch Identifier to <code>%1</code>.</source>
- <translation type="unfinished"/>
+ <translation>Задаване на идентификатора на OEM Batch на <code>%1 </code>.</translation>
</message>
</context>
<context>
@@ -2238,29 +2245,29 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="41"/>
<source>Select your preferred Region, or use the default settings.</source>
- <translation type="unfinished"/>
+ <translation>Изберете предпочитания от вас регион или използвайте настройките по подразбиране.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="99"/>
<location filename="../src/modules/localeq/Offline.qml" line="175"/>
<location filename="../src/modules/localeq/Offline.qml" line="219"/>
<source>Timezone: %1</source>
- <translation type="unfinished"/>
+ <translation>Часова зона: %1</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="116"/>
<source>Select your preferred Zone within your Region.</source>
- <translation type="unfinished"/>
+ <translation>Изберете предпочитаната от вас зона във вашия регион.</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="188"/>
<source>Zones</source>
- <translation type="unfinished"/>
+ <translation>Зони</translation>
</message>
<message>
<location filename="../src/modules/localeq/Offline.qml" line="235"/>
<source>You can fine-tune Language and Locale settings below.</source>
- <translation type="unfinished"/>
+ <translation>Можете да прецизирате настройките за езика и регионалните формати по-долу.</translation>
</message>
</context>
<context>
@@ -2338,9 +2345,9 @@ The installer will quit and all changes will be lost.</source>
<message numerus="yes">
<location filename="../src/modules/users/CheckPWQuality.cpp" line="232"/>
<source>The password contains fewer than %n lowercase letters</source>
- <translation type="unfinished">
- <numerusform/>
- <numerusform/>
+ <translation>
+ <numerusform>Паролата съдържа по -малко от %n малки букви</numerusform>
+ <numerusform>Паролата съдържа по -малко от %n малки букви</numerusform>
</translation>
</message>
<message>
@@ -2376,70 +2383,70 @@ The installer will quit and all changes will be lost.</source>
<message numerus="yes">
<location filename="../src/modules/users/CheckPWQuality.cpp" line="218"/>
<source>The password contains fewer than %n digits</source>
- <translation type="unfinished">
- <numerusform/>
- <numerusform/>
+ <translation>
+ <numerusform>Паролата съдържа по -малко от %n цифри</numerusform>
+ <numerusform>Паролата съдържа по -малко от %n цифри</numerusform>
</translation>
</message>
<message numerus="yes">
<location filename="../src/modules/users/CheckPWQuality.cpp" line="225"/>
<source>The password contains fewer than %n uppercase letters</source>
- <translation type="unfinished">
- <numerusform/>
- <numerusform/>
+ <translation>
+ <numerusform>Паролата съдържа по -малко от %n главни букви</numerusform>
+ <numerusform>Паролата съдържа по -малко от %n главни букви</numerusform>
</translation>
</message>
<message numerus="yes">
<location filename="../src/modules/users/CheckPWQuality.cpp" line="239"/>
<source>The password contains fewer than %n non-alphanumeric characters</source>
- <translation type="unfinished">
- <numerusform/>
- <numerusform/>
+ <translation>
+ <numerusform>Паролата съдържа по-малко от %n небуквени и нецифрови знаци</numerusform>
+ <numerusform>Паролата съдържа по-малко от %n небуквени и нецифрови знаци</numerusform>
</translation>
</message>
<message numerus="yes">
<location filename="../src/modules/users/CheckPWQuality.cpp" line="246"/>
<source>The password is shorter than %n characters</source>
- <translation type="unfinished">
- <numerusform/>
- <numerusform/>
+ <translation>
+ <numerusform>Паролата е по -къса от %n знака</numerusform>
+ <numerusform>Паролата е по -къса от %n знака</numerusform>
</translation>
</message>
<message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="251"/>
<source>The password is a rotated version of the previous one</source>
- <translation type="unfinished"/>
+ <translation>Паролата е обърната версия на предишната</translation>
</message>
<message numerus="yes">
<location filename="../src/modules/users/CheckPWQuality.cpp" line="255"/>
<source>The password contains fewer than %n character classes</source>
- <translation type="unfinished">
- <numerusform/>
- <numerusform/>
+ <translation>
+ <numerusform>Паролата съдържа по -малко от %n класове символи</numerusform>
+ <numerusform>Паролата съдържа по -малко от %n класове символи</numerusform>
</translation>
</message>
<message numerus="yes">
<location filename="../src/modules/users/CheckPWQuality.cpp" line="262"/>
<source>The password contains more than %n same characters consecutively</source>
- <translation type="unfinished">
- <numerusform/>
- <numerusform/>
+ <translation>
+ <numerusform>Паролата съдържа повече от %n еднакви знака последователно</numerusform>
+ <numerusform>Паролата съдържа повече от %n еднакви знака последователно</numerusform>
</translation>
</message>
<message numerus="yes">
<location filename="../src/modules/users/CheckPWQuality.cpp" line="269"/>
<source>The password contains more than %n characters of the same class consecutively</source>
- <translation type="unfinished">
- <numerusform/>
- <numerusform/>
+ <translation>
+ <numerusform>Паролата съдържа повече от %n знака от един и същи клас последователно</numerusform>
+ <numerusform>Паролата съдържа повече от %n знака от един и същи клас последователно</numerusform>
</translation>
</message>
<message numerus="yes">
<location filename="../src/modules/users/CheckPWQuality.cpp" line="280"/>
<source>The password contains monotonic sequence longer than %n characters</source>
- <translation type="unfinished">
- <numerusform/>
- <numerusform/>
+ <translation>
+ <numerusform>Паролата съдържа монотонната последователност по -дълга от %n знаци</numerusform>
+ <numerusform>Паролата съдържа монотонната последователност по -дълга от %n знаци</numerusform>
</translation>
</message>
<message>
@@ -2535,7 +2542,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/Config.cpp" line="830"/>
<source>Password is empty</source>
- <translation type="unfinished"/>
+ <translation>Паролата е празна</translation>
</message>
</context>
<context>
@@ -2548,7 +2555,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/packagechooser/page_package.ui" line="50"/>
<source>Product Name</source>
- <translation type="unfinished"/>
+ <translation>Продуктово име</translation>
</message>
<message>
<location filename="../src/modules/packagechooser/page_package.ui" line="63"/>
@@ -2558,17 +2565,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/packagechooser/page_package.ui" line="79"/>
<source>Long Product Description</source>
- <translation type="unfinished"/>
+ <translation>Подробно описание на продукта</translation>
</message>
<message>
<location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="25"/>
<source>Package Selection</source>
- <translation type="unfinished"/>
+ <translation>Избор на пакети</translation>
</message>
<message>
<location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="26"/>
<source>Please pick a product from the list. The selected product will be installed.</source>
- <translation type="unfinished"/>
+ <translation>Моля, изберете продукт от списъка. Избраният продукт ще бъде инсталиран.</translation>
</message>
</context>
<context>
@@ -2617,7 +2624,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="55"/>
<source>Your Full Name</source>
- <translation type="unfinished"/>
+ <translation>Вашето пълно име</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="124"/>
@@ -2627,7 +2634,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="148"/>
<source>login</source>
- <translation type="unfinished"/>
+ <translation>вход</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="223"/>
@@ -2642,7 +2649,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="250"/>
<source>Computer Name</source>
- <translation type="unfinished"/>
+ <translation>Име на компютър:</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="325"/>
@@ -2659,23 +2666,23 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/users/page_usersetup.ui" line="355"/>
<location filename="../src/modules/users/page_usersetup.ui" line="525"/>
<source>Password</source>
- <translation type="unfinished"/>
+ <translation>Парола</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="380"/>
<location filename="../src/modules/users/page_usersetup.ui" line="550"/>
<source>Repeat Password</source>
- <translation type="unfinished"/>
+ <translation>Повтаряне на паролата</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="455"/>
<source>When this box is checked, password-strength checking is done and you will not be able to use a weak password.</source>
- <translation type="unfinished"/>
+ <translation>Когато това поле е маркирано, се извършва проверка на силата на паролата и няма да можете да използвате слаба парола.</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="458"/>
<source>Require strong passwords.</source>
- <translation type="unfinished"/>
+ <translation>Изискване на силни пароли.</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="465"/>
@@ -2770,7 +2777,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="302"/>
<source>File System Label</source>
- <translation type="unfinished"/>
+ <translation>Етикет на файловата система</translation>
</message>
<message>
<location filename="../src/modules/partition/core/PartitionModel.cpp" line="304"/>
@@ -2823,27 +2830,27 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="136"/>
<source>New Volume Group</source>
- <translation type="unfinished"/>
+ <translation>Нова група LVM дялове</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="143"/>
<source>Resize Volume Group</source>
- <translation type="unfinished"/>
+ <translation>Преоразмеряване на група дялове</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="150"/>
<source>Deactivate Volume Group</source>
- <translation type="unfinished"/>
+ <translation>Деактивиране на група дялове</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="157"/>
<source>Remove Volume Group</source>
- <translation type="unfinished"/>
+ <translation>Премахване на група дялове</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="184"/>
<source>I&nstall boot loader on:</source>
- <translation type="unfinished"/>
+ <translation>И& нсталиране на програма за начално зареждане на:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="228"/>
@@ -2876,17 +2883,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="254"/>
<source>Unsafe partition actions are enabled.</source>
- <translation type="unfinished"/>
+ <translation>Активирани са опасни действия с дялове.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="257"/>
<source>Partitioning is configured to <b>always</b> fail.</source>
- <translation type="unfinished"/>
+ <translation>Разделянето на дялове е конфигурирано така, че <b>винаги</b> да е неуспешно.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="260"/>
<source>No partitions will be changed.</source>
- <translation type="unfinished"/>
+ <translation>Дяловете няма да бъдат променени.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="300"/>
@@ -2906,47 +2913,47 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="533"/>
<source>EFI system partition configured incorrectly</source>
- <translation type="unfinished"/>
+ <translation>Системният дял EFI е конфигуриран неправилно</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="538"/>
<source>An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.</source>
- <translation type="unfinished"/>
+ <translation>За стартирането на %1 е необходим системен дял EFI.<br/><br/>За да конфигурирате EFI системен дял, върнете се назад и изберете или създайте подходяща файлова система.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="549"/>
<source>The filesystem must be mounted on <strong>%1</strong>.</source>
- <translation type="unfinished"/>
+ <translation>Файловата система трябва да бъде монтирана на <strong>%1 </strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="555"/>
<source>The filesystem must have type FAT32.</source>
- <translation type="unfinished"/>
+ <translation>Файловата система трябва да бъде от тип FAT32.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="563"/>
<source>The filesystem must be at least %1 MiB in size.</source>
- <translation type="unfinished"/>
+ <translation>Файловата система трябва да е с размер поне %1 MiB.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="569"/>
<source>The filesystem must have flag <strong>%1</strong> set.</source>
- <translation type="unfinished"/>
+ <translation>Файловата система трябва да има флаг <strong>%1 </strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="575"/>
<source>You can continue without setting up an EFI system partition but your system may fail to start.</source>
- <translation type="unfinished"/>
+ <translation>Можете да продължите, без да настроите EFI системен дял, но вашата системаможе да не успее да се стартира.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="593"/>
<source>Option to use GPT on BIOS</source>
- <translation type="unfinished"/>
+ <translation>Опция за използване на GPT на BIOS</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="594"/>
<source>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</source>
- <translation type="unfinished"/>
+ <translation>Таблица с дялове на GPT е най -добрият вариант за всички системи. Този инсталаторподдържа такава настройка и за BIOS системи. <br/><br/> За конфигуриране на GPT таблица с дяловете в BIOS (ако вече не сте го направили), върнете се назад и задайте таблица на дяловете на GPT, след което създайте 8 MB неформатиран дял сактивиран <strong>%2 </strong> флаг. <br/><br/> Необходим е 8 MB дял за стартиране на %1 на BIOS система с GPT.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="626"/>
@@ -2956,17 +2963,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="627"/>
<source>A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.</source>
- <translation type="unfinished"/>
+ <translation>Отделен дял за начално зареждане беше създаден заедно с криптиран root дял, но не беше криптиран. <br/><br/>При този вид настройка има проблеми със сигурността, тъй като важни системни файлове се съхраняват на некриптиран дял.<br/> Можете да продължите, ако желаете, но отключването на файловата система ще се случи по -късно по време на стартиране на системата. <br/> За да криптирате дялът заначално зареждане, върнете се назад и го създайте отново, избирайки<strong> Криптиране </strong> в прозореца за създаване на дяла.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="718"/>
<source>has at least one disk device available.</source>
- <translation type="unfinished"/>
+ <translation>има поне едно дисково устройство.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="719"/>
<source>There are no partitions to install on.</source>
- <translation type="unfinished"/>
+ <translation>Няма дялове, върху които да се извърши инсталирането.</translation>
</message>
</context>
<context>
@@ -2974,13 +2981,13 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/plasmalnf/PlasmaLnfJob.cpp" line="33"/>
<source>Plasma Look-and-Feel Job</source>
- <translation type="unfinished"/>
+ <translation>Оформление и външен вид в стил Plasma</translation>
</message>
<message>
<location filename="../src/modules/plasmalnf/PlasmaLnfJob.cpp" line="57"/>
<location filename="../src/modules/plasmalnf/PlasmaLnfJob.cpp" line="58"/>
<source>Could not select KDE Plasma Look-and-Feel package</source>
- <translation type="unfinished"/>
+ <translation>Неуспех при избиране на пакет с оформление на външен вид на Plasma KDE</translation>
</message>
</context>
<context>
@@ -2993,12 +3000,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="79"/>
<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>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="84"/>
<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 installed. 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>
</context>
<context>
@@ -3006,7 +3013,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/plasmalnf/PlasmaLnfViewStep.cpp" line="43"/>
<source>Look-and-Feel</source>
- <translation type="unfinished"/>
+ <translation>Външен вид</translation>
</message>
</context>
<context>
@@ -3014,17 +3021,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="53"/>
<source>Saving files for later ...</source>
- <translation type="unfinished"/>
+ <translation>Запазване на файловете за по -късно...</translation>
</message>
<message>
<location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="61"/>
<source>No files configured to save for later.</source>
- <translation type="unfinished"/>
+ <translation>Няма конфигурирани файлове за запазване за по -късно.</translation>
</message>
<message>
<location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
<source>Not all of the configured files could be preserved.</source>
- <translation type="unfinished"/>
+ <translation>Не всички конфигурирани файлове могат да бъдат запазени.</translation>
</message>
</context>
<context>
@@ -3033,7 +3040,8 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="309"/>
<source>
There was no output from the command.</source>
- <translation type="unfinished"/>
+ <translation>
+Няма резултат от командата.</translation>
</message>
<message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="310"/>
@@ -3047,27 +3055,27 @@ Output:
<message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="314"/>
<source>External command crashed.</source>
- <translation type="unfinished"/>
+ <translation>Външната команда се срина.</translation>
</message>
<message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="315"/>
<source>Command <i>%1</i> crashed.</source>
- <translation type="unfinished"/>
+ <translation>Командата <i>%1 </i> се срина.</translation>
</message>
<message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="320"/>
<source>External command failed to start.</source>
- <translation type="unfinished"/>
+ <translation>Външната команда не успя да се стратира.</translation>
</message>
<message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="321"/>
<source>Command <i>%1</i> failed to start.</source>
- <translation type="unfinished"/>
+ <translation>Команда <i>%1 </i> не успя да се стартира.</translation>
</message>
<message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="325"/>
<source>Internal error when starting command.</source>
- <translation type="unfinished"/>
+ <translation>Вътрешна грешка при стартиране на команда.</translation>
</message>
<message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="326"/>
@@ -3077,28 +3085,28 @@ Output:
<message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="330"/>
<source>External command failed to finish.</source>
- <translation type="unfinished"/>
+ <translation>Външната команда не успя да завърши.</translation>
</message>
<message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="331"/>
<source>Command <i>%1</i> failed to finish in %2 seconds.</source>
- <translation type="unfinished"/>
+ <translation>Командата <i> %1 </i> не успя да завърши за %2 секунди.</translation>
</message>
<message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="338"/>
<source>External command finished with errors.</source>
- <translation type="unfinished"/>
+ <translation>Външната команда завърши с грешки.</translation>
</message>
<message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="339"/>
<source>Command <i>%1</i> finished with exit code %2.</source>
- <translation type="unfinished"/>
+ <translation>Командата <i> %1 </i> завърши с изходен код %2.</translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -3134,38 +3142,38 @@ Output:
<location filename="../src/modules/machineid/Workers.cpp" line="76"/>
<location filename="../src/modules/machineid/Workers.cpp" line="93"/>
<source>File not found</source>
- <translation type="unfinished"/>
+ <translation>Файлът не е намерен</translation>
</message>
<message>
<location filename="../src/modules/machineid/Workers.cpp" line="65"/>
<source>Path <pre>%1</pre> must be an absolute path.</source>
- <translation type="unfinished"/>
+ <translation>Пътят <pre>%1 </pre> трябва да бъде абсолютен път.</translation>
</message>
<message>
<location filename="../src/modules/machineid/MachineIdJob.cpp" line="83"/>
<source>Directory not found</source>
- <translation type="unfinished"/>
+ <translation>Директорията не е намерена</translation>
</message>
<message>
<location filename="../src/modules/machineid/MachineIdJob.cpp" line="84"/>
<location filename="../src/modules/machineid/Workers.cpp" line="94"/>
<source>Could not create new random file <pre>%1</pre>.</source>
- <translation type="unfinished"/>
+ <translation>Неуспех при създаването на нов случаен файл <pre>%1 </pre>.</translation>
</message>
<message>
<location filename="../src/modules/packagechooser/PackageModel.cpp" line="74"/>
<source>No product</source>
- <translation type="unfinished"/>
+ <translation>Няма продукт</translation>
</message>
<message>
<location filename="../src/modules/packagechooser/PackageModel.cpp" line="82"/>
<source>No description provided.</source>
- <translation type="unfinished"/>
+ <translation>Не е предоставено описание.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionDialogHelpers.cpp" line="44"/>
<source>(no mount point)</source>
- <translation type="unfinished"/>
+ <translation>(без точка на монтиране)</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="40"/>
@@ -3179,7 +3187,8 @@ Output:
<location filename="../src/modules/welcomeq/Recommended.qml" line="40"/>
<source><p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/>
Setup can continue, but some features might be disabled.</p></source>
- <translation type="unfinished"/>
+ <translation><p> Този компютър не удовлетворява някои от препоръчителните изисквания занастройване на %1. <br/>
+ Инсталирането може да продължи, но някои функции могат да бъдат деактивирани.</p></translation>
</message>
</context>
<context>
@@ -3187,7 +3196,7 @@ Output:
<message>
<location filename="../src/modules/removeuser/RemoveUserJob.cpp" line="34"/>
<source>Remove live user from target system</source>
- <translation type="unfinished"/>
+ <translation>Премахване на потребители на Live средата от целевата система</translation>
</message>
</context>
<context>
@@ -3196,17 +3205,17 @@ Output:
<location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="26"/>
<location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="38"/>
<source>Remove Volume Group named %1.</source>
- <translation type="unfinished"/>
+ <translation>Премахване на група дялове %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="32"/>
<source>Remove Volume Group named <strong>%1</strong>.</source>
- <translation type="unfinished"/>
+ <translation>Премахване на група дялове <strong>%1</strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="46"/>
<source>The installer failed to remove a volume group named '%1'.</source>
- <translation type="unfinished"/>
+ <translation>Инсталаторът не успя да премахне група дялове с име '%1'.</translation>
</message>
</context>
<context>
@@ -3290,13 +3299,15 @@ Output:
<location filename="../src/modules/welcomeq/Requirements.qml" line="38"/>
<source><p>This computer does not satisfy the minimum requirements for installing %1.<br/>
Installation cannot continue.</p></source>
- <translation type="unfinished"/>
+ <translation><p>Този компютър не отговаря на минималните изисквания за инсталирането на %1.<br/>
+Инсталацията не може да продължи.</p></translation>
</message>
<message>
<location filename="../src/modules/welcomeq/Requirements.qml" line="40"/>
<source><p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/>
Setup can continue, but some features might be disabled.</p></source>
- <translation type="unfinished"/>
+ <translation><p> Този компютър не удовлетворява някои от препоръчителните изисквания занастройване на %1. <br/>
+ Инсталирането може да продължи, но някои функции могат да бъдат деактивирани.</p></translation>
</message>
</context>
<context>
@@ -3304,27 +3315,27 @@ Output:
<message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="45"/>
<source>Resize Filesystem Job</source>
- <translation type="unfinished"/>
+ <translation>Оразмеряване на файловата система</translation>
</message>
<message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="168"/>
<source>Invalid configuration</source>
- <translation type="unfinished"/>
+ <translation>Невалидна конфигурация</translation>
</message>
<message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="169"/>
<source>The file-system resize job has an invalid configuration and will not run.</source>
- <translation type="unfinished"/>
+ <translation>Работата за преоразмеряване на файловата система има невалидна конфигурация и няма да се изпълни.</translation>
</message>
<message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="174"/>
<source>KPMCore not Available</source>
- <translation type="unfinished"/>
+ <translation>KPMCore не е наличен</translation>
</message>
<message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="175"/>
<source>Calamares cannot start KPMCore for the file-system resize job.</source>
- <translation type="unfinished"/>
+ <translation>Calamares не може да започне KPMCore за преоразмеряването на файловата система.</translation>
</message>
<message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="183"/>
@@ -3333,39 +3344,39 @@ Output:
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="212"/>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/>
<source>Resize Failed</source>
- <translation type="unfinished"/>
+ <translation>Преоразмеряването е неуспешно</translation>
</message>
<message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="185"/>
<source>The filesystem %1 could not be found in this system, and cannot be resized.</source>
- <translation type="unfinished"/>
+ <translation>Файловата система %1 не може да бъде намерена на този диск и не може да бъде преоразмерена.</translation>
</message>
<message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="186"/>
<source>The device %1 could not be found in this system, and cannot be resized.</source>
- <translation type="unfinished"/>
+ <translation>Устройството %1 не може да бъде намерено в тази система и не може да бъде преоразмерено.</translation>
</message>
<message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="194"/>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="205"/>
<source>The filesystem %1 cannot be resized.</source>
- <translation type="unfinished"/>
+ <translation>Файловата система %1 не може да бъде преоразмерена.</translation>
</message>
<message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="195"/>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/>
<source>The device %1 cannot be resized.</source>
- <translation type="unfinished"/>
+ <translation>Устройството %1 не може да бъде преоразмерено.</translation>
</message>
<message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="213"/>
<source>The filesystem %1 must be resized, but cannot.</source>
- <translation type="unfinished"/>
+ <translation>Файловата система %1 трябва да бъде преоразмерена, но действието не може се извърши.</translation>
</message>
<message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="214"/>
<source>The device %1 must be resized, but cannot</source>
- <translation type="unfinished"/>
+ <translation>Устройството %1 трябва да бъде преоразмерено, но действието не може се извърши</translation>
</message>
</context>
<context>
@@ -3378,12 +3389,12 @@ Output:
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="48"/>
<source>Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.</source>
- <translation type="unfinished"/>
+ <translation>Преоразмеряване на <strong>%2MiB </strong> дял <strong>%1 </strong> до<strong>%3MiB </strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="59"/>
<source>Resizing %2MiB partition %1 to %3MiB.</source>
- <translation type="unfinished"/>
+ <translation>Преоразмеряване на %2MiB дял %1 до %3MiB.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="77"/>
@@ -3396,7 +3407,7 @@ Output:
<message>
<location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="30"/>
<source>Resize Volume Group</source>
- <translation type="unfinished"/>
+ <translation>Преоразмеряване на група дялове</translation>
</message>
</context>
<context>
@@ -3405,17 +3416,17 @@ Output:
<location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="28"/>
<location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="46"/>
<source>Resize volume group named %1 from %2 to %3.</source>
- <translation type="unfinished"/>
+ <translation>Преоразмеряване на група дялове %1 от %2 на %3.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="37"/>
<source>Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>.</source>
- <translation type="unfinished"/>
+ <translation>Преоразмеряване на група дялове <strong>%1</strong> от<strong>%2</strong> на<strong>%3</strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="57"/>
<source>The installer failed to resize a volume group named '%1'.</source>
- <translation type="unfinished"/>
+ <translation>Инсталаторът не успя да преоразмери група дялове "%1".</translation>
</message>
</context>
<context>
@@ -3514,7 +3525,7 @@ Output:
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="51"/>
<source>Set flags on %1MiB %2 partition.</source>
- <translation type="unfinished"/>
+ <translation>Задаване на флагове на %1MiB %2 дял.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="55"/>
@@ -3529,7 +3540,7 @@ Output:
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="73"/>
<source>Clear flags on %1MiB <strong>%2</strong> partition.</source>
- <translation type="unfinished"/>
+ <translation>Изчистване на флагове на %1MiB <strong> %2 </strong> дял.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="77"/>
@@ -3544,7 +3555,7 @@ Output:
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/>
<source>Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.</source>
- <translation type="unfinished"/>
+ <translation>Задаване на флаг на %1MiB <strong>%2</strong> дял като <strong>%3</strong>.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="98"/>
@@ -3559,7 +3570,7 @@ Output:
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="116"/>
<source>Clearing flags on %1MiB <strong>%2</strong> partition.</source>
- <translation type="unfinished"/>
+ <translation>Изчистване на флагове на %1MiB <strong> %2 </strong> дял.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/>
@@ -3574,7 +3585,7 @@ Output:
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="135"/>
<source>Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.</source>
- <translation type="unfinished"/>
+ <translation>Задаване на флагове <strong>%3 </strong> на %1MiB <strong>%2 </strong> дял.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="142"/>
@@ -3612,12 +3623,12 @@ Output:
<message>
<location filename="../src/modules/users/SetPasswordJob.cpp" line="88"/>
<source>Cannot disable root account.</source>
- <translation type="unfinished"/>
+ <translation>Не може да деактивира root акаунтът.</translation>
</message>
<message>
<location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
<source>passwd terminated with error code %1.</source>
- <translation type="unfinished"/>
+ <translation>passwd е прекратен с код за грешка %1.</translation>
</message>
<message>
<location filename="../src/modules/users/SetPasswordJob.cpp" line="97"/>
@@ -3673,18 +3684,18 @@ Output:
<message>
<location filename="../src/modules/users/MiscJobs.cpp" line="182"/>
<source>Preparing groups.</source>
- <translation type="unfinished"/>
+ <translation>Подготовка на групите.</translation>
</message>
<message>
<location filename="../src/modules/users/MiscJobs.cpp" line="194"/>
<location filename="../src/modules/users/MiscJobs.cpp" line="199"/>
<source>Could not create groups in target system</source>
- <translation type="unfinished"/>
+ <translation>Неуспех при създаването на групи в целевата система</translation>
</message>
<message>
<location filename="../src/modules/users/MiscJobs.cpp" line="200"/>
<source>These groups are missing in the target system: %1</source>
- <translation type="unfinished"/>
+ <translation>Тези групи липсват в целевата система: %1</translation>
</message>
</context>
<context>
@@ -3692,7 +3703,7 @@ Output:
<message>
<location filename="../src/modules/users/MiscJobs.cpp" line="34"/>
<source>Configure <pre>sudo</pre> users.</source>
- <translation type="unfinished"/>
+ <translation>Конфигуриране на <pre> sudo </pre> потребители.</translation>
</message>
<message>
<location filename="../src/modules/users/MiscJobs.cpp" line="71"/>
@@ -3710,7 +3721,7 @@ Output:
<message>
<location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="40"/>
<source>Shell Processes Job</source>
- <translation type="unfinished"/>
+ <translation>Процесна обработка от обвивката</translation>
</message>
</context>
<context>
@@ -3755,22 +3766,22 @@ Output:
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="101"/>
<source>Installation feedback</source>
- <translation type="unfinished"/>
+ <translation>Обратна връзка за инсталирането</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="107"/>
<source>Sending installation feedback.</source>
- <translation type="unfinished"/>
+ <translation>Изпращане на обратна връзка за инсталирането.</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="125"/>
<source>Internal error in install-tracking.</source>
- <translation type="unfinished"/>
+ <translation>Вътрешна грешка при проследяване на инсталирането.</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="126"/>
<source>HTTP request timed out.</source>
- <translation type="unfinished"/>
+ <translation>Времето на HTTP заявката изтече.</translation>
</message>
</context>
<context>
@@ -3778,28 +3789,28 @@ Output:
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="193"/>
<source>KDE user feedback</source>
- <translation type="unfinished"/>
+ <translation>Потребителска обратна връзка за KDE</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="199"/>
<source>Configuring KDE user feedback.</source>
- <translation type="unfinished"/>
+ <translation>Конфигуриране на потребителска обратна връзка.</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="221"/>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="229"/>
<source>Error in KDE user feedback configuration.</source>
- <translation type="unfinished"/>
+ <translation>Грешка в конфигурацията за потребителска обратна връзка за KDE.</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="222"/>
<source>Could not configure KDE user feedback correctly, script error %1.</source>
- <translation type="unfinished"/>
+ <translation>Неуспех при конфигурирането на потребителска обратна връзка за KDE, грешка в скрипта %1.</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="230"/>
<source>Could not configure KDE user feedback correctly, Calamares error %1.</source>
- <translation type="unfinished"/>
+ <translation>Неуспех при конфигурирането на потребителска обратна връзка за KDE, грешка на Calamares %1.</translation>
</message>
</context>
<context>
@@ -3807,28 +3818,28 @@ Output:
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="136"/>
<source>Machine feedback</source>
- <translation type="unfinished"/>
+ <translation>Машинна обратна връзка</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="142"/>
<source>Configuring machine feedback.</source>
- <translation type="unfinished"/>
+ <translation>Конфигуриране на машинна обратна връзка.</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="165"/>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="174"/>
<source>Error in machine feedback configuration.</source>
- <translation type="unfinished"/>
+ <translation>Грешка в конфигурацията на машинната обратна връзка.</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="167"/>
<source>Could not configure machine feedback correctly, script error %1.</source>
- <translation type="unfinished"/>
+ <translation>Неуспешно конфигуриране на машинна обратна връзка, грешка в скрипта %1.</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="176"/>
<source>Could not configure machine feedback correctly, Calamares error %1.</source>
- <translation type="unfinished"/>
+ <translation>Неуспех при конфигурирането на машинна обратна връзка, грешка на Calamares %1.</translation>
</message>
</context>
<context>
@@ -3846,32 +3857,32 @@ Output:
<message>
<location filename="../src/modules/tracking/page_trackingstep.ui" line="76"/>
<source><html><head/><body><p>Click here to send <span style=" font-weight:600;">no information at all</span> about your installation.</p></body></html></source>
- <translation type="unfinished"/>
+ <translation><html><head/><body><p> Щракнете тук, за да изпратите <span style = " font-weight: 600; ">изключване на всякаква информация </span> за вашата инсталация.</p></ody></html> </translation>
</message>
<message>
<location filename="../src/modules/tracking/page_trackingstep.ui" line="275"/>
<source><html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html></source>
- <translation type="unfinished"/>
+ <translation><html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;"> Щракнете тук за повече информация за обратна връзка от потребителите </span></a></p></body></html></translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingPage.cpp" line="95"/>
<source>Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area.</source>
- <translation type="unfinished"/>
+ <translation>Проследяването помага на %1 да види колко често се инсталира, на какъв хардуер се инсталиран и кои приложения се използват. За да видите какво ще бъде изпратено,моля, щракнете върху иконата за помощ.</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingPage.cpp" line="100"/>
<source>By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes.</source>
- <translation type="unfinished"/>
+ <translation>Като изберете това, ще изпратите информация за вашата инсталация ихардуер. Тази информация ще бъде изпратена само <b> веднъж </b> след завършване на инсталацията.</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingPage.cpp" line="103"/>
<source>By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1.</source>
- <translation type="unfinished"/>
+ <translation>Като изберете това, периодично ще изпращате информация за вашата<b> машинна </b> инсталация, хардуер и приложения до %1.</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingPage.cpp" line="107"/>
<source>By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1.</source>
- <translation type="unfinished"/>
+ <translation>Като изберете това, периодично ще изпращате информация за вашата <b> потребителска</b> инсталация, хардуер, приложения и модели на използване на приложенията до %1.</translation>
</message>
</context>
<context>
@@ -3887,17 +3898,17 @@ Output:
<message>
<location filename="../src/modules/umount/UmountJob.cpp" line="39"/>
<source>Unmount file systems.</source>
- <translation>Демонтирай файловите системи.</translation>
+ <translation>Демонтиране на файловите системи.</translation>
</message>
<message>
<location filename="../src/modules/umount/UmountJob.cpp" line="124"/>
<source>No target system available.</source>
- <translation type="unfinished"/>
+ <translation>Няма налична целева система.</translation>
</message>
<message>
<location filename="../src/modules/umount/UmountJob.cpp" line="132"/>
<source>No rootMountPoint is set.</source>
- <translation type="unfinished"/>
+ <translation>Не е зададен RootMountpoint.</translation>
</message>
</context>
<context>
@@ -3905,12 +3916,12 @@ Output:
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="190"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
- <translation type="unfinished"/>
+ <translation><small>Ако повече от един човек ще използва този компютър, можете да създадетемножество акаунти след настройването.</small></translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="196"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
- <translation type="unfinished"/>
+ <translation><small>Ако повече от един човек ще използва този компютър, можете да създадетемножество акаунти след инсталирането.</small></translation>
</message>
</context>
<context>
@@ -3935,7 +3946,7 @@ Output:
<location filename="../src/calamares/VariantModel.cpp" line="232"/>
<source>Key</source>
<comment>Column header for key/value</comment>
- <translation type="unfinished"/>
+ <translation>Клавиш</translation>
</message>
<message>
<location filename="../src/calamares/VariantModel.cpp" line="236"/>
@@ -3949,27 +3960,27 @@ Output:
<message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="18"/>
<source>Create Volume Group</source>
- <translation type="unfinished"/>
+ <translation>Създаване на група дялове</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="24"/>
<source>List of Physical Volumes</source>
- <translation type="unfinished"/>
+ <translation>Списък на физическите дялове</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="34"/>
<source>Volume Group Name:</source>
- <translation type="unfinished"/>
+ <translation>Име на група на дял:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="47"/>
<source>Volume Group Type:</source>
- <translation type="unfinished"/>
+ <translation>Вид на група на дял:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="60"/>
<source>Physical Extent Size:</source>
- <translation type="unfinished"/>
+ <translation>Размер на физически диапазон:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="70"/>
@@ -3979,12 +3990,12 @@ Output:
<message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="86"/>
<source>Total Size:</source>
- <translation type="unfinished"/>
+ <translation>Общ размер:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="106"/>
<source>Used Size:</source>
- <translation type="unfinished"/>
+ <translation>Използван размер:</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="126"/>
@@ -3994,7 +4005,7 @@ Output:
<message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="146"/>
<source>Quantity of LVs:</source>
- <translation type="unfinished"/>
+ <translation>Брой на логични дялове:</translation>
</message>
</context>
<context>
@@ -4008,22 +4019,22 @@ Output:
<location filename="../src/modules/welcome/WelcomePage.ui" line="79"/>
<location filename="../src/modules/welcome/WelcomePage.ui" line="98"/>
<source>Select application and system language</source>
- <translation type="unfinished"/>
+ <translation>Избиране на език за приложенията и системата</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
<source>Open donations website</source>
- <translation type="unfinished"/>
+ <translation>Отваряне на уеб страницата за дарения</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
<source>&Donate</source>
- <translation type="unfinished"/>
+ <translation>&Дарение</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
<source>Open help and support website</source>
- <translation type="unfinished"/>
+ <translation>Отваряне на уеб страницата за помощ и поддръжка</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
@@ -4033,7 +4044,7 @@ Output:
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
<source>Open issues and bug-tracking website</source>
- <translation type="unfinished"/>
+ <translation>Отваряне на уеб страницата за проблеми и проследяване на грешки</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
@@ -4043,7 +4054,7 @@ Output:
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
<source>Open release notes website</source>
- <translation type="unfinished"/>
+ <translation>Отваряне на уеб страницата за бележки за изданието</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
@@ -4058,7 +4069,7 @@ Output:
<message>
<location filename="../src/calamares/DebugWindow.cpp" line="319"/>
<source>About %1 setup</source>
- <translation type="unfinished"/>
+ <translation>Относно инсталирането на %1</translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.cpp" line="320"/>
@@ -4087,86 +4098,100 @@ Output:
<message>
<location filename="../src/modules/zfs/ZfsJob.cpp" line="101"/>
<source>Create ZFS pools and datasets</source>
- <translation type="unfinished"/>
+ <translation>Създаване на ZFS пулове и набори от данни</translation>
</message>
<message>
<location filename="../src/modules/zfs/ZfsJob.cpp" line="162"/>
<source>Failed to create zpool on </source>
- <translation type="unfinished"/>
+ <translation>Неуспешно създаване на zpool</translation>
</message>
<message>
<location filename="../src/modules/zfs/ZfsJob.cpp" line="180"/>
<source>Configuration Error</source>
- <translation type="unfinished"/>
+ <translation>Грешка в конфигурацията</translation>
</message>
<message>
<location filename="../src/modules/zfs/ZfsJob.cpp" line="181"/>
<source>No partitions are available for ZFS.</source>
- <translation type="unfinished"/>
+ <translation>Няма дялове за ZFS.</translation>
</message>
<message>
<location filename="../src/modules/zfs/ZfsJob.cpp" line="192"/>
<source>Internal data missing</source>
- <translation type="unfinished"/>
+ <translation>Липсват вътрешни данни</translation>
</message>
<message>
<location filename="../src/modules/zfs/ZfsJob.cpp" line="192"/>
<location filename="../src/modules/zfs/ZfsJob.cpp" line="257"/>
<source>Failed to create zpool</source>
- <translation type="unfinished"/>
+ <translation>Неуспешно създаване на zpool</translation>
</message>
<message>
<location filename="../src/modules/zfs/ZfsJob.cpp" line="329"/>
<source>Failed to create dataset</source>
- <translation type="unfinished"/>
+ <translation>Неуспешно създаване на набор от данни</translation>
</message>
<message>
<location filename="../src/modules/zfs/ZfsJob.cpp" line="330"/>
<source>The output was: </source>
- <translation type="unfinished"/>
+ <translation>Резултатът беше:</translation>
</message>
</context>
<context>
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
- <translation type="unfinished"/>
+ <translation>Относно</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Отстраняване на грешки</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Показване информация за Calamares</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Покажи информация за отстраняване на грешки</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
<source>Installation Completed</source>
- <translation type="unfinished"/>
+ <translation>Инсталацията е завършена</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
<source>%1 has been installed on your computer.<br/>
You may now restart into your new system, or continue using the Live environment.</source>
- <translation type="unfinished"/>
+ <translation>%1 е инсталиран на вашия компютър. <br/>
+ Сега можете да рестартирате новата си система или да продължите да използватеLive средата.</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="65"/>
<source>Close Installer</source>
- <translation type="unfinished"/>
+ <translation>Затваряне на инсталатора</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="71"/>
<source>Restart System</source>
- <translation type="unfinished"/>
+ <translation>Рестартиране на системата</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="89"/>
<source><p>A full log of the install is available as installation.log in the home directory of the Live user.<br/>
This log is copied to /var/log/installation.log of the target system.</p></source>
- <translation type="unfinished"/>
+ <translation><p>Пълен дневник на инсталацията е достъпен като installation.log в домашнатадиректория на Live системата. <br/>
+ Този дневник се копира в /var/log/installation.log на целеватасистема.</p></translation>
</message>
</context>
<context>
@@ -4174,23 +4199,24 @@ Output:
<message>
<location filename="../src/modules/finishedq/finishedq@mobile.qml" line="36"/>
<source>Installation Completed</source>
- <translation type="unfinished"/>
+ <translation>Инсталацията е завършена</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq@mobile.qml" line="43"/>
<source>%1 has been installed on your computer.<br/>
You may now restart your device.</source>
- <translation type="unfinished"/>
+ <translation>%1 е инсталиран на вашия компютър.<br/>
+Сега можете да рестартирате устройството си.</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq@mobile.qml" line="65"/>
<source>Close</source>
- <translation type="unfinished"/>
+ <translation>Затваряне</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq@mobile.qml" line="71"/>
<source>Restart</source>
- <translation type="unfinished"/>
+ <translation>Рестартиране</translation>
</message>
</context>
<context>
@@ -4199,18 +4225,20 @@ Output:
<location filename="../src/modules/localeq/i18n.qml" line="50"/>
<source><h1>Languages</h1> </br>
The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.</source>
- <translation type="unfinished"/>
+ <translation><h1>Езици</h1></br>
+ Регионалните настройки на системата засягат езика и набора от символи за някои елементи на потребителския команден ред. Текущата настройка е <strong>%1</strong>.</translation>
</message>
<message>
<location filename="../src/modules/localeq/i18n.qml" line="123"/>
<source><h1>Locales</h1> </br>
The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.</source>
- <translation type="unfinished"/>
+ <translation><h1>Регионални настройки</h1></br>
+ Регионалните настройки на системата определя формата на числата и датите. Текущата настройка е <strong>%1 </strong>.</translation>
</message>
<message>
<location filename="../src/modules/localeq/i18n.qml" line="189"/>
<source>Back</source>
- <translation type="unfinished"/>
+ <translation>Назад</translation>
</message>
</context>
<context>
@@ -4218,7 +4246,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
<source>To activate keyboard preview, select a layout.</source>
- <translation type="unfinished"/>
+ <translation>За да активирате визуализацията на клавиатурата, изберете подредба.</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="86"/>
@@ -4228,7 +4256,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="256"/>
<source>Layouts</source>
- <translation type="unfinished"/>
+ <translation>Подредби</translation>
</message>
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="265"/>
@@ -4238,7 +4266,7 @@ Output:
<message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="180"/>
<source>Variants</source>
- <translation type="unfinished"/>
+ <translation>Варианти</translation>
</message>
</context>
<context>
@@ -4246,7 +4274,7 @@ Output:
<message>
<location filename="../src/modules/localeq/localeq.qml" line="81"/>
<source>Change</source>
- <translation type="unfinished"/>
+ <translation>Промяна</translation>
</message>
</context>
<context>
@@ -4255,7 +4283,8 @@ Output:
<location filename="../src/modules/notesqml/notesqml.qml" line="50"/>
<source><h3>%1</h3>
<p>These are example release notes.</p></source>
- <translation type="unfinished"/>
+ <translation><h3>%1 </h3>
+ <p>Това са примерни бележки за издание.</p></translation>
</message>
</context>
<context>
@@ -4264,37 +4293,38 @@ Output:
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="45"/>
<source>LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
Default option.</source>
- <translation type="unfinished"/>
+ <translation>Libreoffice е мощен и безплатен офис пакет, използван от милиони хорапо целия свят. Той включва няколко приложения, които го правят най-универсалния безплатен офис пакет с отворен код на пазара.<br/>
+ Опция по подразбиране.</translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="59"/>
<source>LibreOffice</source>
- <translation type="unfinished"/>
+ <translation>LibreOffice</translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="108"/>
<source>If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.</source>
- <translation type="unfinished"/>
+ <translation>Ако не искате да инсталирате офис пакет, просто изберете Без офис пакет.При необходимост винаги можете по-късно да добавите един (или повече) на вече инсталираната си система.</translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="121"/>
<source>No Office Suite</source>
- <translation type="unfinished"/>
+ <translation>Без офис пакет</translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="172"/>
<source>Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support. It will be just a desktop, file browser, package manager, text editor and simple web-browser.</source>
- <translation type="unfinished"/>
+ <translation>Създайте минимална инсталация на работната среда, премахнете всички допълнителни приложения и решете по-късно, какво бихте искали да добавите към вашата система. Примери за това, което няма да има на такава инсталация: няма да има офис приложения, медийни плеъри, програми за преглед на изображения или поддръжка на печат. Това ще бъде само работен плот с файлов мениджър, текстов редактор, прост уеб браузър и мениджър на пакети.</translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="185"/>
<source>Minimal Install</source>
- <translation type="unfinished"/>
+ <translation>Минимална инсталация</translation>
</message>
<message>
<location filename="../src/modules/packagechooserq/packagechooserq.qml" line="233"/>
<source>Please select an option for your install, or use the default: LibreOffice included.</source>
- <translation type="unfinished"/>
+ <translation>Моля, изберете опция за вашата инсталация или използвайте по подразбиране: LibreOfficeвключен.</translation>
</message>
</context>
<context>
@@ -4322,12 +4352,32 @@ Output:
</ul>
<p>The vertical scrollbar is adjustable, current width set to 10.</p></source>
- <translation type="unfinished"/>
+ <translation><h3>%1</h3>
+<p>Това e примерен QML файл, показващ опции с форматиран текст и съдържание с бързо прелистване.</p>
+
+<p> QML с форматиран текст може да използва HTML етикети, съдържание с бързо прелистване е удачно за сензорни екрани.</p>
+
+ <p><b> Това е текст с получер шрифт</b></p>
+ <p><i> Това е текст с курсивен шрифт</i></p>
+ <p><u> Това е подчертан текст </u></p>
+ <p><center> Този текст ще бъде подравнен в центъра.</center></p>
+ <p><s> Това е зачертаване </s></p>
+
+ <p> Примерен код:
+<code> ls -l/home </code></p>
+
+ <p><b> Списъци:</b></p>
+ <ul>
+ <li> Intel CPU системи </li>
+ <li> AMD CPU системи </li>
+ </ul>
+
+ <p> Вертикалната лента за превъртане е регулируема, актуалната ширина е зададена на 10.</p></translation>
</message>
<message>
<location filename="../src/modules/welcomeq/release_notes.qml" line="76"/>
<source>Back</source>
- <translation type="unfinished"/>
+ <translation>Назад</translation>
</message>
</context>
<context>
@@ -4335,7 +4385,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="43"/>
<source>Pick your user name and credentials to login and perform admin tasks</source>
- <translation type="unfinished"/>
+ <translation>Изберете потребителското си име и идентификационни данни, за да влезете системата и изпълнявайте администраторски задачи</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="56"/>
@@ -4345,7 +4395,7 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="63"/>
<source>Your Full Name</source>
- <translation type="unfinished"/>
+ <translation>Вашето пълно име</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="80"/>
@@ -4355,22 +4405,22 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="87"/>
<source>Login Name</source>
- <translation type="unfinished"/>
+ <translation>Име за вход</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="116"/>
<source>If more than one person will use this computer, you can create multiple accounts after installation.</source>
- <translation type="unfinished"/>
+ <translation>Ако повече от един човек ще използва този компютър, можете да създадете множествоакаунти след инсталирането.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="129"/>
<source>Only lowercase letters, numbers, underscore and hyphen are allowed.</source>
- <translation type="unfinished"/>
+ <translation>Разрешени са само малки букви, цифри, долна черта и тире.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="138"/>
<source>root is not allowed as username.</source>
- <translation type="unfinished"/>
+ <translation>root не е разрешен като потребителско име.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="147"/>
@@ -4380,17 +4430,17 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="153"/>
<source>Computer Name</source>
- <translation type="unfinished"/>
+ <translation>Име на компютър:</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="180"/>
<source>This name will be used if you make the computer visible to others on a network.</source>
- <translation type="unfinished"/>
+ <translation>Това име ще бъде използвано, ако направите компютъра видим за другите в мрежата.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="202"/>
<source>localhost is not allowed as hostname.</source>
- <translation type="unfinished"/>
+ <translation>localhost не е разрешен като име на хост.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="211"/>
@@ -4400,42 +4450,42 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="221"/>
<source>Password</source>
- <translation type="unfinished"/>
+ <translation>Парола</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="238"/>
<source>Repeat Password</source>
- <translation type="unfinished"/>
+ <translation>Повтаряне на паролата</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="265"/>
<source>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</source>
- <translation type="unfinished"/>
+ <translation>Въведете една и съща парола два пъти, така че да може да бъде проверена за грешки във въвеждането.Добрата парола съдържа комбинация от букви, цифри и пунктуации. Трябва да е дълга поне осем знака и трябва да се променя периодично.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="410"/>
<source>Validate passwords quality</source>
- <translation type="unfinished"/>
+ <translation>Проверка на качеството на паролите</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="420"/>
<source>When this box is checked, password-strength checking is done and you will not be able to use a weak password.</source>
- <translation type="unfinished"/>
+ <translation>Когато това поле е маркирано, се извършва проверка на силата на паролата и няма да можете да използвате слаба парола.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="402"/>
<source>Log in automatically without asking for the password</source>
- <translation type="unfinished"/>
+ <translation>Автоматично влизане без изискване за парола</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="193"/>
<source>Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.</source>
- <translation type="unfinished"/>
+ <translation>Само букви, цифри, долна черта и тире са разрешени, минимуми от двазнака.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="297"/>
<source>Reuse user password as root password</source>
- <translation type="unfinished"/>
+ <translation>Използване на потребителската парола и за парола на root</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="305"/>
@@ -4445,22 +4495,22 @@ Output:
<message>
<location filename="../src/modules/usersq/usersq.qml" line="318"/>
<source>Choose a root password to keep your account safe.</source>
- <translation type="unfinished"/>
+ <translation>Изберете парола за root, за да запазите акаунта си сигурен.</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="328"/>
<source>Root Password</source>
- <translation type="unfinished"/>
+ <translation>Парола за root</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="346"/>
<source>Repeat Root Password</source>
- <translation type="unfinished"/>
+ <translation>Повторете паролата за root</translation>
</message>
<message>
<location filename="../src/modules/usersq/usersq.qml" line="372"/>
<source>Enter the same password twice, so that it can be checked for typing errors.</source>
- <translation type="unfinished"/>
+ <translation>Въведете една и съща парола два пъти, така че да може да бъде проверена за грешки във въвеждането.</translation>
</message>
</context>
<context>
@@ -4469,27 +4519,28 @@ Output:
<location filename="../src/modules/welcomeq/welcomeq.qml" line="35"/>
<source><h3>Welcome to the %1 <quote>%2</quote> installer</h3>
<p>This program will ask you some questions and set up %1 on your computer.</p></source>
- <translation type="unfinished"/>
+ <translation><h3> Добре дошли в <quote> %2 </quote> инсталатор на %1</h3>
+<p> Тази програма ще ви зададе някои въпроси и ще инсталира %1 навашият компютър.</p></translation>
</message>
<message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
<source>Support</source>
- <translation type="unfinished"/>
+ <translation>Поддръжка</translation>
</message>
<message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
<source>Known issues</source>
- <translation type="unfinished"/>
+ <translation>Известни проблеми</translation>
</message>
<message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
<source>Release notes</source>
- <translation type="unfinished"/>
+ <translation>Бележки към изданието</translation>
</message>
<message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
<source>Donate</source>
- <translation type="unfinished"/>
+ <translation>Дарение</translation>
</message>
</context>
</TS>
diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts
index 9f08c3813d013f6b387c301a2cfdef57084825ac..b83c8c5fbf6c1ba5e41db637fa512a5767f4e490 100644
--- a/lang/calamares_bn.ts
+++ b/lang/calamares_bn.ts
@@ -502,12 +502,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 ইনস্টল</translation>
</message>
@@ -776,27 +776,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>%1-এ কীবোর্ড নকশা নির্ধারণ করুন।</translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>%1/%2 এ কীবোর্ড বিন্যাস নির্ধারণ করুন।</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3095,7 +3095,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4127,14 +4127,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>ডিবাগ তথ্য দেখান</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts
index a569aee9084fdb8568d17cfebc3fd0632736ddf8..93bccb44ed6db84f26dd91752ba82b321adaf01a 100644
--- a/lang/calamares_ca.ts
+++ b/lang/calamares_ca.ts
@@ -507,12 +507,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Programa de configuració %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Instal·lador de %1</translation>
</message>
@@ -781,27 +781,27 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Establirà el model del teclat a %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Establirà la distribució del teclat a %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Estableix la zona horària a %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>La llengua del sistema s'establirà a %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Els números i les dates de la configuració local s'establiran a %1.</translation>
</message>
@@ -3105,7 +3105,7 @@ Sortida:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4140,14 +4140,26 @@ La configuració pot continuar, però algunes característiques podrien estar in
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Quant a</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Depuració</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Mostra informació quant al Calamares.</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Informació de depuració</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_ca@valencia.ts b/lang/calamares_ca@valencia.ts
index 890995de7a774782be80d67756fc8c5753fc2cb9..644dea648e314c2363a91b00cea79a79d479237b 100644
--- a/lang/calamares_ca@valencia.ts
+++ b/lang/calamares_ca@valencia.ts
@@ -503,12 +503,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Programa de configuració %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Instal·lador de %1</translation>
</message>
@@ -777,27 +777,27 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Estableix el model de teclat en %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Estableix la distribució del teclat a %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Estableix el fus horari a %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>La llengua del sistema s'establirà en %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Els números i les dates de la configuració local s'establiran en %1.</translation>
</message>
@@ -3101,7 +3101,7 @@ Eixida:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4136,14 +4136,26 @@ La configuració pot continuar, però és possible que algunes característiques
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Quant a</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Mostra la informació de depuració</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts
index 8e03b527ae7a7dec544fb06d185e4d94f57fba1d..e79afeb2aa416a007b66533e0269601619100f55 100644
--- a/lang/calamares_cs_CZ.ts
+++ b/lang/calamares_cs_CZ.ts
@@ -511,12 +511,12 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Instalátor %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Instalátor %1</translation>
</message>
@@ -785,27 +785,27 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Nastavit model klávesnice na %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Nastavit rozvržení klávesnice na %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Nastavit časové pásmo na %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Jazyk systému bude nastaven na %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Formát zobrazení čísel, data a času bude nastaven dle národního prostředí %1.</translation>
</message>
@@ -3127,7 +3127,7 @@ Výstup:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4162,14 +4162,26 @@ Výstup:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>O projektu</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Ladění</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Zobrazit ladící informace</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts
index 926fca66f0e8d838d409003da637eaae23dc9731..9507d992a6e46e163be6912e060c5fd0aad87404 100644
--- a/lang/calamares_da.ts
+++ b/lang/calamares_da.ts
@@ -503,12 +503,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1-opsætningsprogram</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1-installationsprogram</translation>
</message>
@@ -777,27 +777,27 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Indstil tastaturmodel til %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Indstil tastaturlayout til %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Indstil tidszone til %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Systemets sprog indstilles til %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Lokalitet for tal og datoer indstilles til %1.</translation>
</message>
@@ -3101,7 +3101,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4137,14 +4137,26 @@ setting
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Om</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Fejlfinde</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Vis fejlretningsinformation</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts
index a6b385bd33e1af321e80f7e2fa35dd371f538040..376a68089ab668031cdf83574015da5e1f7a656b 100644
--- a/lang/calamares_de.ts
+++ b/lang/calamares_de.ts
@@ -6,18 +6,18 @@
<message>
<location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
<source><h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/></source>
- <translation type="unfinished"/>
+ <translation><h1>%1</h1><br/><strong>%2<br/> für %3</strong><br/><br/></translation>
</message>
<message>
<location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
<source>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
- <translation type="unfinished"/>
+ <translation>Danke an <a href="https://calamares.io/team/">das Calamares Team</a> und das <a href="https://www.transifex.com/calamares/calamares/">Calamares Übersetzer Team</a>.<br/><br/><a href="https://calamares.io/">Die Calamares</a> Entwicklung wird gesponsored von <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
<location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
<source>Copyright %1-%2 %3 &lt;%4&gt;<br/></source>
<extracomment>Copyright year-year Name <email-address></extracomment>
- <translation type="unfinished"/>
+ <translation>Copyright %1-%2 %3 &lt;%4&gt;<br/></translation>
</message>
</context>
<context>
@@ -507,12 +507,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 Installationsprogramm</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Installationsprogramm</translation>
</message>
@@ -782,27 +782,27 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Setze Tastaturmodell auf %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Setze Tastaturbelegung auf %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Setze Zeitzone auf %1%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Die Systemsprache wird auf %1 eingestellt.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Das Format für Zahlen und Datum wird auf %1 gesetzt.</translation>
</message>
@@ -1454,12 +1454,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="259"/>
<source>Passphrase for existing partition</source>
- <translation type="unfinished"/>
+ <translation>Passwort für existierende Partition</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
<source>Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
- <translation type="unfinished"/>
+ <translation>Partition %1 konnte mit diesem Passwort nicht entschlüsselt werden.<br/><br/>Editieren Sie die Partition erneut und geben Sie das korrekte Passwort an oder löschen Sie diese und erstellen Sie eine neue verschlüsselte Partition.</translation>
</message>
</context>
<context>
@@ -2883,17 +2883,17 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="254"/>
<source>Unsafe partition actions are enabled.</source>
- <translation type="unfinished"/>
+ <translation>Unsichere Partitionierungsaktionen sind aktiviert.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="257"/>
<source>Partitioning is configured to <b>always</b> fail.</source>
- <translation type="unfinished"/>
+ <translation>Partitionierung ist so eingestellt, dass sie <b>immer</b> fehlschlägt.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="260"/>
<source>No partitions will be changed.</source>
- <translation type="unfinished"/>
+ <translation>Keine Partitionen werden verändert.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="300"/>
@@ -2953,7 +2953,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="594"/>
<source>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</source>
- <translation type="unfinished"/>
+ <translation>Eine Partitionstabelle vom Typ GPT ist die beste Option für alle Systeme. Dieses Installationsprogramm unterstützt solch ein Setup auch für BIOS-Systeme.<br/><br/>Um eine GPT-Partition für BIOS-Systeme zu konfigurieren, (wenn nicht bereits geschehen) gehen Sie zurück und setzen Sie die Partitionstabelle auf GPT, als nächstes erstellen Sie eine 8 MB große unformattierte Partition mit der <strong>%2</strong> Markierung aktiviert.<br/><br/>Eine unformattierte 8 MB Partition ist nötig, um %1 auf einem BIOS-System mit GPT zu starten.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="626"/>
@@ -3106,7 +3106,7 @@ Ausgabe:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4141,14 +4141,26 @@ Ausgabe:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Über</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Beheben von Fehlern</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Informationen über Calamares anzeigen</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Informationen zur Fehlersuche anzeigen</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts
index c3b08c5d8d0b6f6a64f4cdbc1f90375711aa150f..ede86c365b70364106eead4c5e869e35105a846d 100644
--- a/lang/calamares_el.ts
+++ b/lang/calamares_el.ts
@@ -502,12 +502,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Εφαρμογή εγκατάστασης του %1</translation>
</message>
@@ -776,27 +776,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Ορισμός του μοντέλου πληκτρολογίου σε %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Ορισμός της διάταξης πληκτρολογίου σε %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Η τοπική γλώσσα του συστήματος έχει οριστεί σε %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3095,7 +3095,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4127,14 +4127,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Εμφάνιση πληροφοριών απασφαλμάτωσης</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts
index 11db3909554fcd5473e3a674ac3a4907524592f0..517b3a0ba0b314c7e42ba42156f77608b0afcb54 100644
--- a/lang/calamares_en.ts
+++ b/lang/calamares_en.ts
@@ -507,12 +507,12 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 Setup Program</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Installer</translation>
</message>
@@ -781,27 +781,27 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Set keyboard model to %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Set keyboard layout to %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Set timezone to %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>The system language will be set to %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>The numbers and dates locale will be set to %1.</translation>
</message>
@@ -3105,7 +3105,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4140,14 +4140,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>About</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Show information about Calamares</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Show debug information</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts
index bada0d3fd41f1d3e786fffc6451f5daec9002119..a5e60bf7d7667cca54cc19d6e701e1e5dc926b0e 100644
--- a/lang/calamares_en_GB.ts
+++ b/lang/calamares_en_GB.ts
@@ -502,12 +502,12 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Installer</translation>
</message>
@@ -776,27 +776,27 @@ The installer will quit and all changes will be lost.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Set keyboard model to %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Set keyboard layout to %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>The system language will be set to %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>The numbers and dates locale will be set to %1.</translation>
</message>
@@ -3098,7 +3098,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4130,14 +4130,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Show debug information</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts
index 5c8d8574b5a5726722d7c88cc8e6f6c592068c18..24614e5587793df7861332cb29e7ef67d1db647d 100644
--- a/lang/calamares_eo.ts
+++ b/lang/calamares_eo.ts
@@ -506,12 +506,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Instalilo</translation>
</message>
@@ -780,27 +780,27 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3099,7 +3099,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1(%2)</translation>
</message>
@@ -4131,14 +4131,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts
index 60959b887c3ce135ed0b7ed244f2805d792b824e..12a41e007a19a5fa8b8e5fcdbc6d61c027136f1b 100644
--- a/lang/calamares_es.ts
+++ b/lang/calamares_es.ts
@@ -6,18 +6,18 @@
<message>
<location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
<source><h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/></source>
- <translation type="unfinished"/>
+ <translation><h1>%1</h1><br/><strong>%2<br/>para %3</strong><br/><br/></translation>
</message>
<message>
<location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
<source>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
- <translation type="unfinished"/>
+ <translation>Gracias al <a href="https://calamares.io/team/">equipo de Calamares</a> y al <a href="https://www.transifex.com/calamares/calamares/">equipo de traductores de Calamares</a>. <br/><br/>El desarrollo de <a href="https://calamares.io/">Calamares</a> está patrocinado por <br/><a href="http://www.blue-systems.com/">Blue Systems</a>- Liberador de Software.</translation>
</message>
<message>
<location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
<source>Copyright %1-%2 %3 &lt;%4&gt;<br/></source>
<extracomment>Copyright year-year Name <email-address></extracomment>
- <translation type="unfinished"/>
+ <translation>Copyright %1-%2 %3 &lt;%4&gt;<br/></translation>
</message>
</context>
<context>
@@ -509,12 +509,12 @@ El instalador se cerrará y todos tus cambios se perderán.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Programa de configuración de %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Instalador de %1</translation>
</message>
@@ -783,27 +783,27 @@ El instalador se cerrará y todos tus cambios se perderán.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Establecer el modelo de teclado como %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Establecer la disposición de teclado a %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Configurar el huso horario a %1/%2</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>El idioma del sistema se establecerá a %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>El formato de números y fechas aparecerá en %1.</translation>
</message>
@@ -1455,12 +1455,12 @@ El instalador se cerrará y todos tus cambios se perderán.</translation>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="259"/>
<source>Passphrase for existing partition</source>
- <translation type="unfinished"/>
+ <translation>Frase de contraseña para la partición existente</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
<source>Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
- <translation type="unfinished"/>
+ <translation>La partición %1 no se pudo descifrar con la frase de contraseña proporcionada. Edite la partición nuevamente y proporcione la frase de contraseña correcta o elimine y cree una nueva partición cifrada.</translation>
</message>
</context>
<context>
@@ -3116,7 +3116,7 @@ Información de salida:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4151,14 +4151,26 @@ Información de salida:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Acerca de</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Depurar</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Mostrar información acerca de Calamares</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Ver la información de depuración.</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts
index 0dd159f414d82ed41e46877252e8dac1ba412815..8dea78a99d0f566b23eadc93b7470cb134000952 100644
--- a/lang/calamares_es_MX.ts
+++ b/lang/calamares_es_MX.ts
@@ -505,12 +505,12 @@ El instalador terminará y se perderán todos los cambios.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 Programa de instalación</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Instalador</translation>
</message>
@@ -780,27 +780,27 @@ El instalador terminará y se perderán todos los cambios.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Ajustar el modelo de teclado a %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Ajustar teclado a %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>El lenguaje del sistema será establecido a %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Los números y datos locales serán establecidos a %1.</translation>
</message>
@@ -3111,7 +3111,7 @@ Salida
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4144,14 +4144,26 @@ Salida
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Depurar</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Mostrar información de depuración</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts
index 7114d184f19126ca9f446ee2dac74d162adbf01b..756b6d48bfdd67c788d55d2b81e18d6b3cb52b82 100644
--- a/lang/calamares_es_PR.ts
+++ b/lang/calamares_es_PR.ts
@@ -503,12 +503,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
@@ -777,27 +777,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3105,7 +3105,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -4137,14 +4137,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts
index 8a510d374155e33f8d7b4944e91ac58c7ab15fca..aa2fda2487a8bbb0d6ac94eab40d1d9b7dc29d15 100644
--- a/lang/calamares_et.ts
+++ b/lang/calamares_et.ts
@@ -502,12 +502,12 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 paigaldaja</translation>
</message>
@@ -776,27 +776,27 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Sea klaviatuurimudeliks %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Sea klaviatuuripaigutuseks %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Süsteemikeeleks määratakse %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Arvude ja kuupäevade lokaaliks seatakse %1.</translation>
</message>
@@ -3098,7 +3098,7 @@ Väljund:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4130,14 +4130,26 @@ Väljund:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Silu</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Kuva silumisteavet</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts
index f694415d46c98922429513b52ee4fcb44e6e1870..50172c29ec2b9d6f24708eb548a8b419a2204fc0 100644
--- a/lang/calamares_eu.ts
+++ b/lang/calamares_eu.ts
@@ -502,12 +502,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Instalatzailea</translation>
</message>
@@ -776,27 +776,27 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Ezarri teklatu mota %1ra.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Ezarri teklatu diseinua %1%2ra.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>%1 ezarriko da sistemako hizkuntza bezala.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Zenbaki eta daten eskualdea %1-(e)ra ezarri da.</translation>
</message>
@@ -3097,7 +3097,7 @@ Irteera:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4129,14 +4129,26 @@ Irteera:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Honi buruz</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Erakutsi arazte informazioa</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts
index 3cb8b1b11dd072d6e8f94a9dedf7052e2275f67c..f1e5f4a7a6e4c0bbe613fda0eceafa4f0029bc5b 100644
--- a/lang/calamares_fa.ts
+++ b/lang/calamares_fa.ts
@@ -507,12 +507,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 برنامه راهاندازی</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>نصبکنندهٔ %1</translation>
</message>
@@ -781,27 +781,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>تنظیم مدل صفحهکلید به %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>تنظیم چینش صفحهکلید به %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>منطقه زمانی را تنظیم کنید 1%</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>زبان سامانه به %1 تنظیم خواهد شد.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>محلی و اعداد و تاریخ ها روی٪ 1 تنظیم می شوند.</translation>
</message>
@@ -3100,7 +3100,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4135,14 +4135,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>درباره</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>نمایش اطّلاعات اشکالزدایی</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts
index 43a97f6eddcebed8a360c35e5114026cd086a93c..d10c823ae305351c6c5cc88e41b8e434731f8f9f 100644
--- a/lang/calamares_fi_FI.ts
+++ b/lang/calamares_fi_FI.ts
@@ -507,12 +507,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1-asennusohjelma</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1-asentaja</translation>
</message>
@@ -781,27 +781,27 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Aseta näppäimiston malli %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Aseta näppäimiston asetteluksi %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Aseta aikavyöhykkeeksi %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Järjestelmän kielen asetuksena on %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Numerot ja päivämäärät, paikallinen asetus on %1.</translation>
</message>
@@ -3106,7 +3106,7 @@ Ulostulo:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4141,14 +4141,26 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Tietoa</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Virheiden etsintä</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Näytä virheenkorjaustiedot</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts
index 4b33133af6a7f30345430127d6bb3aaa6d56da3f..41a3633aad983c9821937a4af2a9b9757c248378 100644
--- a/lang/calamares_fr.ts
+++ b/lang/calamares_fr.ts
@@ -509,12 +509,12 @@ L'installateur se fermera et les changements seront perdus.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Programme de configuration de %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Installateur %1</translation>
</message>
@@ -783,27 +783,27 @@ L'installateur se fermera et les changements seront perdus.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Configurer le modèle de clavier à %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Configurer la disposition clavier à %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Configurer timezone sur %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>La langue du système sera réglée sur %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Les nombres et les dates seront réglés sur %1.</translation>
</message>
@@ -3117,7 +3117,7 @@ Sortie
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4152,14 +4152,26 @@ Sortie
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>À propos</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Débug</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Afficher les informations de dépannage</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_fur.ts b/lang/calamares_fur.ts
index 8cb96ec3278c1fb0cd2fcb621c414b27ee69735b..12b64cd9e8ad0ca7a7b0047aaa36968d63ff6e30 100644
--- a/lang/calamares_fur.ts
+++ b/lang/calamares_fur.ts
@@ -503,12 +503,12 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Program di configurazion di %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Program di instalazion di %1</translation>
</message>
@@ -777,27 +777,27 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Stabilî il model di tastiere a %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Stabilî la disposizion di tastiere a %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Stabilî il fûs orari a %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>La lenghe dal sisteme e vignarà configurade a %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>La localizazion dai numars e des datis e vignarà configurade a %1.</translation>
</message>
@@ -3101,7 +3101,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4136,14 +4136,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Informazions</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Mostre informazions di debug</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts
index d3e9af666be66f5a405851235c380627171e83b6..8a34edda4ee4d413c3fa0d62161b668820816f99 100644
--- a/lang/calamares_gl.ts
+++ b/lang/calamares_gl.ts
@@ -503,12 +503,12 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Instalador de %1</translation>
</message>
@@ -777,27 +777,27 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Seleccionado modelo de teclado a %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Seleccionada a disposición do teclado a %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>A linguaxe do sistema será establecida a %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>A localización de números e datas será establecida a %1.</translation>
</message>
@@ -3099,7 +3099,7 @@ Saída:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4131,14 +4131,26 @@ Saída:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Mostrar informes de depuración</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts
index f793c18e96a1929618bcf8bad180582a9d98272b..4e85dd2514258cef6d629b162e0777d83879448b 100644
--- a/lang/calamares_gu.ts
+++ b/lang/calamares_gu.ts
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
@@ -775,27 +775,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3094,7 +3094,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -4126,14 +4126,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts
index e0a741b5b2be10de71703cd58fb4d5078f6327cf..1706ba6be1790de35039dfbb36bfeeac58428546 100644
--- a/lang/calamares_he.ts
+++ b/lang/calamares_he.ts
@@ -511,12 +511,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>תכנית התקנת %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>אשף התקנת %1</translation>
</message>
@@ -785,27 +785,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>הגדרת דגם המקלדת בתור %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>הגדרת פריסת לוח המקשים בתור %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>הגדרת אזור הזמן לכדי %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>שפת המערכת תוגדר להיות %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>תבנית של המספרים והתאריכים של המיקום יוגדרו להיות %1.</translation>
</message>
@@ -3127,7 +3127,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4162,14 +4162,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>על אודות</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>ניפוי שגיאות</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>הצגת מידע על Calamares</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>הצגת מידע ניפוי שגיאות</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts
index 2e61ae44364fc6225ee13d2c3bc2da0fc314acf8..7d7dc9547c7b26fd18b615d9be18240e78a43a2b 100644
--- a/lang/calamares_hi.ts
+++ b/lang/calamares_hi.ts
@@ -507,12 +507,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 सेटअप प्रोग्राम</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 इंस्टॉलर</translation>
</message>
@@ -781,27 +781,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>कुंजीपटल का मॉडल %1 सेट करें।<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>कुंजीपटल का अभिन्यास %1/%2 सेट करें।</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>समय क्षेत्र %1%2 सेट करें।</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>सिस्टम भाषा %1 सेट की जाएगी।</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>संख्या व दिनांक स्थानिकी %1 सेट की जाएगी।</translation>
</message>
@@ -3105,7 +3105,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4140,14 +4140,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>बारे में</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>डीबग संबंधी जानकारी दिखाएँ</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts
index 905f95d1563a200bebc51f0ee52d25bcd399b6b0..a2027b370febe341563b8b46dc6d25c52549449b 100644
--- a/lang/calamares_hr.ts
+++ b/lang/calamares_hr.ts
@@ -509,12 +509,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 instalacijski program</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Instalacijski program</translation>
</message>
@@ -783,27 +783,27 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Postavi model tipkovnice na %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Postavi raspored tipkovnice na %1%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Postavi vremesku zonu na %1%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Jezik sustava će se postaviti na %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Regionalne postavke brojeva i datuma će se postaviti na %1.</translation>
</message>
@@ -3116,7 +3116,7 @@ Izlaz:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4151,14 +4151,26 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>O programu</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Uklanjanje grešaka</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Prikaži informacije o Calamares instalacijskom programu</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Prikaži debug informaciju</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts
index 835df7d784b86398efa5108bc8d26f1cb2537003..e8afb0a88d6f4a90d899fb1dc28749e7ffc2fd97 100644
--- a/lang/calamares_hu.ts
+++ b/lang/calamares_hu.ts
@@ -503,12 +503,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 Program telepítése</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Telepítő</translation>
</message>
@@ -777,27 +777,27 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Billentyűzet típus beállítása %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Billentyűzet kiosztás beállítása %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>A rendszer területi beállítása %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>A számok és dátumok területi beállítása %1.</translation>
</message>
@@ -3100,7 +3100,7 @@ Kimenet:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4133,14 +4133,26 @@ Calamares hiba %1.</translation>
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Hibakeresés</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Hibakeresési információk mutatása</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts
index 676de374edd36c26b14f2db7bb5a3f410393bad0..a84f5b7e513932b3b92030f07b8c646be9cd97b0 100644
--- a/lang/calamares_id.ts
+++ b/lang/calamares_id.ts
@@ -500,12 +500,12 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Installer %1</translation>
</message>
@@ -774,27 +774,27 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Setel model papan ketik ke %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Setel tata letak papan ketik ke %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Terapkan zona waktu ke %1/%2</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Bahasa sistem akan disetel ke %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Nomor dan tanggal lokal akan disetel ke %1.</translation>
</message>
@@ -3088,7 +3088,7 @@ Keluaran:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4120,14 +4120,26 @@ Keluaran:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Tampilkan informasi debug</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_ie.ts b/lang/calamares_ie.ts
index b7d08ce7e1c7e34239de8ead316b96391b6faeaa..852f0ad368a066edf11844f621a467ce0696b149 100644
--- a/lang/calamares_ie.ts
+++ b/lang/calamares_ie.ts
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Configiration de %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Installator de %1</translation>
</message>
@@ -775,27 +775,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3094,7 +3094,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4126,14 +4126,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Pri</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts
index 451cb1a0484e4b7aa31f62403cc8f18de0917fe7..52a5b40ae08de9645393d49a7c1758b9a3c37ccd 100644
--- a/lang/calamares_is.ts
+++ b/lang/calamares_is.ts
@@ -502,12 +502,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 uppsetningarforrit</translation>
</message>
@@ -776,27 +776,27 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Tungumál kerfisins verður sett sem %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3095,7 +3095,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4127,14 +4127,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Birta villuleitarupplýsingar</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts
index f49e78b43312bdc519c4d90fafd5ac464cd09af9..c5cd9cc59dc8ca32bca6dcadb6fd1e503ee6d3c8 100644
--- a/lang/calamares_it_IT.ts
+++ b/lang/calamares_it_IT.ts
@@ -504,12 +504,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 Programma d'installazione</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Programma di installazione</translation>
</message>
@@ -778,27 +778,27 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Impostare il modello di tastiera a %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Impostare il layout della tastiera a %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Imposta fuso orario a %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>La lingua di sistema sarà impostata a %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>I numeri e le date locali saranno impostati a %1.</translation>
</message>
@@ -3109,7 +3109,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4141,14 +4141,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Informazioni su</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Mostra le informazioni di debug</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_ja-Hira.ts b/lang/calamares_ja-Hira.ts
index 50326192be80a5c495c45acebcf2b07d9a7c71e5..ce85c817ff246fa7d0735b3087384261497b58b3 100644
--- a/lang/calamares_ja-Hira.ts
+++ b/lang/calamares_ja-Hira.ts
@@ -499,12 +499,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
@@ -773,27 +773,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3083,7 +3083,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -4115,14 +4115,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts
index 21034d5f09a50b83e715d9d674b327978efec1e4..9a118eec42426b1ddac113a78cc0b5f3041a6719 100644
--- a/lang/calamares_ja.ts
+++ b/lang/calamares_ja.ts
@@ -505,12 +505,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 セットアッププログラム</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 インストーラー</translation>
</message>
@@ -779,27 +779,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>キーボードのモデルを %1 に設定する。<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>キーボードのレイアウトを %1/%2 に設定する。</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>タイムゾーンを %1/%2 に設定する。</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>システムの言語を %1 に設定する。</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>数値と日付のロケールを %1 に設定する。</translation>
</message>
@@ -3096,7 +3096,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4131,14 +4131,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>About</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>デバッグ</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Calamares に関する情報を表示する</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>デバッグ情報を表示</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts
index 31382cb8ea038f56b7ce403f912b7f9b501b759e..c47c9f00921ceda158aedfa0575275ee683417cc 100644
--- a/lang/calamares_kk.ts
+++ b/lang/calamares_kk.ts
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
@@ -775,27 +775,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3094,7 +3094,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4126,14 +4126,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts
index 0e2621e895a36c3d3f994ccf852f9f176205d41d..269f71600493d5840ecf7fd1951c336d6c4a5a8e 100644
--- a/lang/calamares_kn.ts
+++ b/lang/calamares_kn.ts
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
@@ -775,27 +775,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3094,7 +3094,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -4126,14 +4126,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts
index 1c341d9418cea989cac20395314af1e978eeade6..4b88a51e53996ea1cac27e5b59bf314fdf48a064 100644
--- a/lang/calamares_ko.ts
+++ b/lang/calamares_ko.ts
@@ -505,12 +505,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 설치 프로그램</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 설치 관리자</translation>
</message>
@@ -779,27 +779,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>키보드 모델을 %1로 설정합니다.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>키보드 레이아웃을 %1/%2로 설정합니다.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>표준시간대를 %1/%2로 설정합니다.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>시스템 언어가 %1로 설정됩니다.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>숫자와 날짜 로케일이 %1로 설정됩니다.</translation>
</message>
@@ -3094,7 +3094,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4129,14 +4129,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Calamares에 대하여</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>디버그</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Calamares에 대한 정보 표시하기</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>디버그 정보 표시하기</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts
index f50a5a36fdcd4df787bc9e993259f62dc9e24c3f..ceb2b90965ee7f40b456f0bc7c5e9652a763183d 100644
--- a/lang/calamares_lo.ts
+++ b/lang/calamares_lo.ts
@@ -499,12 +499,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
@@ -773,27 +773,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3083,7 +3083,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -4115,14 +4115,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts
index b8f7557831cf68060d3620f1d0d3e5ff4e0ea1f2..74a2e2bfa36c430da7477ea1eca9a3fcb0797bef 100644
--- a/lang/calamares_lt.ts
+++ b/lang/calamares_lt.ts
@@ -511,12 +511,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 sąrankos programa</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 diegimo programa</translation>
</message>
@@ -785,27 +785,27 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Nustatyti klaviatūros modelį kaip %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Nustatyti klaviatūros išdėstymą kaip %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Nustatyti laiko juostą į %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Sistemos kalba bus nustatyta į %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Skaičių ir datų lokalė bus nustatyta į %1.</translation>
</message>
@@ -3127,7 +3127,7 @@ Išvestis:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4162,14 +4162,26 @@ Išvestis:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Apie</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Derinti</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Rodyti informaciją apie Calamares</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Rodyti derinimo informaciją</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_lv.ts b/lang/calamares_lv.ts
index d228e56bfb24121d769a71104e016e50e5aac857..56a9c1ab09c5e87993e368945848635cd47554ab 100644
--- a/lang/calamares_lv.ts
+++ b/lang/calamares_lv.ts
@@ -503,12 +503,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
@@ -777,27 +777,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3105,7 +3105,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -4137,14 +4137,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts
index 1b304f41beb156a826495bfb2b35362d6ce51e40..76121421d798095aeadc3b3da06e9c406f479778 100644
--- a/lang/calamares_mk.ts
+++ b/lang/calamares_mk.ts
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
@@ -775,27 +775,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3094,7 +3094,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -4126,14 +4126,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_ml.ts b/lang/calamares_ml.ts
index cab3a0840fb2411de2ed9a85f7f5f39bc35ef585..501140fac60e4f5286588ac8971c711e567dddd7 100644
--- a/lang/calamares_ml.ts
+++ b/lang/calamares_ml.ts
@@ -503,12 +503,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 സജ്ജീകരണപ്രയോഗം</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 ഇൻസ്റ്റാളർ</translation>
</message>
@@ -777,27 +777,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>കീബോർഡ് മോഡൽ %1 എന്നതായി ക്രമീകരിക്കുക.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>കീബോർഡ് വിന്യാസം %1%2 എന്നതായി ക്രമീകരിക്കുക.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>സിസ്റ്റം ഭാഷ %1 ആയി സജ്ജമാക്കും.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>സംഖ്യ & തീയതി രീതി %1 ആയി ക്രമീകരിക്കും.</translation>
</message>
@@ -3099,7 +3099,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4131,14 +4131,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>വിവരം</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>ഡീബഗ് വിവരങ്ങൾ കാണിക്കുക</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts
index fed837c18fda170771b5497546782e7bb19b6f3d..eab2a46c460f4e82e647e6b6d5fb95a2e5d49c2b 100644
--- a/lang/calamares_mr.ts
+++ b/lang/calamares_mr.ts
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 अधिष्ठापक</translation>
</message>
@@ -775,27 +775,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3094,7 +3094,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4126,14 +4126,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>दोषमार्जन माहिती दर्शवा</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts
index cf9f7cc2032946fb04803d9c19094e49d93d9a0f..2b9824063ea1bb3a4b5d0dca05f0c8e7d83f439d 100644
--- a/lang/calamares_nb.ts
+++ b/lang/calamares_nb.ts
@@ -502,12 +502,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Installasjonsprogram</translation>
</message>
@@ -776,27 +776,27 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Sett tastaturmodell til %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Sett tastaturoppsett til %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3095,7 +3095,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4127,14 +4127,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Vis feilrettingsinformasjon</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts
index 8eb7baa1070ca552ef3931e3dda8f0df5b89da2b..20ee51993b8959c86720e0076422a8baea061583 100644
--- a/lang/calamares_ne_NP.ts
+++ b/lang/calamares_ne_NP.ts
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
@@ -775,27 +775,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3094,7 +3094,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -4126,14 +4126,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts
index 0b3307ab189a5b3d1e12dbc524b0732f27f0856f..4ae69991ffc4c8ff1e673a544b3ab859c7518350 100644
--- a/lang/calamares_nl.ts
+++ b/lang/calamares_nl.ts
@@ -507,12 +507,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 Voorbereidingsprogramma</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Installatieprogramma</translation>
</message>
@@ -781,27 +781,27 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Instellen toetsenbord model naar %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Instellen toetsenbord lay-out naar %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Zet tijdzone naar %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>De taal van het systeem zal worden ingesteld op %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>De getal- en datumnotatie worden ingesteld op %1.</translation>
</message>
@@ -3103,7 +3103,7 @@ Uitvoer:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4136,14 +4136,26 @@ De installatie kan niet doorgaan.</translation>
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Over</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Fouten opsporen</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Toon debug informatie</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_oc.ts b/lang/calamares_oc.ts
index 9a931e4c213f45ef8e4c40e56f6e14e99cb3ce01..6116b8076497006dccd2b4bcaf452c3bb168afd2 100644
--- a/lang/calamares_oc.ts
+++ b/lang/calamares_oc.ts
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Programa de configuracion %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Installador de %1</translation>
</message>
@@ -775,27 +775,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3094,7 +3094,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4126,14 +4126,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>A prepaus</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Afichar las informacions de desbugatge</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts
index 2441b16fcb8f4384b95065267a1c9a69af83d374..4b28f08a18573fc6ee125d3d8e63664fd5f4eec8 100644
--- a/lang/calamares_pl.ts
+++ b/lang/calamares_pl.ts
@@ -179,12 +179,12 @@
<message>
<location filename="../src/libcalamares/JobExample.cpp" line="29"/>
<source>Job failed (%1)</source>
- <translation type="unfinished"/>
+ <translation>Zadanie nie powiodło się (%1)</translation>
</message>
<message>
<location filename="../src/libcalamares/JobExample.cpp" line="30"/>
<source>Programmed job failure was explicitly requested.</source>
- <translation type="unfinished"/>
+ <translation>Wyraźnie zażądano zaprogramowanej awarii zadania.</translation>
</message>
</context>
<context>
@@ -200,7 +200,7 @@
<message>
<location filename="../src/libcalamares/JobExample.cpp" line="17"/>
<source>Example job (%1)</source>
- <translation type="unfinished"/>
+ <translation>Przykładowe zadanie (%1)</translation>
</message>
</context>
<context>
@@ -292,17 +292,17 @@
<message numerus="yes">
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="119"/>
<source>(%n second(s))</source>
- <translation type="unfinished">
- <numerusform/>
- <numerusform/>
- <numerusform/>
- <numerusform/>
+ <translation>
+ <numerusform>(%n sekunda)</numerusform>
+ <numerusform>(%n sekundy)</numerusform>
+ <numerusform>(%n sekund)</numerusform>
+ <numerusform>(%n sekund)</numerusform>
</translation>
</message>
<message>
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="124"/>
<source>System-requirements checking is complete.</source>
- <translation type="unfinished"/>
+ <translation>Sprawdzanie wymagań systemowych zostało zakończone.</translation>
</message>
</context>
<context>
@@ -384,7 +384,7 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="312"/>
<source>The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong></source>
- <translation type="unfinished"/>
+ <translation>Program instalacyjny %1 dokona zmian na dysku, aby skonfigurować %2.<br/><strong>Nie będzie można cofnąć tych zmian.</strong></translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="315"/>
@@ -394,7 +394,7 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="318"/>
<source>&Set up now</source>
- <translation type="unfinished"/>
+ <translation>U&staw teraz</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="318"/>
@@ -409,7 +409,7 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="376"/>
<source>&Set up</source>
- <translation type="unfinished"/>
+ <translation>U&staw</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="376"/>
@@ -419,7 +419,7 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="378"/>
<source>Setup is complete. Close the setup program.</source>
- <translation type="unfinished"/>
+ <translation>Konfiguracja jest zakończona. Zamknij program instalacyjny.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="379"/>
@@ -429,7 +429,7 @@ Link copied to clipboard</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="381"/>
<source>Cancel setup without changing the system.</source>
- <translation type="unfinished"/>
+ <translation>Anuluj konfigurację bez zmiany w systemie.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="382"/>
@@ -470,7 +470,8 @@ Link copied to clipboard</source>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="496"/>
<source>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</source>
- <translation type="unfinished"/>
+ <translation>Czy naprawdę chcesz anulować bieżący proces konfiguracji?
+Program instalacyjny zostanie zamknięty, a wszystkie zmiany zostaną utracone.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="498"/>
@@ -506,12 +507,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
- <translation type="unfinished"/>
+ <translation>%1 Program instalacyjny</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Instalator %1</translation>
</message>
@@ -780,27 +781,27 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Ustaw model klawiatury na %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Ustaw model klawiatury na %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Język systemu zostanie ustawiony na %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Format liczb i daty zostanie ustawiony na %1.</translation>
</message>
@@ -1245,7 +1246,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<message>
<location filename="../src/modules/partition/gui/CreateVolumeGroupDialog.cpp" line="28"/>
<source>Create Volume Group</source>
- <translation type="unfinished"/>
+ <translation>Utwórz grupę woluminów</translation>
</message>
</context>
<context>
@@ -1580,12 +1581,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="75"/>
<source><h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system.</source>
- <translation type="unfinished"/>
+ <translation><h1>Wszystko gotowe.</h1><br/>%1 został skonfigurowany na twoim komputerze.<br/>Możesz teraz zacząć używać swojego nowego systemu.</translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="79"/>
<source><html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html></source>
- <translation type="unfinished"/>
+ <translation><html><head/><body><p>Gdy to pole jest zaznaczone, system będzie uruchamiany ponownie natychmiast po kliknięciu na <span style="font-style:italic;">Ukończone</span> lub zamknięciu programu instalacyjnego.</p></body></html></translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="87"/>
@@ -1595,12 +1596,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="92"/>
<source><html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html></source>
- <translation type="unfinished"/>
+ <translation><html><head/><body><p>Gdy to pole jest zaznaczone, system będzie uruchamiany ponownie natychmiast po kliknięciu na <span style="font-style:italic;">Ukończone</span> lub zamknięciu programu instalacyjnego.</p></body></html></translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="105"/>
<source><h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.</source>
- <translation type="unfinished"/>
+ <translation><h1>Instalacja nie powiodła się</h1><br/>%1 nie został zainstalowany na twoim komputerze.<br/>Komunikat o błędzie: %2.</translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="113"/>
@@ -1663,12 +1664,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="158"/>
<source>There is not enough drive space. At least %1 GiB is required.</source>
- <translation type="unfinished"/>
+ <translation>Nie ma wystarczającej ilości miejsca na dysku. Wymagane jest przynajmniej %1 GiB.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="166"/>
<source>has at least %1 GiB working memory</source>
- <translation type="unfinished"/>
+ <translation>ma przynajmniej %1 GiB pamięci roboczej</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="168"/>
@@ -1703,7 +1704,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="197"/>
<source>The setup program is not running with administrator rights.</source>
- <translation type="unfinished"/>
+ <translation>Program instalacyjny nie jest uruchomiony z prawami administratora.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="198"/>
@@ -1718,7 +1719,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="210"/>
<source>The screen is too small to display the setup program.</source>
- <translation type="unfinished"/>
+ <translation>Ekran jest zbyt mały, aby wyświetlić program konfiguracyjny.</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="211"/>
@@ -1747,17 +1748,17 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<message>
<location filename="../src/modules/oemid/IDJob.cpp" line="40"/>
<source>Could not create directories <code>%1</code>.</source>
- <translation type="unfinished"/>
+ <translation>Nie można utworzyć katalogów <code>%1</code>.</translation>
</message>
<message>
<location filename="../src/modules/oemid/IDJob.cpp" line="53"/>
<source>Could not open file <code>%1</code>.</source>
- <translation type="unfinished"/>
+ <translation>Nie można otworzyć pliku <code>%1</code>.</translation>
</message>
<message>
<location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
<source>Could not write to file <code>%1</code>.</source>
- <translation type="unfinished"/>
+ <translation>Nie można zapisać do pliku <code>%1</code>.</translation>
</message>
</context>
<context>
@@ -1962,7 +1963,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="186"/>
<source>Hide license text</source>
- <translation type="unfinished"/>
+ <translation>Ukryj tekst licencji</translation>
</message>
<message>
<location filename="../src/modules/license/LicenseWidget.cpp" line="186"/>
@@ -2210,12 +2211,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<message>
<location filename="../src/modules/oemid/OEMPage.ui" line="32"/>
<source>Ba&tch:</source>
- <translation type="unfinished"/>
+ <translation>Par&tia:</translation>
</message>
<message>
<location filename="../src/modules/oemid/OEMPage.ui" line="42"/>
<source><html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html></source>
- <translation type="unfinished"/>
+ <translation><html><head/><body><p>Wprowadź tutaj identyfikator partii. Zostanie on zapisany w systemie docelowym.</p></body></html></translation>
</message>
<message>
<location filename="../src/modules/oemid/OEMPage.ui" line="52"/>
@@ -2569,7 +2570,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<message>
<location filename="../src/modules/packagechooser/page_package.ui" line="50"/>
<source>Product Name</source>
- <translation type="unfinished"/>
+ <translation>Nazwa produktu</translation>
</message>
<message>
<location filename="../src/modules/packagechooser/page_package.ui" line="63"/>
@@ -2982,7 +2983,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="718"/>
<source>has at least one disk device available.</source>
- <translation type="unfinished"/>
+ <translation>jest dostępne co najmniej jedno urządzenie dyskowe.</translation>
</message>
<message>
<location filename="../src/modules/partition/PartitionViewStep.cpp" line="719"/>
@@ -3014,7 +3015,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="79"/>
<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>Proszę wybrać wygląd i styl dla pulpitu KDE Plazma. Możesz również pominąć ten krok i skonfigurować je po zainstalowaniu systemu. Kliknięcie na wybranym wyglądzie i stylu spowoduje wyświetlenie ich podglądu na żywo.</translation>
</message>
<message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="84"/>
@@ -3120,7 +3121,7 @@ Wyjście:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -3177,7 +3178,7 @@ Wyjście:
<message>
<location filename="../src/modules/packagechooser/PackageModel.cpp" line="74"/>
<source>No product</source>
- <translation type="unfinished"/>
+ <translation>Brak produktu</translation>
</message>
<message>
<location filename="../src/modules/packagechooser/PackageModel.cpp" line="82"/>
@@ -3928,12 +3929,12 @@ i nie uruchomi się</translation>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="190"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after setup.</small></source>
- <translation type="unfinished"/>
+ <translation><small>Jeśli z tego komputera będzie korzystać więcej niż jedna osoba, po skonfigurowaniu można utworzyć wiele kont.</small></translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="196"/>
<source><small>If more than one person will use this computer, you can create multiple accounts after installation.</small></source>
- <translation type="unfinished"/>
+ <translation><small>Jeśli z tego komputera będzie korzystać więcej niż jedna osoba, po instalacji można utworzyć wiele kont.</small></translation>
</message>
</context>
<context>
@@ -3972,7 +3973,7 @@ i nie uruchomi się</translation>
<message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="18"/>
<source>Create Volume Group</source>
- <translation type="unfinished"/>
+ <translation>Utwórz grupę woluminów</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="24"/>
@@ -4081,7 +4082,7 @@ i nie uruchomi się</translation>
<message>
<location filename="../src/calamares/DebugWindow.cpp" line="319"/>
<source>About %1 setup</source>
- <translation type="unfinished"/>
+ <translation>Informacje o konfiguracji %1 </translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.cpp" line="320"/>
@@ -4153,14 +4154,26 @@ i nie uruchomi się</translation>
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>O nas</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Pokaż informacje debugowania</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts
index 14a8b197c227d8e6e8faff471b92ca1b43c2dde5..3f4773eb66bef6a6434cfa25869ca26f29e2146f 100644
--- a/lang/calamares_pt_BR.ts
+++ b/lang/calamares_pt_BR.ts
@@ -509,12 +509,12 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Programa de configuração %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Instalador %1</translation>
</message>
@@ -783,27 +783,27 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Definir o modelo de teclado para %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Definir o layout do teclado para %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Definir o fuso horário para %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>O idioma do sistema será definido como %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>A localidade dos números e datas será definida como %1.</translation>
</message>
@@ -3116,7 +3116,7 @@ Saída:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4151,14 +4151,26 @@ Saída:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Sobre</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Depuração</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Mostrar informações sobre o Calamares</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Exibir informações de depuração</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts
index 7556313b9405aee1c51fec94a677ec66cd74852a..5a111a01425e8b875d40179cfbc939d3ed092fa7 100644
--- a/lang/calamares_pt_PT.ts
+++ b/lang/calamares_pt_PT.ts
@@ -451,7 +451,7 @@ Ligação copiada para a área de transferência</translation>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="403"/>
<source>&Done</source>
- <translation>&Feito</translation>
+ <translation>&Concluído</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="422"/>
@@ -509,12 +509,12 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 Programa de Instalação</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Instalador</translation>
</message>
@@ -524,7 +524,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="32"/>
<source>Set filesystem label on %1.</source>
- <translation>A definir a identificação do sistema de ficheiros em %1</translation>
+ <translation>A definir a identificação do sistema de ficheiros em %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="39"/>
@@ -603,7 +603,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1226"/>
<source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
- <translation>Nenhuma partição de sistema EFI foi encontrada neste sistema. Por favor volte atrás e use o particionamento manual para configurar %1.</translation>
+ <translation>Nenhuma partição de sistema EFI foi encontrada neste sistema. Volte atrás e use o particionamento manual para configurar %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1234"/>
@@ -705,7 +705,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="272"/>
<source>Successfully unmounted %1.</source>
- <translation>% 1 desmontado com sucesso.</translation>
+ <translation>%1 desmontado com sucesso.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="279"/>
@@ -715,17 +715,17 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="305"/>
<source>Successfully cleared swap %1.</source>
- <translation>Swap % 1 limpa com sucesso.</translation>
+ <translation>Swap %1 limpa com sucesso.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="319"/>
<source>Successfully closed mapper device %1.</source>
- <translation>Dispositivo mapeador % 1 fechado com sucesso.</translation>
+ <translation>Dispositivo mapeador %1 fechado com sucesso.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="332"/>
<source>Successfully disabled volume group %1.</source>
- <translation>Grupo de volume % 1 desativado com sucesso.</translation>
+ <translation>Grupo de volume %1 desativado com sucesso.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="371"/>
@@ -783,27 +783,27 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Definir o modelo do teclado para %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Definir esquema do teclado para %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Definir fuso horário para %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>O idioma do sistema será definido para %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Os números e datas locais serão definidos para %1.</translation>
</message>
@@ -980,7 +980,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/packagechooser/Config.cpp" line="113"/>
<source>Please pick a product from the list. The selected product will be installed.</source>
- <translation>Por favor, escolha um produto da lista. O produto selecionado será instalado.</translation>
+ <translation>Escolha um produto da lista. O produto selecionado será instalado.</translation>
</message>
<message>
<location filename="../src/modules/packagechooser/Config.cpp" line="243"/>
@@ -1046,7 +1046,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="71"/>
<source>Primar&y</source>
- <translation>Principal</translation>
+ <translation>Pri&mária</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="81"/>
@@ -1106,7 +1106,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/partition/gui/PartitionDialogHelpers.cpp" line="91"/>
<source>Mountpoint already in use. Please select another one.</source>
- <translation>Ponto de montagem já em uso. Por favor selecione outro.</translation>
+ <translation>Ponto de montagem já em uso. Selecione outro.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionDialogHelpers.cpp" line="96"/>
@@ -1341,7 +1341,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="80"/>
<source><br><br>This partition table type is only advisable on older systems which start from a <strong>BIOS</strong> boot environment. GPT is recommended in most other cases.<br><br><strong>Warning:</strong> the MBR partition table is an obsolete MS-DOS era standard.<br>Only 4 <em>primary</em> partitions may be created, and of those 4, one can be an <em>extended</em> partition, which may in turn contain many <em>logical</em> partitions.</source>
- <translation><br><br>Este tipo de tabela de partições é aconselhável apenas em sistemas mais antigos que iniciam a partir de um ambiente de arranque <strong>BIOS</strong>. GPT é recomendado na maior parte dos outros casos.<br><br><strong>Aviso:</strong> A tabela de partições MBR é um standard obsoleto da era MS-DOS.<br>Apenas 4 partições <em>primárias</em> podem ser criadas, e dessa 4, apenas uma pode ser partição <em>estendida</em>, que por sua vez podem ser tornadas em várias partições <em>lógicas</em>.</translation>
+ <translation><br><br>Este tipo de tabela de partições é aconselhável apenas em sistemas mais antigos que iniciam a partir de um ambiente de arranque <strong>BIOS</strong>. GPT é recomendado na maior parte dos outros casos.<br><br><strong>Aviso:</strong> A tabela de partições MBR é um padrão obsoleto da era MS-DOS.<br>Apenas 4 partições <em>primárias</em> podem ser criadas, e dessas 4, apenas uma pode ser partição <em>estendida</em>, que por sua vez podem ser tornadas em várias partições <em>lógicas</em>.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="151"/>
@@ -1494,7 +1494,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<location filename="../src/modules/partition/gui/EncryptWidget.cpp" line="156"/>
<location filename="../src/modules/partition/gui/EncryptWidget.cpp" line="166"/>
<source>Please enter the same passphrase in both boxes.</source>
- <translation>Por favor insira a mesma frase-passe em ambas as caixas.</translation>
+ <translation>Introduza a mesma frase-passe em ambas as caixas.</translation>
</message>
</context>
<context>
@@ -1593,7 +1593,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="87"/>
<source><h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment.</source>
- <translation><h1>Tudo feito</h1><br/>%1 foi instalado no seu computador.<br/>Pode agora reiniciar para o seu novo sistema, ou continuar a usar o %2 ambiente Live.</translation>
+ <translation><h1>Tudo concluído</h1><br/>%1 foi instalado no seu computador.<br/>Pode agora reiniciar para o seu novo sistema, ou continuar a usar o %2 ambiente Live.</translation>
</message>
<message>
<location filename="../src/modules/finished/FinishedPage.cpp" line="92"/>
@@ -1789,7 +1789,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="47"/>
<source>Please install KDE Konsole and try again!</source>
- <translation>Por favor instale a consola KDE e tente novamente!</translation>
+ <translation>Instale o Konsole do KDE e tente novamente!</translation>
</message>
<message>
<location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="118"/>
@@ -2585,7 +2585,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="26"/>
<source>Please pick a product from the list. The selected product will be installed.</source>
- <translation>Por favor, escolha um produto da lista. O produto selecionado será instalado.</translation>
+ <translation>Escolha um produto da lista. O produto selecionado será instalado.</translation>
</message>
</context>
<context>
@@ -2875,7 +2875,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/partition/gui/PartitionPage.cpp" line="264"/>
<source>The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.</source>
- <translation>A tabela de partições em %1 já tem %2 partições primárias, e não podem ser adicionadas mais. Em vez disso, por favor remova uma partição primária e adicione uma partição estendida.</translation>
+ <translation>A tabela de partições em %1 já tem %2 partições primárias, e não podem ser adicionadas mais. Em vez disso, remova uma partição primária e adicione uma partição estendida.</translation>
</message>
</context>
<context>
@@ -3015,7 +3015,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="84"/>
<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 installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source>
- <translation>Por favor escolha a aparência para o Ambiente de Trabalho KDE Plasma. Pode também saltar este passo e configurar a aparência uma vez instalado o sistema. Ao clicar numa seleção de aparência irá ter uma pré-visualização ao vivo dessa aparência.</translation>
+ <translation>Escolha a aparência para o Ambiente de trabalho KDE Plasma. Pode também saltar este passo e configurar a aparência uma vez instalado o sistema. Ao clicar numa seleção de aparência irá ter uma pré-visualização ao vivo dessa aparência.</translation>
</message>
</context>
<context>
@@ -3116,7 +3116,7 @@ Saída de Dados:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -3248,12 +3248,12 @@ Saída de Dados:
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="158"/>
<source>%1 cannot be installed on empty space. Please select an existing partition.</source>
- <translation>%1 não pode ser instalado no espaço vazio. Por favor selecione uma partição existente.</translation>
+ <translation>%1 não pode ser instalado no espaço vazio. Selecione uma partição existente.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
<source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
- <translation>%1 não pode ser instalado numa partição estendida. Por favor selecione uma partição primária ou lógica existente.</translation>
+ <translation>%1 não pode ser instalado numa partição estendida. Selecione uma partição primária ou lógica existente.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
@@ -3278,12 +3278,12 @@ Saída de Dados:
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="220"/>
<source><strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
- <translation><strong>%4</strong><br/><br/>A partição %1 é demasiado pequena para %2. Por favor selecione uma partição com pelo menos %3 GiB de capacidade.</translation>
+ <translation><strong>%4</strong><br/><br/>A partição %1 é demasiado pequena para %2. Selecione uma partição com pelo menos %3 GiB de capacidade.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="242"/>
<source><strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
- <translation><strong>%2</strong><br/><br/>Uma partição de sistema EFI não pode ser encontrada em nenhum sítio neste sistema. Por favor volte atrás e use o particionamento manual para instalar %1.</translation>
+ <translation><strong>%2</strong><br/><br/>Uma partição de sistema EFI não pode ser encontrada em nenhum sítio neste sistema. Volte atrás e use o particionamento manual para instalar %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="253"/>
@@ -3444,7 +3444,7 @@ Saída de Dados:
<message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="138"/>
<source>For best results, please ensure that this computer:</source>
- <translation>Para melhores resultados, por favor certifique-se que este computador:</translation>
+ <translation>Para melhores resultados, certifique-se que este computador:</translation>
</message>
<message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="139"/>
@@ -3877,7 +3877,7 @@ Saída de Dados:
<message>
<location filename="../src/modules/tracking/TrackingPage.cpp" line="95"/>
<source>Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area.</source>
- <translation>O rastreio ajuda %1 a ver quão frequentemente ele é instalado, em qual hardware ele é instalado e quais aplicações são utilizadas. Para ver o que será enviado, por favor, clique no ícone de ajuda próximo a cada área.</translation>
+ <translation>O rastreio ajuda %1 a ver quão frequentemente ele é instalado, em qual hardware ele é instalado e quais aplicações são utilizadas. Para ver o que será enviado, clique no ícone de ajuda próximo a cada área.</translation>
</message>
<message>
<location filename="../src/modules/tracking/TrackingPage.cpp" line="100"/>
@@ -3892,7 +3892,7 @@ Saída de Dados:
<message>
<location filename="../src/modules/tracking/TrackingPage.cpp" line="107"/>
<source>By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1.</source>
- <translation>Ao selecionar isto irá enviar periodicamente informações sobre a instalação do seu <b>utilizador</b>, hardware, aplicações e padrões de utilização das aplicações para %1.</translation>
+ <translation>Ao selecionar isto irá enviar periodicamente informações acerca da instalação do seu <b>utilizador</b>, hardware, aplicações e padrões de utilização das aplicações para %1.</translation>
</message>
</context>
<context>
@@ -4079,7 +4079,7 @@ Saída de Dados:
<message>
<location filename="../src/calamares/DebugWindow.cpp" line="319"/>
<source>About %1 setup</source>
- <translation>Sobre a instalação de %1</translation>
+ <translation>Acerca da instalação de %1</translation>
</message>
<message>
<location filename="../src/calamares/DebugWindow.cpp" line="320"/>
@@ -4113,7 +4113,7 @@ Saída de Dados:
<message>
<location filename="../src/modules/zfs/ZfsJob.cpp" line="162"/>
<source>Failed to create zpool on </source>
- <translation>Falha ao criar zpool on</translation>
+ <translation>Falha ao criar zpool em </translation>
</message>
<message>
<location filename="../src/modules/zfs/ZfsJob.cpp" line="180"/>
@@ -4144,34 +4144,46 @@ Saída de Dados:
<message>
<location filename="../src/modules/zfs/ZfsJob.cpp" line="330"/>
<source>The output was: </source>
- <translation>O resultado foi:</translation>
+ <translation>O resultado foi: </translation>
</message>
</context>
<context>
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
- <translation>Sobre</translation>
+ <translation>Acerca</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Depuração</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Mostrar informação acerca do Calamares</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Mostrar informação de depuração</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
<source>Installation Completed</source>
- <translation>Instalação Concluída</translation>
+ <translation>Instalação concluída</translation>
</message>
<message>
<location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
<source>%1 has been installed on your computer.<br/>
You may now restart into your new system, or continue using the Live environment.</source>
- <translation>%1 foi instalado no seu computador.<br/>
+ <translation>%1 foi instalado no computador.<br/>
Pode agora reiniciar no seu novo sistema, ou continuar a utilizar o ambiente Live.</translation>
</message>
<message>
diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts
index a5d15bdf235023bd80f5bd582bdc8d4a0d89bae9..0e5542c5e0fba5a32706cbe06c20beb59b2072d4 100644
--- a/lang/calamares_ro.ts
+++ b/lang/calamares_ro.ts
@@ -504,12 +504,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Program de instalare %1</translation>
</message>
@@ -778,27 +778,27 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Setează modelul tastaturii la %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Setează aranjamentul de tastatură la %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Limba sistemului va fi %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Formatul numerelor și datelor calendaristice va fi %1.</translation>
</message>
@@ -3112,7 +3112,7 @@ Output
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4144,14 +4144,26 @@ Output
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Depanare</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Arată informația de depanare</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts
index a5b16898b863be30a3478ffad25d7039830dac40..222f1cb8440cca02c7265a454aed850a4a38b00e 100644
--- a/lang/calamares_ru.ts
+++ b/lang/calamares_ru.ts
@@ -510,12 +510,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Программа установки %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Программа установки %1</translation>
</message>
@@ -784,27 +784,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Установить модель клавиатуры на %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Установить раскладку клавиатуры на %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Установить часовой пояс на %1/%2</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Системным языком будет установлен %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Региональным форматом чисел и дат будет установлен %1.</translation>
</message>
@@ -3124,7 +3124,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4157,14 +4157,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>О Программе</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Отладка</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Показать отладочную информацию</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_si.ts b/lang/calamares_si.ts
index 067afae9afeb11970e20a74081d1e9d85217ae3f..ca8646c6d0d693e54ebd2590c25572f24f4099a4 100644
--- a/lang/calamares_si.ts
+++ b/lang/calamares_si.ts
@@ -507,12 +507,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 සැකසුම් වැඩසටහන</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 ස්ථාපකය</translation>
</message>
@@ -781,27 +781,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>යතුරුපුවරු ආකෘතිය %1 ලෙස සකසන්න.</translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>යතුරුපුවරු පිරිසැලසුම %1/%2 ලෙස සකසන්න.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>වේලා කලාපය %1/%2 ලෙස සකසන්න.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>පද්ධති භාෂාව %1 ලෙස සැකසෙනු ඇත.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>අංක සහ දින පෙදෙසිය %1 ලෙස සකසනු ඇත.</translation>
</message>
@@ -3105,7 +3105,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4140,14 +4140,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>ගැන</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>දෝශ නිරාකරණ තොරතුරු පෙන්වන්න</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts
index c11b2b050af27c36da27302ec9aae60bddaa341b..763fbf809e0eafb24521510a656d215d29642ca4 100644
--- a/lang/calamares_sk.ts
+++ b/lang/calamares_sk.ts
@@ -507,12 +507,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Inštalačný program distribúcie %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Inštalátor distribúcie %1</translation>
</message>
@@ -782,27 +782,27 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Nastavenie modelu klávesnice na %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Nastavenie rozloženia klávesnice na %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Nastavenie časovej zóny na %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Jazyk systému bude nastavený na %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Miestne nastavenie čísel a dátumov bude nastavené na %1.</translation>
</message>
@@ -3123,7 +3123,7 @@ Výstup:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4158,14 +4158,26 @@ Výstup:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>O inštalátore</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Ladiť</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Zobraziť ladiace informácie</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts
index 3f4d2adb0cb889c10533a7ceac3690b7f202929c..2bb4e31e8014fb3df181e7ec91ccd5ca8f088533 100644
--- a/lang/calamares_sl.ts
+++ b/lang/calamares_sl.ts
@@ -506,12 +506,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Namestilnik</translation>
</message>
@@ -780,27 +780,27 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Nastavi model tipkovnice na %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Nastavi razporeditev tipkovnice na %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3117,7 +3117,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -4149,14 +4149,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Razhroščevanje</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts
index 1c8ac3f474dbdb29370fb63c9ae9e67083e87353..191b19b04d15f7ffa96382c6de42c9cb252a278b 100644
--- a/lang/calamares_sq.ts
+++ b/lang/calamares_sq.ts
@@ -6,18 +6,18 @@
<message>
<location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
<source><h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/></source>
- <translation type="unfinished"/>
+ <translation><h1>%1</h1><br/><strong>%2<br/> për %3</strong><br/><br/></translation>
</message>
<message>
<location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
<source>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</source>
- <translation type="unfinished"/>
+ <translation>Falënderime për <a href="https://calamares.io/team/">ekipin Calamares</a> dhe <a href="https://www.transifex.com/calamares/calamares/">ekpin e përkthyesve të Calamares-it</a>.<br/><br/>Zhvillimi i <a href="https://calamares.io/">Calamares-it</a> sponsorizohet nga <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.</translation>
</message>
<message>
<location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
<source>Copyright %1-%2 %3 &lt;%4&gt;<br/></source>
<extracomment>Copyright year-year Name <email-address></extracomment>
- <translation type="unfinished"/>
+ <translation>Të drejt kopjimi %1-%2 %3 &lt;%4&gt;<br/></translation>
</message>
</context>
<context>
@@ -507,12 +507,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Programi i Rregullimit të %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Instalues %1</translation>
</message>
@@ -781,27 +781,27 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Si model tastiere do të caktohet %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Si model tastiere do të caktohet %1%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Si zonë kohore cakto %1/%2</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Si gjuhë sistemi do të caktohet %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Si vendore për numra dhe data do të vihet %1.</translation>
</message>
@@ -1453,12 +1453,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="259"/>
<source>Passphrase for existing partition</source>
- <translation type="unfinished"/>
+ <translation>Frazëkalim për pjesë ekzistuese</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
<source>Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
- <translation type="unfinished"/>
+ <translation>Pjesa %1 s’u fshehtëzua dot me frazëkalimin e dhënë.<br/><br/>Përpunojeni sërish pjesën dhe jepni frazëkalimin e saktë, ose fshijeni dhe krijoni një pjesë të re të fshehtëzuar.</translation>
</message>
</context>
<context>
@@ -3103,7 +3103,7 @@ Përfundim:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4138,13 +4138,25 @@ Përfundim:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Mbi</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
- <translation type="unfinished"/>
+ <translation>Diagnostikojeni</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Shfaq hollësi mbi Calamares</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Shfaq të dhëna diagnostikimi</translation>
</message>
</context>
<context>
diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts
index f81e621f3bd231856ff6206608a36449df083c90..663b188cdb291b69c8933a69e98c9640e60d9134 100644
--- a/lang/calamares_sr.ts
+++ b/lang/calamares_sr.ts
@@ -504,12 +504,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 инсталер</translation>
</message>
@@ -778,27 +778,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Системски језик биће постављен на %1</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3106,7 +3106,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4138,14 +4138,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Уклањање грешака</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts
index d588941c1ee1b238de9932c1cc9fd197019b1db5..7b4b8a7808603763b0ef78af44b35090cdeff68e 100644
--- a/lang/calamares_sr@latin.ts
+++ b/lang/calamares_sr@latin.ts
@@ -504,12 +504,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Instaler</translation>
</message>
@@ -778,27 +778,27 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3106,7 +3106,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -4138,14 +4138,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Otklanjanje greški</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts
index 181d2a5c05e8ae202bc14d6a493d304e08b310bb..0e4f3ea7f1fd09b72e26e5a3177b4dabc2838cb6 100644
--- a/lang/calamares_sv.ts
+++ b/lang/calamares_sv.ts
@@ -506,12 +506,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 Installationsprogram</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1-installationsprogram</translation>
</message>
@@ -780,27 +780,27 @@ Alla ändringar kommer att gå förlorade.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Sätt tangenbordsmodell till %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Sätt tangentbordslayout till %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Sätt tidszon till %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Systemspråket kommer ändras till %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Systemspråket för siffror och datum kommer sättas till %1.</translation>
</message>
@@ -3105,7 +3105,7 @@ Utdata:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4140,14 +4140,26 @@ Installationen kan inte fortsätta.</p></translation>
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Om</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Avlusning</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Visa information om Calamares</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Visa avlusningsinformation</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_ta_IN.ts b/lang/calamares_ta_IN.ts
index 0fd9c5d3dbacbbe161f2417fd18d9511ba17dc06..1ea74c58efdaaecd26f9c0117aa64982ebe3434a 100644
--- a/lang/calamares_ta_IN.ts
+++ b/lang/calamares_ta_IN.ts
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
@@ -775,27 +775,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3094,7 +3094,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -4126,14 +4126,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_te.ts b/lang/calamares_te.ts
index 4b00ab35523ddef2f567c112dcd2f908c18aa41b..bb227a1011c56f8798b65e9ba92e48fdc3a36bb9 100644
--- a/lang/calamares_te.ts
+++ b/lang/calamares_te.ts
@@ -503,12 +503,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
@@ -777,27 +777,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3096,7 +3096,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4128,14 +4128,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_tg.ts b/lang/calamares_tg.ts
index 404053a438613c25825784862b3a857bb8a9f3a7..c93509ffcda6a1c545447d6fa6829f6321abe470 100644
--- a/lang/calamares_tg.ts
+++ b/lang/calamares_tg.ts
@@ -503,12 +503,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Барномаи танзимкунии %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Насбкунандаи %1</translation>
</message>
@@ -777,27 +777,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Намунаи клавиатура ба %1 танзим карда мешавад.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Тарҳбандии клавиатура ба %1 %1/%2 танзим карда мешавад.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Минтақаи вақт ба %1/%2 танзим карда мешавад.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Забони низом ба %1 танзим карда мешавад.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Низоми рақамҳо ва санаҳо ба %1 танзим карда мешавад.</translation>
</message>
@@ -3101,7 +3101,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4136,14 +4136,27 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Дар бораи барнома</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Намоиши иттилооти
+ислоҳи нуқсонҳо</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts
index 305b8b176ab858031aa887f64d8435af4a39ab03..bec046505f6168c3961489f629e4ef1a3bdeea8d 100644
--- a/lang/calamares_th.ts
+++ b/lang/calamares_th.ts
@@ -500,12 +500,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>ตัวติดตั้ง %1</translation>
</message>
@@ -774,27 +774,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>ตั้งค่าโมเดลแป้นพิมพ์เป็น %1<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>ตั้งค่าแบบแป้นพิมพ์เป็น %1/%2</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>ตั้งค่าโซนเวลาเป็น %1/%2</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>ภาษาของระบบจะถูกตั้งค่าเป็น %1</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>ตำแหน่งที่ตั้งสำหรับหมายเลขและวันที่จะถูกตั้งค่าเป็น %1</translation>
</message>
@@ -3084,7 +3084,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4116,14 +4116,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>เกี่ยวกับ</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>แก้ไขข้อบกพร่อง</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>แสดงข้อมูลการดีบั๊ก</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts
index 4024fa8c1c091a097946bee697848a2fc7d4e1c4..ffc75103a9be79edb26d9e3b09ab1c19694c9844 100644
--- a/lang/calamares_tr_TR.ts
+++ b/lang/calamares_tr_TR.ts
@@ -507,12 +507,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.</translation>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 Kurulum Uygulaması</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 Yükleniyor</translation>
</message>
@@ -782,27 +782,27 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.</translation>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>%1 Klavye düzeni olarak seçildi.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Alt klavye türevi olarak %1/%2 seçildi.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>%1/%2 Zaman dilimi ayarla.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Sistem dili %1 olarak ayarlanacak.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Sayılar ve günler için sistem yereli %1 olarak ayarlanacak.</translation>
</message>
@@ -3110,7 +3110,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4145,14 +4145,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Hakkında</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Hata Ayıklama</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Calamares hakkında bilgilendirme göster</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Hata ayıklama bilgisini göster</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts
index fd6264aeaf5ab62a465861e946bcf1354dd3264c..c28f684729048dd152821b6f90b6103e2e28ac80 100644
--- a/lang/calamares_uk.ts
+++ b/lang/calamares_uk.ts
@@ -511,12 +511,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>Програма для налаштовування %1</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>Засіб встановлення %1</translation>
</message>
@@ -785,27 +785,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Встановити модель клавіатури як %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Встановити розкладку клавіатури як %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Встановити часовий пояс %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Мову %1 буде встановлено як системну.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>%1 буде встановлено як локаль чисел та дат.</translation>
</message>
@@ -3128,7 +3128,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4163,14 +4163,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Про програму</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Діагностика</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>Показати відомості щодо Calamares</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Показати діагностичну інформацію</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts
index d473add2ae41a30a01a6cd72ce8c2cc019149243..38cb655d4ca95d5f6c9b9a9bf529ca0f8c105852 100644
--- a/lang/calamares_ur.ts
+++ b/lang/calamares_ur.ts
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
@@ -775,27 +775,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3094,7 +3094,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -4126,14 +4126,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>متعلق</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts
index 6ee4801112231bc21a27e456d95157196722c4d6..24c680fa6b2b5ea18a9f5d297917baab64a282c6 100644
--- a/lang/calamares_uz.ts
+++ b/lang/calamares_uz.ts
@@ -499,12 +499,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
@@ -773,27 +773,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3083,7 +3083,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -4115,14 +4115,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts
index ff92501fcea8b4cec41ed13ba0203277e21417be..f579551567bce92f80fc0926f201db9ff321f620 100644
--- a/lang/calamares_vi.ts
+++ b/lang/calamares_vi.ts
@@ -501,12 +501,12 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 Thiết lập chương trình</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 cài đặt hệ điều hành</translation>
</message>
@@ -775,27 +775,27 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>Thiệt lập bàn phím kiểu %1.<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>Thiết lập bố cục bàn phím thành %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>Thiết lập múi giờ sang %1/%2.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>Ngôn ngữ hệ thống sẽ được đặt thành %1.</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>Định dạng ngôn ngữ của số và ngày tháng sẽ được chuyển thành %1.</translation>
</message>
@@ -3090,7 +3090,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4125,14 +4125,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>Giới thiệu</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>Hiện thông tin gỡ lỗi</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_zh.ts b/lang/calamares_zh.ts
index 71d060fd8efb61b48594feed543b99c7bc59a544..e4a2000bccf82b1c9a7fb5510c294e64eb923d82 100644
--- a/lang/calamares_zh.ts
+++ b/lang/calamares_zh.ts
@@ -499,12 +499,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
@@ -773,27 +773,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3083,7 +3083,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -4115,14 +4115,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts
index f5b7a575db3252aec1a92aefb6aec860c7664351..bfc49b9ff8bba2993830f2dfd2bf037eaa075f5d 100644
--- a/lang/calamares_zh_CN.ts
+++ b/lang/calamares_zh_CN.ts
@@ -506,12 +506,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 安装程序</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 安装程序</translation>
</message>
@@ -780,27 +780,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>设置键盘型号为 %1。<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>设置键盘布局为 %1/%2。</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>将时区设置为 %1/%2 。</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>系统语言将设置为 %1。</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>数字和日期地域将设置为 %1。</translation>
</message>
@@ -3098,7 +3098,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1（%2）</translation>
</message>
@@ -4133,14 +4133,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>关于</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>调试</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>显示调试信息</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_zh_HK.ts b/lang/calamares_zh_HK.ts
index 57e63b41928ed5927f2a8e64ebb47ff8b887f6de..dde08307f285ee16e4cbe5da0ad71fca0a4ae321 100644
--- a/lang/calamares_zh_HK.ts
+++ b/lang/calamares_zh_HK.ts
@@ -499,12 +499,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
</message>
@@ -773,27 +773,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
</message>
@@ -3083,7 +3083,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
@@ -4115,14 +4115,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts
index e6d8a27f4a3a4be622ac7a8fdf5d5d387dc78c92..9658a8155509b73172bae88723654c076999b44a 100644
--- a/lang/calamares_zh_TW.ts
+++ b/lang/calamares_zh_TW.ts
@@ -505,12 +505,12 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>CalamaresWindow</name>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="396"/>
<source>%1 Setup Program</source>
<translation>%1 設定程式</translation>
</message>
<message>
- <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="397"/>
<source>%1 Installer</source>
<translation>%1 安裝程式</translation>
</message>
@@ -779,27 +779,27 @@ The installer will quit and all changes will be lost.</source>
<context>
<name>Config</name>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="361"/>
<source>Set keyboard model to %1.<br/></source>
<translation>設定鍵盤型號為 %1 。<br/></translation>
</message>
<message>
- <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+ <location filename="../src/modules/keyboard/Config.cpp" line="368"/>
<source>Set keyboard layout to %1/%2.</source>
<translation>設定鍵盤佈局為 %1/%2 。</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="359"/>
+ <location filename="../src/modules/locale/Config.cpp" line="373"/>
<source>Set timezone to %1/%2.</source>
<translation>設定時區為 %1/%2。</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="397"/>
+ <location filename="../src/modules/locale/Config.cpp" line="411"/>
<source>The system language will be set to %1.</source>
<translation>系統語言會設定為%1。</translation>
</message>
<message>
- <location filename="../src/modules/locale/Config.cpp" line="404"/>
+ <location filename="../src/modules/locale/Config.cpp" line="418"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation>數字與日期語系會設定為%1。</translation>
</message>
@@ -3094,7 +3094,7 @@ Output:
<context>
<name>QObject</name>
<message>
- <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+ <location filename="../src/libcalamares/locale/Translation.cpp" line="151"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
@@ -4129,14 +4129,26 @@ Output:
<name>calamares-sidebar</name>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="148"/>
<source>About</source>
<translation>關於</translation>
</message>
<message>
<location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="163"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="149"/>
+ <source>Show information about Calamares</source>
+ <translation>顯示關於 Calamares 的資訊</translation>
+ </message>
+ <message>
+ <location filename="../src/calamares/CalamaresWindow.cpp" line="165"/>
+ <source>Show debug information</source>
+ <translation>顯示除錯資訊</translation>
+ </message>
</context>
<context>
<name>finishedq</name>
diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po
index 1816f8f389067adddf642ceba3d30272ed951ca1..8270caab6dd769b7fa8fdc80da962dedc84f99e7 100644
--- a/lang/python/bg/LC_MESSAGES/python.po
+++ b/lang/python/bg/LC_MESSAGES/python.po
@@ -5,6 +5,7 @@
#
# Translators:
# Georgi Georgiev (Жоро) <g.georgiev.shumen@gmail.com>, 2022
+# mkkDr2010, 2022
#
#, fuzzy
msgid ""
@@ -13,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-05-29 16:17+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Georgi Georgiev (Жоро) <g.georgiev.shumen@gmail.com>, 2022\n"
+"Last-Translator: mkkDr2010, 2022\n"
"Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -53,7 +54,7 @@ msgstr ""
#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
msgid "Configuration Error"
-msgstr ""
+msgstr "Грешка в конфигурацията"
#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po
index 911555c2c0d3283342f0fa471f7e6f3dff9a9e85..5a261c1f9ab09866cc1b4e2e9621963c57ba1915 100644
--- a/lang/python/en_GB/LC_MESSAGES/python.po
+++ b/lang/python/en_GB/LC_MESSAGES/python.po
@@ -5,7 +5,7 @@
#
# Translators:
# Jason Collins <JasonPCollins@protonmail.com>, 2018
-# Karthik Balan, 2021
+# Karthik Arasappan, 2021
#
#, fuzzy
msgid ""
@@ -14,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-05-29 16:17+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Karthik Balan, 2021\n"
+"Last-Translator: Karthik Arasappan, 2021\n"
"Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po
index c29588f9bb49420455b3a4e46b4d86f0ab13cecc..827f5147c902bd7750cfdd640f86b44d10d55ad4 100644
--- a/lang/python/es/LC_MESSAGES/python.po
+++ b/lang/python/es/LC_MESSAGES/python.po
@@ -4,12 +4,12 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
+# strel, 2017
# Guido Grasso <cuquiman97@gmail.com>, 2018
# Adolfo Jayme-Barrientos, 2019
# Miguel Mayol <mitcoes@gmail.com>, 2020
# Pier Jose Gotta Perez <piegope@protonmail.com>, 2020
# Swyter <Swyterzone@gmail.com>, 2022
-# strel, 2022
#
#, fuzzy
msgid ""
@@ -18,7 +18,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-05-29 16:17+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: strel, 2022\n"
+"Last-Translator: Swyter <Swyterzone@gmail.com>, 2022\n"
"Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po
index f67f07e39fbfb6229e4c9c0b5e4a4a7651fec437..dcd1faaddb1318da8e7991aabf2596a6e4baea02 100644
--- a/lang/python/es_MX/LC_MESSAGES/python.po
+++ b/lang/python/es_MX/LC_MESSAGES/python.po
@@ -4,9 +4,9 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
+# guillermo pacheco <guillopacheco@gmail.com>, 2018
# a1a9b52a3f40dff112eca965c254c602_089360e <d1597d94e208cfb976efe0f2ce18d2e5_734602>, 2018
# Erland Huaman <blackadress.01@gmail.com>, 2021
-# guillermo pacheco <guillopacheco@gmail.com>, 2022
#
#, fuzzy
msgid ""
@@ -15,7 +15,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-05-29 16:17+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: guillermo pacheco <guillopacheco@gmail.com>, 2022\n"
+"Last-Translator: Erland Huaman <blackadress.01@gmail.com>, 2021\n"
"Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po
index 0bc8c1e1bb22c49de11737113615a2f1a864c46c..8c23c301fa072e8cb372f827de7b4c2e410bc779 100644
--- a/lang/python/fr/LC_MESSAGES/python.po
+++ b/lang/python/fr/LC_MESSAGES/python.po
@@ -6,12 +6,12 @@
# Translators:
# Paul Combal <abonnementspaul@gmail.com>, 2017
# Abdellah B <bahassinea@gmail.com>, 2017
+# Aestan <anthony.margerand@protonmail.com>, 2018
# Aurnytoraink <adressetempo@aurny2mail.ddns.net>, 2018
# a270031086f2a0d3514bc0cb507b48f6, 2019
# Seboss666 <sebastien_verdet@seboss666.info>, 2019
# Florian B <florianb3522@gmail.com>, 2019
# Arnaud Ferraris <arnaud.ferraris@gmail.com>, 2019
-# Aestan <anthony.margerand@protonmail.com>, 2022
# roxfr <roxfr@outlook.fr>, 2022
#
#, fuzzy
diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po
index b5187ea77c1169764a57c79fd83f248eaf0a16b9..0b7e82b22c178423a822b47c45744d6f738747b1 100644
--- a/lang/python/it_IT/LC_MESSAGES/python.po
+++ b/lang/python/it_IT/LC_MESSAGES/python.po
@@ -6,9 +6,9 @@
# Translators:
# Pierfrancesco Passerini <p.passerini@gmail.com>, 2019
# Pietro F. Fontana, 2020
+# Saverio <saverio.brancaccio@gmail.com>, 2020
# Giuseppe Pignataro <rogepix@gmail.com>, 2021
# Vincenzo Reale <vinx.reale@gmail.com>, 2022
-# Saverio <saverio.brancaccio@gmail.com>, 2022
#
#, fuzzy
msgid ""
@@ -17,7 +17,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-05-29 16:17+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Saverio <saverio.brancaccio@gmail.com>, 2022\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>, 2022\n"
"Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po
index 122da0e9bd4a0cfb72477923c2cd94e7615d26c2..f7570e4d5ec72757c17e2d19f52b7d985cc964d4 100644
--- a/lang/python/pt_BR/LC_MESSAGES/python.po
+++ b/lang/python/pt_BR/LC_MESSAGES/python.po
@@ -4,8 +4,8 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
-# Guilherme Marçal Silva, 2022
-# André Marcelo Alvarenga <alvarenga@kde.org>, 2022
+# André Marcelo Alvarenga <alvarenga@kde.org>, 2020
+# Guilherme MS, 2022
#
#, fuzzy
msgid ""
@@ -14,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-05-29 16:17+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>, 2022\n"
+"Last-Translator: Guilherme MS, 2022\n"
"Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po
index 1a4dd86c851a57d0cf946319f06a2e9293880ac5..13c84efd7b126a53fcebd8ade6f3ef6694ddff81 100644
--- a/lang/python/pt_PT/LC_MESSAGES/python.po
+++ b/lang/python/pt_PT/LC_MESSAGES/python.po
@@ -5,8 +5,8 @@
#
# Translators:
# Nuno Amorim <inovaty@gmail.com>, 2018
+# Ricardo Simões <xmcorporation@gmail.com>, 2020
# Hugo Carvalho <hugokarvalho@hotmail.com>, 2022
-# Ricardo Simões <xmcorporation@gmail.com>, 2022
#
#, fuzzy
msgid ""
@@ -15,7 +15,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-05-29 16:17+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Ricardo Simões <xmcorporation@gmail.com>, 2022\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>, 2022\n"
"Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lang/python/si/LC_MESSAGES/python.po b/lang/python/si/LC_MESSAGES/python.po
index 267e2359797d9d64ab0db42a89db87e76fac0d80..7817521706fa5ceabb90ce5bda13c96b1522ecaa 100644
--- a/lang/python/si/LC_MESSAGES/python.po
+++ b/lang/python/si/LC_MESSAGES/python.po
@@ -4,7 +4,7 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
-# හෙළබස, 2021
+# හෙළබස සමූහය, 2021
# Sandaruwan Samaraweera, 2022
#
#, fuzzy
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5ce5349fb603274cf148ff315e6490ceee8b26c5..b1a536f91c5d46d5e8a7739303d9cb416c0daf4d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,26 +3,26 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-include( CalamaresAddBrandingSubdirectory )
-include( CalamaresAddLibrary )
-include( CalamaresAddModuleSubdirectory )
-include( CalamaresAddPlugin )
-include( CalamaresAddTest )
-include( CalamaresAddTranslations )
+include(CalamaresAddBrandingSubdirectory)
+include(CalamaresAddLibrary)
+include(CalamaresAddModuleSubdirectory)
+include(CalamaresAddPlugin)
+include(CalamaresAddTest)
+include(CalamaresAddTranslations)
# library
-add_subdirectory( libcalamares )
+add_subdirectory(libcalamares)
-add_subdirectory( libcalamaresui )
+add_subdirectory(libcalamaresui)
# all things qml
-add_subdirectory( qml/calamares )
+add_subdirectory(qml/calamares)
# application
-add_subdirectory( calamares )
+add_subdirectory(calamares)
# plugins
-add_subdirectory( modules )
+add_subdirectory(modules)
# branding components
-add_subdirectory( branding )
+add_subdirectory(branding)
diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt
index d06a53d83e42a70f1eb41f4e3cd2eb8ece2b27fc..577b1610511828bf8a8bda5c48836b429d180a53 100644
--- a/src/calamares/CMakeLists.txt
+++ b/src/calamares/CMakeLists.txt
@@ -4,27 +4,25 @@
# SPDX-License-Identifier: BSD-2-Clause
#
-set( calamaresSources
+set(calamaresSources
main.cpp
CalamaresApplication.cpp
CalamaresWindow.cpp
-
DebugWindow.cpp
VariantModel.cpp
-
progresstree/ProgressTreeDelegate.cpp
progresstree/ProgressTreeView.cpp
)
-if( NOT WITH_KF5DBus )
- set( kdsagSources
+if(NOT WITH_KF5DBus)
+ set(kdsagSources
${CMAKE_SOURCE_DIR}/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp
${CMAKE_SOURCE_DIR}/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp
${CMAKE_SOURCE_DIR}/3rdparty/kdsingleapplicationguard/kdtoolsglobal.cpp
${CMAKE_SOURCE_DIR}/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp
)
mark_thirdparty_code( ${kdsagSources} )
- list( APPEND calamaresSources ${kdsagSources} )
+ list(APPEND calamaresSources ${kdsagSources})
endif()
include_directories(
@@ -42,22 +40,22 @@ include_directories(
# The calamares-i18n.cxx file -- full path in CALAMARES_TRANSLATIONS_SOURCE --
# is created as a target in the lang/ directory. This is compiled to a
# library (it's just the result of a QRC compile).
-add_executable( calamares_bin ${calamaresSources} calamares.qrc )
-target_include_directories( calamares_bin PRIVATE ${CMAKE_SOURCE_DIR} )
-set_target_properties(calamares_bin
- PROPERTIES
- ENABLE_EXPORTS TRUE
- RUNTIME_OUTPUT_NAME calamares
+add_executable(calamares_bin ${calamaresSources} calamares.qrc)
+target_include_directories(calamares_bin PRIVATE ${CMAKE_SOURCE_DIR})
+set_target_properties(
+ calamares_bin
+ PROPERTIES ENABLE_EXPORTS TRUE RUNTIME_OUTPUT_NAME calamares
)
calamares_automoc( calamares_bin )
calamares_autouic( calamares_bin )
calamares_autorcc( calamares_bin )
-if( kdsagSources )
- set_source_files_properties( ${kdsagSources} PROPERTIES AUTOMOC OFF )
+if(kdsagSources)
+ set_source_files_properties(${kdsagSources} PROPERTIES AUTOMOC OFF)
endif()
-target_link_libraries( calamares_bin
+target_link_libraries(
+ calamares_bin
PRIVATE
calamares
calamaresui
@@ -66,21 +64,25 @@ target_link_libraries( calamares_bin
Qt5::Widgets
KF5::CoreAddons
)
-if( WITH_KF5Crash )
- target_link_libraries( calamares_bin PRIVATE KF5::Crash )
- target_compile_definitions( calamares_bin PRIVATE WITH_KF5Crash )
+if(WITH_KF5Crash)
+ target_link_libraries(calamares_bin PRIVATE KF5::Crash)
+ target_compile_definitions(calamares_bin PRIVATE WITH_KF5Crash)
endif()
-if( WITH_KF5DBus )
- target_link_libraries( calamares_bin PRIVATE KF5::DBusAddons )
- target_compile_definitions( calamares_bin PRIVATE WITH_KF5DBus )
+if(WITH_KF5DBus)
+ target_link_libraries(calamares_bin PRIVATE KF5::DBusAddons)
+ target_compile_definitions(calamares_bin PRIVATE WITH_KF5DBus)
endif()
-install( TARGETS calamares_bin
- BUNDLE DESTINATION .
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+install(
+ TARGETS calamares_bin
+ BUNDLE
+ DESTINATION .
+ RUNTIME
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
)
-install( FILES ${CMAKE_SOURCE_DIR}/data/images/squid.svg
+install(
+ FILES ${CMAKE_SOURCE_DIR}/data/images/squid.svg
RENAME calamares.svg
DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps
)
@@ -88,11 +90,14 @@ install( FILES ${CMAKE_SOURCE_DIR}/data/images/squid.svg
### TESTS
#
#
-if( BUILD_TESTING )
+if(BUILD_TESTING)
# Don't install, these are just for enable_testing
- add_executable( loadmodule testmain.cpp )
- target_link_libraries( loadmodule PRIVATE Qt5::Core Qt5::Widgets calamares calamaresui )
+ add_executable(loadmodule testmain.cpp)
+ target_link_libraries(
+ loadmodule
+ PRIVATE Qt5::Core Qt5::Widgets calamares calamaresui
+ )
- add_executable( test_conf test_conf.cpp )
- target_link_libraries( test_conf PUBLIC yamlcpp::yamlcpp Qt5::Core )
+ add_executable(test_conf test_conf.cpp)
+ target_link_libraries(test_conf PUBLIC yamlcpp::yamlcpp Qt5::Core)
endif()
diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp
index c79e17d580adc788093676ae00623d5100a93c7a..e00615bf2d618f6a7358a5950532204e766eb790 100644
--- a/src/calamares/CalamaresWindow.cpp
+++ b/src/calamares/CalamaresWindow.cpp
@@ -145,8 +145,8 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug,
CALAMARES_RETRANSLATE_FOR(
aboutDialog,
aboutDialog->setText(
- QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "About" ) );
- aboutDialog->setToolTip( QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(),
+ QCoreApplication::translate( "calamares-sidebar", "About" ) );
+ aboutDialog->setToolTip( QCoreApplication::translate( "calamares-sidebar",
"Show information about Calamares" ) ); );
extraButtons->addWidget( aboutDialog );
aboutDialog->setFlat( true );
@@ -161,9 +161,9 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug,
CalamaresUtils::Bugs, CalamaresUtils::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) );
CALAMARES_RETRANSLATE_FOR( debugWindowBtn,
debugWindowBtn->setText( QCoreApplication::translate(
- CalamaresWindow::staticMetaObject.className(), "Debug" ) );
+ "calamares-sidebar", "Debug" ) );
debugWindowBtn->setToolTip( QCoreApplication::translate(
- CalamaresWindow::staticMetaObject.className(), "Show debug information" ) ); );
+ "calamares-sidebar", "Show debug information" ) ); );
extraButtons->addWidget( debugWindowBtn );
debugWindowBtn->setFlat( true );
debugWindowBtn->setCheckable( true );
diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 95081bb5e1be85ad7d8e257288b9208b389d2793..d64bc26ef18cc2a29eb68995f5d47d4ea960f4bd 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -10,20 +10,26 @@
# (non-GUI) jobs.
#
-add_definitions( -DDLLEXPORT_PRO )
-include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
+add_definitions(-DDLLEXPORT_PRO)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresConfig.h.in
- ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h )
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresVersion.h.in
- ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersion.h )
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresVersionX.h.in
- ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersionX.h )
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresConfig.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h
+)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresVersion.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersion.h
+)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresVersionX.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersionX.h
+)
-set( OPTIONAL_PRIVATE_LIBRARIES "" )
-set( OPTIONAL_PUBLIC_LIBRARIES "" )
+set(OPTIONAL_PRIVATE_LIBRARIES "")
+set(OPTIONAL_PUBLIC_LIBRARIES "")
-set( libSources
+set(libSources
CalamaresAbout.cpp
CppJob.cpp
GlobalStorage.cpp
@@ -32,13 +38,11 @@ set( libSources
JobQueue.cpp
ProcessJob.cpp
Settings.cpp
-
# GeoIP services
geoip/Interface.cpp
geoip/GeoIPFixed.cpp
geoip/GeoIPJSON.cpp
geoip/Handler.cpp
-
# Locale-data service
locale/Global.cpp
locale/Lookup.cpp
@@ -47,7 +51,6 @@ set( libSources
locale/TranslatableString.cpp
locale/Translation.cpp
locale/TranslationsModel.cpp
-
# Modules
modulesystem/Config.cpp
modulesystem/Descriptor.cpp
@@ -56,19 +59,15 @@ set( libSources
modulesystem/Preset.cpp
modulesystem/RequirementsChecker.cpp
modulesystem/RequirementsModel.cpp
-
# Network service
network/Manager.cpp
-
# Packages service
packages/Globals.cpp
-
# Partition service
partition/Global.cpp
partition/Mount.cpp
partition/PartitionSize.cpp
partition/Sync.cpp
-
# Utility service
utils/CalamaresUtilsSystem.cpp
utils/CommandList.cpp
@@ -88,20 +87,16 @@ set( libSources
### OPTIONAL Automount support (requires dbus)
#
#
-if( Qt5DBus_FOUND)
- list( APPEND libSources partition/AutoMount.cpp )
- list( APPEND OPTIONAL_PRIVATE_LIBRARIES Qt5::DBus )
+if(Qt5DBus_FOUND)
+ list(APPEND libSources partition/AutoMount.cpp)
+ list(APPEND OPTIONAL_PRIVATE_LIBRARIES Qt5::DBus)
endif()
### OPTIONAL Python support
#
#
-if( WITH_PYTHON )
- list( APPEND libSources
- PythonHelper.cpp
- PythonJob.cpp
- PythonJobApi.cpp
- )
+if(WITH_PYTHON)
+ list(APPEND libSources PythonHelper.cpp PythonJob.cpp PythonJobApi.cpp)
include_directories(${PYTHON_INCLUDE_DIRS})
link_directories(${PYTHON_LIBRARIES})
@@ -109,7 +104,9 @@ if( WITH_PYTHON )
include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
- list( APPEND OPTIONAL_PRIVATE_LIBRARIES
+ list(
+ APPEND
+ OPTIONAL_PRIVATE_LIBRARIES
${PYTHON_LIBRARIES}
${Boost_LIBRARIES}
)
@@ -119,48 +116,52 @@ endif()
#
#
find_package(Qt5 COMPONENTS Xml)
-if( Qt5Xml_FOUND )
- list( APPEND libSources geoip/GeoIPXML.cpp )
- list( APPEND OPTIONAL_PUBLIC_LIBRARIES Qt5::Network Qt5::Xml )
+if(Qt5Xml_FOUND)
+ list(APPEND libSources geoip/GeoIPXML.cpp)
+ list(APPEND OPTIONAL_PUBLIC_LIBRARIES Qt5::Network Qt5::Xml)
endif()
### OPTIONAL KPMcore support
#
#
-include( KPMcoreHelper )
+include(KPMcoreHelper)
-if ( KPMcore_FOUND )
- find_package( Qt5 REQUIRED DBus ) # Needed for KPMCore
- find_package( KF5 REQUIRED I18n WidgetsAddons ) # Needed for KPMCore
+if(KPMcore_FOUND)
+ find_package(Qt5 REQUIRED DBus) # Needed for KPMCore
+ find_package(KF5 REQUIRED I18n WidgetsAddons) # Needed for KPMCore
- foreach ( d ${KPMcore_API_DEFINITIONS} )
- add_definitions( -D${d} )
+ foreach(d ${KPMcore_API_DEFINITIONS})
+ add_definitions(-D${d})
endforeach()
- include_directories( ${KPMCORE_INCLUDE_DIR} )
- list( APPEND libSources
+ include_directories(${KPMCORE_INCLUDE_DIR})
+ list(
+ APPEND
+ libSources
partition/FileSystem.cpp
partition/KPMManager.cpp
partition/PartitionIterator.cpp
partition/PartitionQuery.cpp
)
- list( APPEND OPTIONAL_PRIVATE_LIBRARIES kpmcore )
+ list(APPEND OPTIONAL_PRIVATE_LIBRARIES kpmcore)
endif()
### LIBRARY
#
#
-add_library( calamares SHARED ${libSources} )
-set_target_properties( calamares
+add_library(calamares SHARED ${libSources})
+set_target_properties(
+ calamares
PROPERTIES
VERSION ${CALAMARES_VERSION_SHORT}
SOVERSION ${CALAMARES_VERSION_SHORT}
- INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_INSTALL_FULL_INCLUDEDIR}/libcalamares
+ INTERFACE_INCLUDE_DIRECTORIES
+ ${CMAKE_INSTALL_FULL_INCLUDEDIR}/libcalamares
)
calamares_automoc( calamares )
-target_link_libraries( calamares
- LINK_PRIVATE
- ${OPTIONAL_PRIVATE_LIBRARIES}
+target_link_libraries(
+ calamares
+ LINK_PRIVATE ${OPTIONAL_PRIVATE_LIBRARIES}
LINK_PUBLIC
yamlcpp::yamlcpp
Qt5::Core
@@ -173,22 +174,29 @@ add_library(Calamares::calamares ALIAS calamares)
### Installation
#
#
-install( TARGETS calamares
+install(
+ TARGETS calamares
EXPORT Calamares
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
# Make symlink lib/calamares/libcalamares.so to lib/libcalamares.so.VERSION so
# lib/calamares can be used as module path for the Python interpreter.
-install( CODE "
+install(
+ CODE
+ "
file( MAKE_DIRECTORY \"\$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_LIBDIR}/calamares\" )
execute_process( COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ../libcalamares.so.${CALAMARES_VERSION_SHORT} libcalamares.so WORKING_DIRECTORY \"\$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_LIBDIR}/calamares\" )
-")
+"
+)
# Install header files
-file( GLOB rootHeaders "*.h" )
+file(GLOB rootHeaders "*.h")
install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h
@@ -197,12 +205,11 @@ install(
DESTINATION include/libcalamares
)
# Install each subdir-worth of header files
-foreach( subdir geoip locale modulesystem network partition utils )
- file( GLOB subdir_headers "${subdir}/*.h" )
- install( FILES ${subdir_headers} DESTINATION include/libcalamares/${subdir} )
+foreach(subdir geoip locale modulesystem network partition utils)
+ file(GLOB subdir_headers "${subdir}/*.h")
+ install(FILES ${subdir_headers} DESTINATION include/libcalamares/${subdir})
endforeach()
-
### TESTING
#
#
@@ -219,44 +226,70 @@ calamares_add_test(
${geoip_src}
)
-function ( calamares_qrc_translations basename )
- set( NAME ${ARGV0} )
- set( options "" )
- set( oneValueArgs SUBDIRECTORY OUTPUT_VARIABLE )
- set( multiValueArgs LANGUAGES )
- cmake_parse_arguments( _qrt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+function(calamares_qrc_translations basename)
+ set(NAME ${ARGV0})
+ set(options "")
+ set(oneValueArgs SUBDIRECTORY OUTPUT_VARIABLE)
+ set(multiValueArgs LANGUAGES)
+ cmake_parse_arguments(
+ _qrt
+ "${options}"
+ "${oneValueArgs}"
+ "${multiValueArgs}"
+ ${ARGN}
+ )
- if( NOT _qrt_OUTPUT_VARIABLE )
- set( _qrt_OUTPUT_VARIABLE "qrc_translations_${basename}" )
+ if(NOT _qrt_OUTPUT_VARIABLE)
+ set(_qrt_OUTPUT_VARIABLE "qrc_translations_${basename}")
endif()
- set( translations_qrc_infile ${CMAKE_CURRENT_BINARY_DIR}/${basename}.qrc )
- set( translations_qrc_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${basename}.cxx )
+ set(translations_qrc_infile ${CMAKE_CURRENT_BINARY_DIR}/${basename}.qrc)
+ set(translations_qrc_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${basename}.cxx)
# Must use this variable name because of the @ substitution
- set( calamares_i18n_qrc_content "" )
- set( calamares_i18n_ts_filelist "" )
- foreach( lang ${_qrt_LANGUAGES} )
- string( APPEND calamares_i18n_qrc_content "<file>${basename}_${lang}.qm</file>" )
- list( APPEND calamares_i18n_ts_filelist "${CMAKE_CURRENT_SOURCE_DIR}/${_qrt_SUBDIRECTORY}/${basename}_${lang}.ts" )
+ set(calamares_i18n_qrc_content "")
+ set(calamares_i18n_ts_filelist "")
+ foreach(lang ${_qrt_LANGUAGES})
+ string(
+ APPEND
+ calamares_i18n_qrc_content
+ "<file>${basename}_${lang}.qm</file>"
+ )
+ list(
+ APPEND
+ calamares_i18n_ts_filelist
+ "${CMAKE_CURRENT_SOURCE_DIR}/${_qrt_SUBDIRECTORY}/${basename}_${lang}.ts"
+ )
endforeach()
- configure_file( ${CMAKE_SOURCE_DIR}/lang/calamares_i18n.qrc.in ${translations_qrc_infile} @ONLY )
+ configure_file(
+ ${CMAKE_SOURCE_DIR}/lang/calamares_i18n.qrc.in
+ ${translations_qrc_infile}
+ @ONLY
+ )
qt5_add_translation(QM_FILES ${calamares_i18n_ts_filelist})
# Run the resource compiler (rcc_options should already be set)
add_custom_command(
OUTPUT ${translations_qrc_outfile}
COMMAND "${Qt5Core_RCC_EXECUTABLE}"
- ARGS ${rcc_options} --format-version 1 -name ${basename} -o ${translations_qrc_outfile} ${translations_qrc_infile}
+ ARGS
+ ${rcc_options}
+ --format-version
+ 1
+ -name
+ ${basename}
+ -o
+ ${translations_qrc_outfile}
+ ${translations_qrc_infile}
MAIN_DEPENDENCY ${translations_qrc_infile}
DEPENDS ${QM_FILES}
)
- set( ${_qrt_OUTPUT_VARIABLE} ${translations_qrc_outfile} PARENT_SCOPE )
+ set(${_qrt_OUTPUT_VARIABLE} ${translations_qrc_outfile} PARENT_SCOPE)
endfunction()
-calamares_qrc_translations( localetest OUTPUT_VARIABLE localetest_qrc SUBDIRECTORY testdata LANGUAGES nl )
+calamares_qrc_translations(localetest OUTPUT_VARIABLE localetest_qrc SUBDIRECTORY testdata LANGUAGES nl)
calamares_add_test(
libcalamareslocaletest
SOURCES
@@ -291,7 +324,7 @@ calamares_add_test(
${OPTIONAL_PRIVATE_LIBRARIES}
)
-if( KPMcore_FOUND )
+if(KPMcore_FOUND)
calamares_add_test(
libcalamarespartitionkpmtest
SOURCES
@@ -314,14 +347,18 @@ calamares_add_test(
utils/TestPaths.cpp
)
-
# This is not an actual test, it's a test / demo application
# for experimenting with GeoIP.
-add_executable( test_geoip geoip/test_geoip.cpp ${geoip_src} )
-target_link_libraries( test_geoip Calamares::calamares Qt5::Network yamlcpp::yamlcpp )
+add_executable(test_geoip geoip/test_geoip.cpp ${geoip_src})
+target_link_libraries(
+ test_geoip
+ Calamares::calamares
+ Qt5::Network
+ yamlcpp::yamlcpp
+)
calamares_automoc( test_geoip )
-if ( Qt5DBus_FOUND )
- add_executable( test_automount partition/calautomount.cpp )
- target_link_libraries( test_automount Calamares::calamares Qt5::DBus )
+if(Qt5DBus_FOUND)
+ add_executable(test_automount partition/calautomount.cpp)
+ target_link_libraries(test_automount Calamares::calamares Qt5::DBus)
endif()
diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index 48e4c4b4d0dbb1cb87bfb4636552a98aa735f2f6..90cdb329e3ce785980a885f6fbc57b0a02d0edca 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -8,24 +8,25 @@
# view modules, view steps, widgets, and branding.
# The UI libs use the non-UI library
-include_directories( ${CMAKE_SOURCE_DIR}/src/libcalamares ${CMAKE_BINARY_DIR}/src/libcalamares ${CMAKE_SOURCE_DIR} )
+include_directories(
+ ${CMAKE_SOURCE_DIR}/src/libcalamares
+ ${CMAKE_BINARY_DIR}/src/libcalamares
+ ${CMAKE_SOURCE_DIR}
+)
-set( calamaresui_SOURCES
+set(calamaresui_SOURCES
modulesystem/CppJobModule.cpp
modulesystem/ModuleFactory.cpp
modulesystem/ModuleManager.cpp
modulesystem/ProcessJobModule.cpp
modulesystem/ViewModule.cpp
-
utils/CalamaresUtilsGui.cpp
utils/ImageRegistry.cpp
utils/Paste.cpp
-
viewpages/BlankViewStep.cpp
viewpages/ExecutionViewStep.cpp
viewpages/Slideshow.cpp
viewpages/ViewStep.cpp
-
widgets/ClickableLabel.cpp
widgets/ErrorDialog.cpp
widgets/FixedAspectRatioLabel.cpp
@@ -34,7 +35,6 @@ set( calamaresui_SOURCES
widgets/TranslationFix.cpp
widgets/WaitingWidget.cpp
${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
-
Branding.cpp
ViewManager.cpp
)
@@ -44,14 +44,14 @@ mark_thirdparty_code(
${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
)
-if( WITH_PYTHON )
- list( APPEND calamaresui_SOURCES
- modulesystem/PythonJobModule.cpp
- )
+if(WITH_PYTHON)
+ list(APPEND calamaresui_SOURCES modulesystem/PythonJobModule.cpp)
endif()
-if( WITH_PYTHONQT )
- list( APPEND calamaresui_SOURCES
+if(WITH_PYTHONQT)
+ list(
+ APPEND
+ calamaresui_SOURCES
modulesystem/PythonQtViewModule.cpp
utils/PythonQtUtils.cpp
viewpages/PythonQtJob.cpp
@@ -61,14 +61,11 @@ if( WITH_PYTHONQT )
)
endif()
-if( WITH_QML )
- list( APPEND calamaresui_SOURCES
- utils/Qml.cpp
- viewpages/QmlViewStep.cpp
- )
+if(WITH_QML)
+ list(APPEND calamaresui_SOURCES utils/Qml.cpp viewpages/QmlViewStep.cpp)
endif()
-calamares_add_library( calamaresui
+calamares_add_library(calamaresui
SOURCES ${calamaresui_SOURCES}
EXPORT_MACRO UIDLLEXPORT_PRO
LINK_LIBRARIES
@@ -79,22 +76,27 @@ calamares_add_library( calamaresui
utils/ErrorDialog/ErrorDialog.ui
VERSION ${CALAMARES_VERSION_SHORT}
)
-target_link_libraries( calamaresui PRIVATE yamlcpp::yamlcpp )
-if( KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58 )
- target_compile_definitions( calamaresui PRIVATE WITH_KOSRelease )
+target_link_libraries(calamaresui PRIVATE yamlcpp::yamlcpp)
+if(KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58)
+ target_compile_definitions(calamaresui PRIVATE WITH_KOSRelease)
endif()
-if( WITH_PYTHONQT )
+if(WITH_PYTHONQT)
# *_DIRS because we also use extensions
- target_include_directories( calamaresui PRIVATE ${PYTHON_INCLUDE_DIRS} ${PYTHONQT_INCLUDE_DIRS} )
- target_link_libraries( calamaresui PRIVATE ${PYTHON_LIBRARIES} ${PYTHONQT_LIBRARIES} )
+ target_include_directories(
+ calamaresui
+ PRIVATE ${PYTHON_INCLUDE_DIRS} ${PYTHONQT_INCLUDE_DIRS}
+ )
+ target_link_libraries(
+ calamaresui
+ PRIVATE ${PYTHON_LIBRARIES} ${PYTHONQT_LIBRARIES}
+ )
endif()
-if( WITH_QML )
- target_link_libraries( calamaresui PUBLIC Qt5::QuickWidgets )
+if(WITH_QML)
+ target_link_libraries(calamaresui PUBLIC Qt5::QuickWidgets)
endif()
add_library(Calamares::calamaresui ALIAS calamaresui)
-
### Installation
#
#
@@ -103,17 +105,12 @@ add_library(Calamares::calamaresui ALIAS calamaresui)
# where libcalamares and libcalamaresui live in different branches,
# we're going to glom it all together in the installed headers location.
-install(
- FILES
- Branding.h
- ViewManager.h
- DESTINATION include/libcalamares
-)
+install(FILES Branding.h ViewManager.h DESTINATION include/libcalamares)
# Install each subdir-worth of header files
-foreach( subdir modulesystem utils viewpages widgets )
- file( GLOB subdir_headers "${subdir}/*.h" )
- install( FILES ${subdir_headers} DESTINATION include/libcalamares/${subdir} )
+foreach(subdir modulesystem utils viewpages widgets)
+ file(GLOB subdir_headers "${subdir}/*.h")
+ install(FILES ${subdir_headers} DESTINATION include/libcalamares/${subdir})
endforeach()
calamares_add_test(
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 03384105ecad04ef73939ce46e53dc6da5d3ada9..5938154599801c388385157c40db93c6f2ac5d3e 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -8,7 +8,7 @@
# individual modules can also decide they must be skipped (e.g. OS-specific
# modules, or ones with unmet dependencies). Collect the skipped modules
# in this list.
-set( LIST_SKIPPED_MODULES "" )
+set(LIST_SKIPPED_MODULES "")
include_directories(
${CMAKE_SOURCE_DIR}/src/libcalamares
@@ -16,29 +16,40 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/libcalamaresui
)
-string( REPLACE " " ";" SKIP_LIST "${SKIP_MODULES}" )
+string(REPLACE " " ";" SKIP_LIST "${SKIP_MODULES}")
-file( GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*" )
-list( SORT SUBDIRECTORIES )
+file(GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*")
+list(SORT SUBDIRECTORIES)
-foreach( SUBDIRECTORY ${SUBDIRECTORIES} )
+foreach(SUBDIRECTORY ${SUBDIRECTORIES})
calamares_add_module_subdirectory( ${SUBDIRECTORY} LIST_SKIPPED_MODULES )
endforeach()
# TODO:3.3: Use FindPython3
-if ( BUILD_TESTING AND BUILD_SCHEMA_TESTING AND PYTHONINTERP_FOUND AND PYTHON_EXECUTABLE )
+if(
+ BUILD_TESTING
+ AND BUILD_SCHEMA_TESTING
+ AND PYTHONINTERP_FOUND
+ AND PYTHON_EXECUTABLE
+)
# The tests for each config file are independent of whether the
# module is enabled or not: the config file should match its schema
# regardless.
- foreach( SUBDIRECTORY ${SUBDIRECTORIES} )
- set( _schema_file "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${SUBDIRECTORY}.schema.yaml" )
- set( _conf_file "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${SUBDIRECTORY}.conf" )
- if ( EXISTS "${_schema_file}" AND EXISTS "${_conf_file}" )
+ foreach(SUBDIRECTORY ${SUBDIRECTORIES})
+ set(_schema_file
+ "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${SUBDIRECTORY}.schema.yaml"
+ )
+ set(_conf_file
+ "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${SUBDIRECTORY}.conf"
+ )
+ if(EXISTS "${_schema_file}" AND EXISTS "${_conf_file}")
add_test(
NAME validate-${SUBDIRECTORY}
- COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/ci/configvalidator.py" "${_schema_file}" "${_conf_file}"
+ COMMAND
+ ${PYTHON_EXECUTABLE}
+ "${CMAKE_SOURCE_DIR}/ci/configvalidator.py"
+ "${_schema_file}" "${_conf_file}"
)
endif()
endforeach()
endif()
-
diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index fb8e19ac2631f27ce0ccf19f4c9a6cbfe945480f..d7f4a716cdf1ff4b325bd6f8460ca2a9ebd372d6 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -454,7 +454,7 @@ def efi_boot_next():
"""
boot_mgr = libcalamares.job.configuration["efiBootMgr"]
boot_entry = None
- efi_bootvars = subprocess.check_output([boot_mgr], text=True)
+ efi_bootvars = subprocess.check_output([boot_mgr], universal_newlines=True)
for line in efi_bootvars.split('\n'):
if not line:
continue
diff --git a/src/modules/contextualprocess/CMakeLists.txt b/src/modules/contextualprocess/CMakeLists.txt
index d7716bbfb4185d7cc584310bca8abdf39e972129..56cf409b5ee7d9e35bbef4b3736f53683659f161 100644
--- a/src/modules/contextualprocess/CMakeLists.txt
+++ b/src/modules/contextualprocess/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-calamares_add_plugin( contextualprocess
+calamares_add_plugin(contextualprocess
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/displaymanager/tests/test-dm-greetd.py b/src/modules/displaymanager/tests/test-dm-greetd.py
index d41c2dadf02bda917ead4d5285f9c068aab4315a..e2682afc7c54fc74f45aa800042d243217cca3a8 100644
--- a/src/modules/displaymanager/tests/test-dm-greetd.py
+++ b/src/modules/displaymanager/tests/test-dm-greetd.py
@@ -17,6 +17,14 @@ try:
except FileNotFoundError as e:
pass
+try:
+ import toml
+except ImportError:
+ # This is a failure of the test-environment.
+ import sys
+ print("Can't find module toml.", file=sys.stderr)
+ sys.exit(0)
+
# Specific DM test
d = main.DMgreetd("/tmp")
d.set_autologin("d", True, default_desktop_environment)
diff --git a/src/modules/dracutlukscfg/CMakeLists.txt b/src/modules/dracutlukscfg/CMakeLists.txt
index aaa7a8c172af01c94ea31b5a21c22fccaa0a91b8..85efccc0ce6a1a979bb94221df96a59860ec7b19 100644
--- a/src/modules/dracutlukscfg/CMakeLists.txt
+++ b/src/modules/dracutlukscfg/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-calamares_add_plugin( dracutlukscfg
+calamares_add_plugin(dracutlukscfg
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/dummycpp/CMakeLists.txt b/src/modules/dummycpp/CMakeLists.txt
index 2916b4d67528824e3410bbd9a3a825858fa75f48..b822a03be1b8a7da96e609f8e03b6b5d5cbea66c 100644
--- a/src/modules/dummycpp/CMakeLists.txt
+++ b/src/modules/dummycpp/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-calamares_add_plugin( dummycpp
+calamares_add_plugin(dummycpp
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/finished/CMakeLists.txt b/src/modules/finished/CMakeLists.txt
index 619f6d8b08b060ff21b2b73cb9cf152d4608ba4f..ab435a9eb5bef6e8853b8f66f6c54044a6ac99f0 100644
--- a/src/modules/finished/CMakeLists.txt
+++ b/src/modules/finished/CMakeLists.txt
@@ -3,11 +3,11 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network )
+find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network)
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
+include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
-calamares_add_plugin( finished
+calamares_add_plugin(finished
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/finishedq/CMakeLists.txt b/src/modules/finishedq/CMakeLists.txt
index facc2d691e81a3871c0838e8fb68af9b769b27e3..2e688c45d02a964290df4124155c4ad64f9dd7d8 100644
--- a/src/modules/finishedq/CMakeLists.txt
+++ b/src/modules/finishedq/CMakeLists.txt
@@ -3,21 +3,21 @@
# SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
# SPDX-License-Identifier: BSD-2-Clause
#
-if( NOT WITH_QML )
+if(NOT WITH_QML)
calamares_skip_module( "finishedq (QML is not supported in this build)" )
return()
endif()
-find_package( Qt5 ${QT_VERSION} CONFIG COMPONENTS DBus Network )
-if ( NOT TARGET Qt5::DBus OR NOT TARGET Qt5::Network )
+find_package(Qt5 ${QT_VERSION} CONFIG COMPONENTS DBus Network)
+if(NOT TARGET Qt5::DBus OR NOT TARGET Qt5::Network)
calamares_skip_module( "finishedq (missing DBus or Network)" )
return()
endif()
-set( _finished ${CMAKE_CURRENT_SOURCE_DIR}/../finished )
-include_directories( ${_finished} )
+set(_finished ${CMAKE_CURRENT_SOURCE_DIR}/../finished)
+include_directories(${_finished})
-calamares_add_plugin( finishedq
+calamares_add_plugin(finishedq
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/fsresizer/CMakeLists.txt b/src/modules/fsresizer/CMakeLists.txt
index e721d7f6bc1e83d91aad7b01f94ee286bfa0116f..da41091950801db4bd0279a4440ac819bfcbdd40 100644
--- a/src/modules/fsresizer/CMakeLists.txt
+++ b/src/modules/fsresizer/CMakeLists.txt
@@ -3,18 +3,21 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-find_package( KF5Config CONFIG )
-find_package( KF5I18n CONFIG )
-find_package( KF5WidgetsAddons CONFIG )
+find_package(KF5Config CONFIG)
+find_package(KF5I18n CONFIG)
+find_package(KF5WidgetsAddons CONFIG)
-include( KPMcoreHelper )
+include(KPMcoreHelper)
-if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND )
- include_directories( ${KPMCORE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src/modules/partition )
+if(KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND)
+ include_directories(
+ ${KPMCORE_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/src/modules/partition
+ )
# The PartitionIterator is a small class, and it's easiest -- but also a
# gross hack -- to just compile it again from the partition module tree.
- calamares_add_plugin( fsresizer
+ calamares_add_plugin(fsresizer
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
@@ -35,7 +38,7 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND
DEFINITIONS ${KPMcore_API_DEFINITIONS}
)
else()
- if ( NOT KPMcore_FOUND )
+ if(NOT KPMcore_FOUND)
calamares_skip_module( "fsresizer (missing suitable KPMcore)" )
else()
calamares_skip_module( "fsresizer (missing dependencies for KPMcore)" )
diff --git a/src/modules/hostinfo/CMakeLists.txt b/src/modules/hostinfo/CMakeLists.txt
index 55be66f819c1450d1486b8d454a71c9d2c38eff6..8f9f327e3f73413f9b0e137183724426e0b7e392 100644
--- a/src/modules/hostinfo/CMakeLists.txt
+++ b/src/modules/hostinfo/CMakeLists.txt
@@ -23,7 +23,7 @@
# - *hostCPU* the make (brand) of the CPU, if it can be determined.
# Values are "Intel" or "AMD" or blank.
-calamares_add_plugin( hostinfo
+calamares_add_plugin(hostinfo
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
@@ -32,8 +32,8 @@ calamares_add_plugin( hostinfo
NO_CONFIG
)
-if ( KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58 )
- target_compile_definitions( calamares_job_hostinfo PRIVATE WITH_KOSRelease )
+if(KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58)
+ target_compile_definitions(calamares_job_hostinfo PRIVATE WITH_KOSRelease)
endif()
calamares_add_test(
diff --git a/src/modules/initcpio/CMakeLists.txt b/src/modules/initcpio/CMakeLists.txt
index 48fd093711e6b12d9d5f20b7393cd6fd5edfac99..9032d4d179862727dd5aec89ef65b86ca12fa615 100644
--- a/src/modules/initcpio/CMakeLists.txt
+++ b/src/modules/initcpio/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-calamares_add_plugin( initcpio
+calamares_add_plugin(initcpio
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/initramfs/CMakeLists.txt b/src/modules/initramfs/CMakeLists.txt
index 2dec41cba581473c34195a395b956ec0bab3435b..d56ca14ff37beaa79b38f32fd1cb2ba406d21d4e 100644
--- a/src/modules/initramfs/CMakeLists.txt
+++ b/src/modules/initramfs/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-calamares_add_plugin( initramfs
+calamares_add_plugin(initramfs
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/interactiveterminal/CMakeLists.txt b/src/modules/interactiveterminal/CMakeLists.txt
index 20aee82578568ad60b5d282116081c8c29188ad7..05696f945d3f42412e32c56b70e00c545247f16c 100644
--- a/src/modules/interactiveterminal/CMakeLists.txt
+++ b/src/modules/interactiveterminal/CMakeLists.txt
@@ -5,21 +5,23 @@
#
find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
-set( kf5_ver 5.41 )
+set(kf5_ver 5.41)
-find_package( KF5Service ${kf5_ver} )
-find_package( KF5Parts ${kf5_ver} )
+find_package(KF5Service ${kf5_ver})
+find_package(KF5Parts ${kf5_ver})
set_package_properties(
- KF5Service PROPERTIES
+ KF5Service
+ PROPERTIES
PURPOSE "For finding KDE services at runtime"
)
set_package_properties(
- KF5Parts PROPERTIES
+ KF5Parts
+ PROPERTIES
PURPOSE "For finding KDE parts at runtime"
)
-if ( KF5Parts_FOUND AND KF5Service_FOUND )
- calamares_add_plugin( interactiveterminal
+if(KF5Parts_FOUND AND KF5Service_FOUND)
+ calamares_add_plugin(interactiveterminal
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/keyboard/CMakeLists.txt b/src/modules/keyboard/CMakeLists.txt
index fe341cef05b7d3f226353fe6a4ffd897de2669ba..51856709ea083e071414f3b6a4c2721bee36b2cb 100644
--- a/src/modules/keyboard/CMakeLists.txt
+++ b/src/modules/keyboard/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-calamares_add_plugin( keyboard
+calamares_add_plugin(keyboard
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/keyboardq/CMakeLists.txt b/src/modules/keyboardq/CMakeLists.txt
index 2b0577aa738744195150071c1bd08a7dea6f67bb..9c7922d867c2d1d42707b10dc2259fe9932da3b5 100644
--- a/src/modules/keyboardq/CMakeLists.txt
+++ b/src/modules/keyboardq/CMakeLists.txt
@@ -3,16 +3,16 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-if( NOT WITH_QML )
+if(NOT WITH_QML)
calamares_skip_module( "keyboardq (QML is not supported in this build)" )
return()
endif()
-set( _keyboard ${CMAKE_CURRENT_SOURCE_DIR}/../keyboard )
+set(_keyboard ${CMAKE_CURRENT_SOURCE_DIR}/../keyboard)
-include_directories( ${_keyboard} )
+include_directories(${_keyboard})
-calamares_add_plugin( keyboardq
+calamares_add_plugin(keyboardq
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/license/CMakeLists.txt b/src/modules/license/CMakeLists.txt
index 0cd8387992b3caa7743f4faf4c5d1754ba424274..d214d6ca74fa74e89e167cd3fb787991800d53ba 100644
--- a/src/modules/license/CMakeLists.txt
+++ b/src/modules/license/CMakeLists.txt
@@ -3,9 +3,9 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
+include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
-calamares_add_plugin( license
+calamares_add_plugin(license
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt
index 272dea3ded35dcfff6f2d73180b448e30854ad11..b631f77f770642a5d0f284e66806e461ae02909b 100644
--- a/src/modules/locale/CMakeLists.txt
+++ b/src/modules/locale/CMakeLists.txt
@@ -7,14 +7,14 @@
# When debugging the timezone widget, add this debugging definition
# to have a debugging-friendly timezone widget, debug logging,
# and no intrusive timezone-setting while clicking around.
-option( DEBUG_TIMEZONES "Debug-friendly timezone widget." OFF )
-if( DEBUG_TIMEZONES )
- add_definitions( -DDEBUG_TIMEZONES )
+option(DEBUG_TIMEZONES "Debug-friendly timezone widget." OFF)
+if(DEBUG_TIMEZONES)
+ add_definitions(-DDEBUG_TIMEZONES)
endif()
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
+include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
-calamares_add_plugin( locale
+calamares_add_plugin(locale
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
@@ -22,6 +22,7 @@ calamares_add_plugin( locale
Config.cpp
LCLocaleDialog.cpp
LocaleConfiguration.cpp
+ LocaleNames.cpp
LocalePage.cpp
LocaleViewStep.cpp
SetTimezoneJob.cpp
@@ -39,15 +40,7 @@ calamares_add_plugin( locale
calamares_add_test(
localetest
- SOURCES
- Tests.cpp
- Config.cpp
- LocaleConfiguration.cpp
- SetTimezoneJob.cpp
- timezonewidget/TimeZoneImage.cpp
- DEFINITIONS
- SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images"
- DEBUG_TIMEZONES=1
- LIBRARIES
- Qt5::Gui
+ SOURCES Tests.cpp Config.cpp LocaleConfiguration.cpp LocaleNames.cpp SetTimezoneJob.cpp timezonewidget/TimeZoneImage.cpp
+ DEFINITIONS SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images" DEBUG_TIMEZONES=1
+ LIBRARIES Qt5::Gui
)
diff --git a/src/modules/locale/LocaleConfiguration.cpp b/src/modules/locale/LocaleConfiguration.cpp
index 17953f079aa3d1fe871a107a27405f382276184f..c62b1ab0816f000112cc6844e2283105412f0d0f 100644
--- a/src/modules/locale/LocaleConfiguration.cpp
+++ b/src/modules/locale/LocaleConfiguration.cpp
@@ -9,11 +9,13 @@
*/
#include "LocaleConfiguration.h"
+#include "LocaleNames.h"
#include "utils/Logger.h"
#include <QLocale>
#include <QRegularExpression>
+#include <QVector>
LocaleConfiguration::LocaleConfiguration()
: explicit_lang( false )
@@ -40,107 +42,114 @@ LocaleConfiguration::setLanguage( const QString& localeName )
m_lang = localeName;
}
-
-LocaleConfiguration
-LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
- const QStringList& availableLocales,
- const QString& countryCode )
+static LocaleNameParts
+updateCountry( LocaleNameParts p, const QString& country )
{
- cDebug() << "Mapping" << languageLocale << "in" << countryCode << "to locale.";
- QString language = languageLocale.split( '_' ).first();
- QString region;
- if ( language.contains( '@' ) )
- {
- auto r = language.split( '@' );
- language = r.first();
- region = r[ 1 ]; // second()
- }
-
- // Either an exact match, or the whole language part matches
- // (followed by .<encoding> or _<country>
- QStringList linesForLanguage = availableLocales.filter( QRegularExpression( language + "[._]" ) );
- cDebug() << Logger::SubEntry << "Matching" << linesForLanguage;
+ p.country = country;
+ return p;
+}
- QString lang;
- if ( linesForLanguage.isEmpty() || languageLocale.isEmpty() )
+static QPair< int, LocaleNameParts >
+identifyBestLanguageMatch( const LocaleNameParts& referenceLocale, QVector< LocaleNameParts >& others )
+{
+ std::sort( others.begin(),
+ others.end(),
+ [ & ]( const LocaleNameParts& lhs, const LocaleNameParts& rhs )
+ { return referenceLocale.similarity( lhs ) < referenceLocale.similarity( rhs ); } );
+ // The best match is at the end
+ LocaleNameParts best_match = others.last();
+ if ( !( referenceLocale.similarity( best_match ) > LocaleNameParts::no_match ) )
{
- lang = "en_US.UTF-8";
+ cDebug() << Logger::SubEntry << "Got no good match for" << referenceLocale.name();
+ return { LocaleNameParts::no_match, LocaleNameParts {} };
}
- else if ( linesForLanguage.length() == 1 )
+ else
{
- lang = linesForLanguage.first();
+ cDebug() << Logger::SubEntry << "Got best match for" << referenceLocale.name() << "as" << best_match.name();
+ return { referenceLocale.similarity( best_match ), best_match };
}
+}
- // lang could still be empty if we found multiple locales that satisfy myLanguage
- const QString combinedLanguageAndCountry = QString( "%1_%2" ).arg( language ).arg( countryCode );
- if ( lang.isEmpty() && region.isEmpty() )
- {
- auto l = linesForLanguage.filter(
- QRegularExpression( combinedLanguageAndCountry + "[._]" ) ); // no regional variants
- if ( l.length() == 1 )
- {
- lang = l.first();
- }
- }
+/** @brief Returns the QString from @p availableLocales that best-matches.
+ */
+static LocaleNameParts
+identifyBestLanguageMatch( const QString& languageLocale,
+ const QStringList& availableLocales,
+ const QString& countryCode )
+{
+ const QString default_lang = QStringLiteral( "en_US.UTF-8" );
- // The following block was inspired by Ubiquity, scripts/localechooser-apply.
- // No copyright statement found in file, assuming GPL v2 or later.
- /* # In the special cases of Portuguese and Chinese, selecting a
- # different location may imply a different dialect of the language.
- # In such cases, make LANG reflect the selected language (for
- # messages, character types, and collation) and make the other
- # locale categories reflect the selected location. */
- if ( language == "pt" || language == "zh" )
+ const LocaleNameParts self = LocaleNameParts::fromName( languageLocale );
+ if ( self.isValid() && !availableLocales.isEmpty() )
{
- cDebug() << Logger::SubEntry << "Special-case Portuguese and Chinese";
- QString proposedLocale = QString( "%1_%2" ).arg( language ).arg( countryCode );
- for ( const QString& line : linesForLanguage )
+ QVector< LocaleNameParts > others;
+ others.resize( availableLocales.length() ); // Makes default structs
+ std::transform( availableLocales.begin(), availableLocales.end(), others.begin(), LocaleNameParts::fromName );
+
+ // Keep track of the best match in various attempts
+ int best_score = LocaleNameParts::no_match;
+ LocaleNameParts best_match;
+
+ // Check with the unmodified language setting
{
- if ( line.contains( proposedLocale ) )
+ auto [ score, match ] = identifyBestLanguageMatch( self, others );
+ if ( score >= LocaleNameParts::complete_match )
+ {
+ return match;
+ }
+ else if ( score > best_score )
{
- cDebug() << Logger::SubEntry << "Country-variant" << line << "chosen.";
- lang = line;
- break;
+ best_match = match;
}
}
- }
- if ( lang.isEmpty() && !region.isEmpty() )
- {
- cDebug() << Logger::SubEntry << "Special-case region @" << region;
- QString proposedRegion = QString( "@%1" ).arg( region );
- for ( const QString& line : linesForLanguage )
+
+
+ // .. but it might match **better** with the chosen location country Code
{
- if ( line.startsWith( language ) && line.contains( proposedRegion ) )
+ auto [ score, match ] = identifyBestLanguageMatch( updateCountry( self, countryCode ), others );
+ if ( score >= LocaleNameParts::complete_match )
+ {
+ return match;
+ }
+ else if ( score > best_score )
{
- cDebug() << Logger::SubEntry << "Region-variant" << line << "chosen.";
- lang = line;
- break;
+ best_match = match;
}
}
- }
-
- // If we found no good way to set a default lang, do a search with the whole
- // language locale and pick the first result, if any.
- if ( lang.isEmpty() )
- {
- for ( const QString& line : availableLocales )
+ // .. or better yet with the QLocale-derived country
{
- if ( line.startsWith( languageLocale ) )
+ const QString localeCountry = LocaleNameParts::fromName( QLocale( languageLocale ).name() ).country;
+ auto [ score, match ] = identifyBestLanguageMatch( updateCountry( self, localeCountry ), others );
+ if ( score >= LocaleNameParts::complete_match )
+ {
+ return match;
+ }
+ else if ( score > best_score )
{
- lang = line;
- break;
+ best_match = match;
}
}
+
+ if ( best_match.isValid() )
+ {
+ cDebug() << Logger::SubEntry << "Matched best with" << best_match.name();
+ return best_match;
+ }
}
// Else we have an unrecognized or unsupported locale, all we can do is go with
// en_US.UTF-8 UTF-8. This completes all default language setting guesswork.
- if ( lang.isEmpty() )
- {
- lang = "en_US.UTF-8";
- }
+ return LocaleNameParts::fromName( default_lang );
+}
+LocaleConfiguration
+LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
+ const QStringList& availableLocales,
+ const QString& countryCode )
+{
+ cDebug() << "Mapping" << languageLocale << "in" << countryCode << "to locale.";
+ const auto bestLocale = identifyBestLanguageMatch( languageLocale, availableLocales, countryCode );
// The following block was inspired by Ubiquity, scripts/localechooser-apply.
// No copyright statement found in file, assuming GPL v2 or later.
@@ -188,34 +197,16 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
// We make a proposed locale based on the UI language and the timezone's country. There is no
// guarantee that this will be a valid, supported locale (often it won't).
QString lc_formats;
- const QString combined = QString( "%1_%2" ).arg( language ).arg( countryCode );
- if ( lang.isEmpty() )
+ const QString combined = QString( "%1_%2" ).arg( bestLocale.language ).arg( countryCode );
+ if ( availableLocales.contains( bestLocale.language ) )
{
- cDebug() << Logger::SubEntry << "Looking up formats for" << combinedLanguageAndCountry;
- // We look up if it's a supported locale.
- for ( const QString& line : availableLocales )
- {
- if ( line.startsWith( combinedLanguageAndCountry ) )
- {
- lang = line;
- lc_formats = line;
- break;
- }
- }
+ cDebug() << Logger::SubEntry << "Exact formats match for language tag" << bestLocale.language;
+ lc_formats = bestLocale.language;
}
- else
+ else if ( availableLocales.contains( combined ) )
{
- if ( availableLocales.contains( lang ) )
- {
- cDebug() << Logger::SubEntry << "Exact formats match for language tag" << lang;
- lc_formats = lang;
- }
- else if ( availableLocales.contains( combinedLanguageAndCountry ) )
- {
- cDebug() << Logger::SubEntry << "Exact formats match for combined" << combinedLanguageAndCountry;
- lang = combinedLanguageAndCountry;
- lc_formats = combinedLanguageAndCountry;
- }
+ cDebug() << Logger::SubEntry << "Exact formats match for combined" << combined;
+ lc_formats = combined;
}
if ( lc_formats.isEmpty() )
@@ -303,12 +294,7 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
// If we cannot make a good choice for a given country we go with the LANG
// setting, which defaults to en_US.UTF-8 UTF-8 if all else fails.
- if ( lc_formats.isEmpty() )
- {
- lc_formats = lang;
- }
-
- return LocaleConfiguration( lang, lc_formats );
+ return LocaleConfiguration( bestLocale.name(), lc_formats.isEmpty() ? bestLocale.name() : lc_formats );
}
diff --git a/src/modules/locale/LocaleNames.cpp b/src/modules/locale/LocaleNames.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..401aa4809f6307de74ad6538c67f8ec7b4625139
--- /dev/null
+++ b/src/modules/locale/LocaleNames.cpp
@@ -0,0 +1,90 @@
+/* === This file is part of Calamares - <https://calamares.io> ===
+ *
+ * SPDX-FileCopyrightText: 2022 Adriaan de Groot <groot@kde.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#include "LocaleNames.h"
+
+#include "utils/Logger.h"
+
+#include <QRegularExpression>
+
+LocaleNameParts
+LocaleNameParts::fromName( const QString& name )
+{
+ auto requireAndRemoveLeadingChar = []( QChar c, QString s )
+ {
+ if ( s.startsWith( c ) )
+ {
+ return s.remove( 0, 1 );
+ }
+ else
+ {
+ return QString();
+ }
+ };
+
+ auto parts = QRegularExpression( "^([a-zA-Z]+)(_[a-zA-Z]+)?(\\.[-a-zA-Z0-9]+)?(@[a-zA-Z]+)?" ).match( name );
+ const QString calamaresLanguage = parts.captured( 1 );
+ const QString calamaresCountry = requireAndRemoveLeadingChar( '_', parts.captured( 2 ) );
+ const QString calamaresEncoding = requireAndRemoveLeadingChar( '.', parts.captured( 3 ) );
+ const QString calamaresRegion = requireAndRemoveLeadingChar( '@', parts.captured( 4 ) );
+
+ if ( calamaresLanguage.isEmpty() )
+ {
+ return LocaleNameParts {};
+ }
+ else
+ {
+ return LocaleNameParts { calamaresLanguage, calamaresCountry, calamaresRegion, calamaresEncoding };
+ }
+}
+
+QString
+LocaleNameParts::name() const
+{
+ // We don't want QStringView to a temporary; force conversion
+ auto insertLeadingChar = []( QChar c, QString s ) -> QString
+ {
+ if ( s.isEmpty() )
+ {
+ return QString();
+ }
+ else
+ {
+ return c + s;
+ }
+ };
+
+ if ( !isValid() )
+ {
+ return QString();
+ }
+ else
+ {
+ return language + insertLeadingChar( '_', country ) + insertLeadingChar( '.', encoding )
+ + insertLeadingChar( '@', region );
+ }
+}
+
+
+int
+LocaleNameParts::similarity( const LocaleNameParts& other ) const
+{
+ if ( !isValid() || !other.isValid() )
+ {
+ return 0;
+ }
+ if ( language != other.language )
+ {
+ return 0;
+ }
+ const auto matched_region = ( region == other.region ? 30 : 0 );
+ const auto matched_country = ( country == other.country ? ( country.isEmpty() ? 10 : 20 ) : 0 );
+ const auto no_other_country_given = ( ( country != other.country && other.country.isEmpty() ) ? 10 : 0 );
+ return 50 + matched_region + matched_country + no_other_country_given;
+}
diff --git a/src/modules/locale/LocaleNames.h b/src/modules/locale/LocaleNames.h
new file mode 100644
index 0000000000000000000000000000000000000000..8498aa28a4967f6769f3240c74a649a3cd178cfe
--- /dev/null
+++ b/src/modules/locale/LocaleNames.h
@@ -0,0 +1,46 @@
+/* === This file is part of Calamares - <https://calamares.io> ===
+ *
+ * SPDX-FileCopyrightText: 2022 Adriaan de Groot <groot@kde.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#ifndef LOCALENAMES_H
+#define LOCALENAMES_H
+
+#include <QString>
+
+/** @brief parts of a locale-name (e.g. "ar_LY.UTF-8", split apart)
+ *
+ * These are created from lines in `/usr/share/i18n/SUPPORTED`,
+ * which lists all the locales supported by the system (there
+ * are also other sources of the same).
+ *
+ */
+struct LocaleNameParts
+{
+ QString language; // e.g. "ar"
+ QString country; // e.g. "LY" (may be empty)
+ QString region; // e.g. "@valencia" (may be empty)
+ QString encoding; // e.g. "UTF-8" (may be empty)
+
+ bool isValid() const { return !language.isEmpty(); }
+ QString name() const;
+
+ static LocaleNameParts fromName( const QString& name );
+
+ static inline constexpr const int no_match = 0;
+ static inline constexpr const int complete_match = 100;
+
+ /** @brief Compute similarity-score with another locale-name.
+ *
+ * Similarity is driven by language and region, then country.
+ * Returns a number between 0 (no similarity, e.g. the
+ * language is different) and 100 (complete match).
+ */
+ int similarity( const LocaleNameParts& other ) const;
+};
+
+#endif
diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp
index 23f9b5b3e10b9c1632aaedbcdc866ff7eefd74ad..3b3c458815de146b67814b4ec1e642367570c0fd 100644
--- a/src/modules/locale/Tests.cpp
+++ b/src/modules/locale/Tests.cpp
@@ -9,9 +9,13 @@
#include "Config.h"
#include "LocaleConfiguration.h"
+#include "LocaleNames.h"
#include "timezonewidget/TimeZoneImage.h"
+#include "CalamaresVersion.h"
+#include "Settings.h"
#include "locale/TimeZone.h"
+#include "locale/TranslationsModel.h"
#include "utils/Logger.h"
#include <QtTest/QtTest>
@@ -25,6 +29,9 @@ public:
LocaleTests();
~LocaleTests() override;
+ // Implementation of data for MappingNeon and MappingFreeBSD
+ void MappingData();
+
private Q_SLOTS:
void initTestCase();
// Check the sample config file is processed correctly
@@ -43,6 +50,22 @@ private Q_SLOTS:
void testLanguageDetection_data();
void testLanguageDetection();
void testLanguageDetectionValencia();
+
+ // Check that the test-data is available and ok
+ void testKDENeonLanguageData();
+ void testLocaleNameParts();
+
+ // Check realistic language mapping for issue 2008
+ void testLanguageMappingNeon_data();
+ void testLanguageMappingNeon();
+ void testLanguageMappingFreeBSD_data();
+ void testLanguageMappingFreeBSD();
+ void testLanguageSimilarity();
+
+private:
+ QStringList m_KDEneonLocales;
+ QStringList m_FreeBSDLocales;
+ QStringList m_availableLanguages;
};
QTEST_MAIN( LocaleTests )
@@ -55,6 +78,13 @@ LocaleTests::~LocaleTests() {}
void
LocaleTests::initTestCase()
{
+ Logger::setupLogLevel( Logger::LOGDEBUG );
+ const auto* settings = Calamares::Settings::instance();
+ if ( !settings )
+ {
+ (void)new Calamares::Settings( true );
+ }
+ m_availableLanguages = QString( CALAMARES_TRANSLATION_LANGUAGES ).split( ';' );
}
void
@@ -280,10 +310,10 @@ LocaleTests::testLanguageDetection_data()
QTest::newRow( "english (US)" ) << QStringLiteral( "en" ) << QStringLiteral( "US" )
<< QStringLiteral( "en_US.UTF-8" );
QTest::newRow( "english (CA)" ) << QStringLiteral( "en" ) << QStringLiteral( "CA" )
- << QStringLiteral( "en" ); // because it's first in the list
+ << QStringLiteral( "en_US.UTF-8" );
QTest::newRow( "english (GB)" ) << QStringLiteral( "en" ) << QStringLiteral( "GB" )
<< QStringLiteral( "en_GB.UTF-8" );
- QTest::newRow( "english (NL)" ) << QStringLiteral( "en" ) << QStringLiteral( "NL" ) << QStringLiteral( "en" );
+ QTest::newRow( "english (NL)" ) << QStringLiteral( "en" ) << QStringLiteral( "NL" ) << QStringLiteral( "en_US.UTF-8" );
QTest::newRow( "portuguese (PT)" ) << QStringLiteral( "pt" ) << QStringLiteral( "PT" )
<< QStringLiteral( "pt_PT.UTF-8" );
@@ -293,11 +323,11 @@ LocaleTests::testLanguageDetection_data()
<< QStringLiteral( "pt_BR.UTF-8" );
QTest::newRow( "catalan ()" ) << QStringLiteral( "ca" ) << QStringLiteral( "" )
- << QStringLiteral( "ca_AD.UTF-8" ); // no country given? Matches first
+ << QStringLiteral( "ca_ES.UTF-8" ); // no country given? Matches QLocale-default
QTest::newRow( "catalan (ES)" ) << QStringLiteral( "ca" ) << QStringLiteral( "ES" )
<< QStringLiteral( "ca_ES.UTF-8" );
QTest::newRow( "catalan (NL)" ) << QStringLiteral( "ca" ) << QStringLiteral( "NL" )
- << QStringLiteral( "ca_AD.UTF-8" );
+ << QStringLiteral( "ca_ES.UTF-8" );
QTest::newRow( "catalan (@valencia)" ) << QStringLiteral( "ca@valencia" ) << QStringLiteral( "ES" )
<< QStringLiteral( "ca_ES@valencia" ); // Prefers regional variant
QTest::newRow( "catalan (@valencia_NL)" )
@@ -344,7 +374,7 @@ LocaleTests::testLanguageDetectionValencia()
{
auto r = LocaleConfiguration::fromLanguageAndLocation(
QStringLiteral( "sr" ), availableLocales, QStringLiteral( "NL" ) );
- QCOMPARE( r.language(), "sr_ME" ); // Because that one is first in the list
+ QCOMPARE( r.language(), "sr_RS" ); // Because that one is first in the list
}
{
auto r = LocaleConfiguration::fromLanguageAndLocation(
@@ -353,6 +383,206 @@ LocaleTests::testLanguageDetectionValencia()
}
}
+static QStringList
+splitTestFileIntoLines( const QString& filename )
+{
+ // BUILD_AS_TEST is the source-directory path
+ const QFileInfo fi( QString( "%1/tests/%2" ).arg( BUILD_AS_TEST, filename ) );
+ const QString path = fi.absoluteFilePath();
+ QFile testData( path );
+ if ( testData.open( QIODevice::ReadOnly ) )
+ {
+ return QString::fromUtf8( testData.readAll() ).split( '\n', Qt::SkipEmptyParts );
+ }
+ return QStringList {};
+}
+
+void
+LocaleTests::testKDENeonLanguageData()
+{
+ if ( !m_KDEneonLocales.isEmpty() )
+ {
+ return;
+ }
+ const QStringList neonLocales = splitTestFileIntoLines( QStringLiteral( "locale-data-neon" ) );
+ cDebug() << "Loaded KDE neon locales test data" << neonLocales.front() << "to" << neonLocales.back();
+ QCOMPARE( neonLocales.length(), 318 ); // wc -l tells me 318 lines
+ m_KDEneonLocales = neonLocales;
+
+ const QStringList bsdLocales = splitTestFileIntoLines( QStringLiteral( "locale-data-freebsd" ) );
+ cDebug() << "Loaded FreeBSD locales test data" << bsdLocales.front() << "to" << bsdLocales.back();
+ QCOMPARE( bsdLocales.length(), 79 );
+ m_FreeBSDLocales = bsdLocales;
+}
+
+void
+LocaleTests::MappingData()
+{
+ QTest::addColumn< QString >( "selectedLanguage" );
+ QTest::addColumn< QString >( "KDEneonLanguage" );
+ QTest::addColumn< QString >( "FreeBSDLanguage" );
+
+ // Tired of writing QString or QStringLiteral all the time.
+ auto l = []( const char* p ) { return QString::fromUtf8( p ); };
+ auto u = []() { return QString(); };
+
+ // The KDEneon columns include the .UTF-8 from the source data
+ // The FreeBSD columns may have u() to indicate "same as KDEneon",
+ // that's an empty string.
+ //
+ // Each row shows how a language -- which can be selected from the
+ // welcome page, and is inserted into GS as the language key that
+ // Calamares knows -- should be mapped to a supported system locale.
+ //
+ // All the mappings are for ".. in NL", which can trigger minor variation
+ // if there are languages with a _NL variant (e.g. nl_NL and nl_BE).
+
+ // clang-format off
+ QTest::newRow( "en " ) << l( "en" ) << l( "en_US.UTF-8" ) << u();
+ QTest::newRow( "en_GB" ) << l( "en_GB" ) << l( "en_GB.UTF-8" ) << u();
+ QTest::newRow( "ca " ) << l( "ca" ) << l( "ca_ES.UTF-8" ) << u();
+ // FreeBSD has no Valencian variant
+ QTest::newRow( "ca@vl" ) << l( "ca@valencia" ) << l( "ca_ES@valencia" ) << l( "ca_ES.UTF-8" );
+ // FreeBSD has the UTF-8 marker before the @region part
+ QTest::newRow( "sr " ) << l( "sr" ) << l( "sr_RS" ) << l( "sr_RS.UTF-8" );
+ QTest::newRow( "sr@lt" ) << l( "sr@latin" ) << l( "sr_RS@latin" ) << l( "sr_RS.UTF-8@latin" );
+ QTest::newRow( "pt_PT" ) << l( "pt_PT" ) << l( "pt_PT.UTF-8" ) << u();
+ QTest::newRow( "pt_BR" ) << l( "pt_BR" ) << l( "pt_BR.UTF-8" ) << u();
+ QTest::newRow( "nl " ) << l( "nl" ) << l( "nl_NL.UTF-8" ) << u();
+ QTest::newRow( "zh_TW" ) << l( "zh_TW" ) << l( "zh_TW.UTF-8" ) << u();
+ // clang-format on
+}
+
+
+void
+LocaleTests::testLanguageMappingNeon_data()
+{
+ MappingData();
+}
+
+void
+LocaleTests::testLanguageMappingFreeBSD_data()
+{
+ MappingData();
+}
+
+void
+LocaleTests::testLanguageMappingNeon()
+{
+ testKDENeonLanguageData();
+ QVERIFY( !m_KDEneonLocales.isEmpty() );
+
+ QFETCH( QString, selectedLanguage );
+ QFETCH( QString, KDEneonLanguage );
+ QFETCH( QString, FreeBSDLanguage );
+
+ QVERIFY( m_availableLanguages.contains( selectedLanguage ) );
+
+ const auto neon = LocaleConfiguration::fromLanguageAndLocation(
+ ( selectedLanguage ), m_KDEneonLocales, QStringLiteral( "NL" ) );
+ QCOMPARE( neon.language(), KDEneonLanguage );
+}
+
+void
+LocaleTests::testLanguageMappingFreeBSD()
+{
+ testKDENeonLanguageData();
+ QVERIFY( !m_FreeBSDLocales.isEmpty() );
+
+ QFETCH( QString, selectedLanguage );
+ QFETCH( QString, KDEneonLanguage );
+ QFETCH( QString, FreeBSDLanguage );
+
+ QVERIFY( m_availableLanguages.contains( selectedLanguage ) );
+
+ const auto bsd = LocaleConfiguration::fromLanguageAndLocation(
+ ( selectedLanguage ), m_FreeBSDLocales, QStringLiteral( "NL" ) );
+ const auto expected = FreeBSDLanguage.isEmpty() ? KDEneonLanguage : FreeBSDLanguage;
+ QCOMPARE( bsd.language(), expected );
+}
+
+void
+LocaleTests::testLocaleNameParts()
+{
+ testKDENeonLanguageData();
+ QVERIFY( !m_FreeBSDLocales.isEmpty() );
+ QVERIFY( !m_KDEneonLocales.isEmpty() );
+
+ // Example constant locales
+ {
+ auto c_parts = LocaleNameParts::fromName( QStringLiteral( "nl_NL.UTF-8" ) );
+ QCOMPARE( c_parts.language, QStringLiteral( "nl" ) );
+ QCOMPARE( c_parts.country, QStringLiteral( "NL" ) );
+ QCOMPARE( c_parts.encoding, QStringLiteral( "UTF-8" ) );
+ QVERIFY( c_parts.region.isEmpty() );
+ }
+ {
+ auto c_parts = LocaleNameParts::fromName( QStringLiteral( "C.UTF-8" ) );
+ QCOMPARE( c_parts.language, QStringLiteral( "C" ) );
+ QVERIFY( c_parts.country.isEmpty() );
+ QCOMPARE( c_parts.encoding, QStringLiteral( "UTF-8" ) );
+ QVERIFY( c_parts.region.isEmpty() );
+ }
+
+ // Check all the loaded test locales
+ for ( const auto& s : m_FreeBSDLocales )
+ {
+ auto parts = LocaleNameParts::fromName( s );
+ QVERIFY( parts.isValid() );
+ QCOMPARE( parts.name(), s );
+ }
+
+ for ( const auto& s : m_KDEneonLocales )
+ {
+ auto parts = LocaleNameParts::fromName( s );
+ QVERIFY( parts.isValid() );
+ QCOMPARE( parts.name(), s );
+ }
+}
+
+void
+LocaleTests::testLanguageSimilarity()
+{
+ // Empty
+ {
+ QCOMPARE( LocaleNameParts().similarity( LocaleNameParts() ), 0 );
+ }
+ // Some simple Dutch situations
+ {
+ auto nl_parts = LocaleNameParts::fromName( QStringLiteral( "nl_NL.UTF-8" ) );
+ auto be_parts = LocaleNameParts::fromName( QStringLiteral( "nl_BE.UTF-8" ) );
+ auto nl_short_parts = LocaleNameParts::fromName( QStringLiteral( "nl" ) );
+ QCOMPARE( nl_parts.similarity( nl_parts ), 100 );
+ QCOMPARE( nl_parts.similarity( LocaleNameParts() ), 0 );
+ QCOMPARE( nl_parts.similarity( be_parts ), 80 ); // Language + (empty) region match
+ QCOMPARE( nl_parts.similarity( nl_short_parts ), 90 );
+ }
+
+ // Everything matches itself
+ {
+ if ( m_KDEneonLocales.isEmpty() )
+ {
+ testKDENeonLanguageData();
+ }
+ QVERIFY( !m_FreeBSDLocales.isEmpty() );
+ QVERIFY( !m_KDEneonLocales.isEmpty() );
+ for ( const auto& l : m_KDEneonLocales )
+ {
+ auto locale_name = LocaleNameParts::fromName( l );
+ auto self_similarity = locale_name.similarity( locale_name );
+ if ( self_similarity != 100 )
+ {
+ cDebug() << "Locale" << l << "is unusual.";
+ if ( l == QStringLiteral( "eo" ) )
+ {
+ QEXPECT_FAIL( "", "Esperanto has no country to match", Continue );
+ }
+ }
+ QCOMPARE( self_similarity, 100 );
+ }
+ }
+}
+
#include "utils/moc-warnings.h"
diff --git a/src/modules/locale/tests/locale-data-freebsd b/src/modules/locale/tests/locale-data-freebsd
new file mode 100644
index 0000000000000000000000000000000000000000..281839a90c6efe9e93bbeb0e50f369a70176ac09
--- /dev/null
+++ b/src/modules/locale/tests/locale-data-freebsd
@@ -0,0 +1,79 @@
+C.UTF-8
+af_ZA.UTF-8
+am_ET.UTF-8
+ar_AE.UTF-8
+ar_EG.UTF-8
+ar_JO.UTF-8
+ar_MA.UTF-8
+ar_QA.UTF-8
+ar_SA.UTF-8
+be_BY.UTF-8
+bg_BG.UTF-8
+ca_AD.UTF-8
+ca_ES.UTF-8
+ca_FR.UTF-8
+ca_IT.UTF-8
+cs_CZ.UTF-8
+da_DK.UTF-8
+de_AT.UTF-8
+de_CH.UTF-8
+de_DE.UTF-8
+el_GR.UTF-8
+en_AU.UTF-8
+en_CA.UTF-8
+en_GB.UTF-8
+en_HK.UTF-8
+en_IE.UTF-8
+en_NZ.UTF-8
+en_PH.UTF-8
+en_SG.UTF-8
+en_US.UTF-8
+en_ZA.UTF-8
+es_AR.UTF-8
+es_CR.UTF-8
+es_ES.UTF-8
+es_MX.UTF-8
+et_EE.UTF-8
+eu_ES.UTF-8
+fi_FI.UTF-8
+fr_BE.UTF-8
+fr_CA.UTF-8
+fr_CH.UTF-8
+fr_FR.UTF-8
+ga_IE.UTF-8
+he_IL.UTF-8
+hi_IN.UTF-8
+hr_HR.UTF-8
+hu_HU.UTF-8
+hy_AM.UTF-8
+is_IS.UTF-8
+it_CH.UTF-8
+it_IT.UTF-8
+ja_JP.UTF-8
+kk_KZ.UTF-8
+ko_KR.UTF-8
+lt_LT.UTF-8
+lv_LV.UTF-8
+mn_MN.UTF-8
+nb_NO.UTF-8
+nl_BE.UTF-8
+nl_NL.UTF-8
+nn_NO.UTF-8
+pl_PL.UTF-8
+pt_BR.UTF-8
+pt_PT.UTF-8
+ro_RO.UTF-8
+ru_RU.UTF-8
+se_FI.UTF-8
+se_NO.UTF-8
+sk_SK.UTF-8
+sl_SI.UTF-8
+sr_RS.UTF-8
+sr_RS.UTF-8@latin
+sv_FI.UTF-8
+sv_SE.UTF-8
+tr_TR.UTF-8
+uk_UA.UTF-8
+zh_CN.UTF-8
+zh_HK.UTF-8
+zh_TW.UTF-8
diff --git a/src/modules/locale/tests/locale-data-neon b/src/modules/locale/tests/locale-data-neon
new file mode 100644
index 0000000000000000000000000000000000000000..0f0254d013b2499f401129dd3b7b380468bde5d2
--- /dev/null
+++ b/src/modules/locale/tests/locale-data-neon
@@ -0,0 +1,318 @@
+aa_DJ.UTF-8
+aa_ER
+aa_ER@saaho
+aa_ET
+af_ZA.UTF-8
+agr_PE
+ak_GH
+am_ET
+an_ES.UTF-8
+anp_IN
+ar_AE.UTF-8
+ar_BH.UTF-8
+ar_DZ.UTF-8
+ar_EG.UTF-8
+ar_IN
+ar_IQ.UTF-8
+ar_JO.UTF-8
+ar_KW.UTF-8
+ar_LB.UTF-8
+ar_LY.UTF-8
+ar_MA.UTF-8
+ar_OM.UTF-8
+ar_QA.UTF-8
+ar_SA.UTF-8
+ar_SD.UTF-8
+ar_SS
+ar_SY.UTF-8
+ar_TN.UTF-8
+ar_YE.UTF-8
+ayc_PE
+az_AZ
+az_IR
+as_IN
+ast_ES.UTF-8
+be_BY.UTF-8
+be_BY@latin
+bem_ZM
+ber_DZ
+ber_MA
+bg_BG.UTF-8
+bhb_IN.UTF-8
+bho_IN
+bho_NP
+bi_VU
+bn_BD
+bn_IN
+bo_CN
+bo_IN
+br_FR.UTF-8
+brx_IN
+bs_BA.UTF-8
+byn_ER
+ca_AD.UTF-8
+ca_ES.UTF-8
+ca_ES@valencia
+ca_FR.UTF-8
+ca_IT.UTF-8
+ce_RU
+ckb_IQ
+chr_US
+cmn_TW
+crh_UA
+cs_CZ.UTF-8
+csb_PL
+cv_RU
+cy_GB.UTF-8
+da_DK.UTF-8
+de_AT.UTF-8
+de_BE.UTF-8
+de_CH.UTF-8
+de_DE.UTF-8
+de_IT.UTF-8
+de_LI.UTF-8
+de_LU.UTF-8
+doi_IN
+dsb_DE
+dv_MV
+dz_BT
+el_GR.UTF-8
+el_CY.UTF-8
+en_AG
+en_AU.UTF-8
+en_BW.UTF-8
+en_CA.UTF-8
+en_DK.UTF-8
+en_GB.UTF-8
+en_HK.UTF-8
+en_IE.UTF-8
+en_IL
+en_IN
+en_NG
+en_NZ.UTF-8
+en_PH.UTF-8
+en_SC.UTF-8
+en_SG.UTF-8
+en_US.UTF-8
+en_ZA.UTF-8
+en_ZM
+en_ZW.UTF-8
+eo
+eo_US.UTF-8
+es_AR.UTF-8
+es_BO.UTF-8
+es_CL.UTF-8
+es_CO.UTF-8
+es_CR.UTF-8
+es_CU
+es_DO.UTF-8
+es_EC.UTF-8
+es_ES.UTF-8
+es_GT.UTF-8
+es_HN.UTF-8
+es_MX.UTF-8
+es_NI.UTF-8
+es_PA.UTF-8
+es_PE.UTF-8
+es_PR.UTF-8
+es_PY.UTF-8
+es_SV.UTF-8
+es_US.UTF-8
+es_UY.UTF-8
+es_VE.UTF-8
+et_EE.UTF-8
+eu_ES.UTF-8
+eu_FR.UTF-8
+fa_IR
+ff_SN
+fi_FI.UTF-8
+fil_PH
+fo_FO.UTF-8
+fr_BE.UTF-8
+fr_CA.UTF-8
+fr_CH.UTF-8
+fr_FR.UTF-8
+fr_LU.UTF-8
+fur_IT
+fy_NL
+fy_DE
+ga_IE.UTF-8
+gd_GB.UTF-8
+gez_ER
+gez_ER@abegede
+gez_ET
+gez_ET@abegede
+gl_ES.UTF-8
+gu_IN
+gv_GB.UTF-8
+ha_NG
+hak_TW
+he_IL.UTF-8
+hi_IN
+hif_FJ
+hne_IN
+hr_HR.UTF-8
+hsb_DE.UTF-8
+ht_HT
+hu_HU.UTF-8
+hy_AM
+ia_FR
+id_ID.UTF-8
+ig_NG
+ik_CA
+is_IS.UTF-8
+it_CH.UTF-8
+it_IT.UTF-8
+iu_CA
+ja_JP.UTF-8
+ka_GE.UTF-8
+kab_DZ
+kk_KZ.UTF-8
+kl_GL.UTF-8
+km_KH
+kn_IN
+ko_KR.UTF-8
+kok_IN
+ks_IN
+ks_IN@devanagari
+ku_TR.UTF-8
+kw_GB.UTF-8
+ky_KG
+lb_LU
+lg_UG.UTF-8
+li_BE
+li_NL
+lij_IT
+ln_CD
+lo_LA
+lt_LT.UTF-8
+lv_LV.UTF-8
+lzh_TW
+mag_IN
+mai_IN
+mai_NP
+mfe_MU
+mg_MG.UTF-8
+mhr_RU
+mi_NZ.UTF-8
+miq_NI
+mjw_IN
+mk_MK.UTF-8
+ml_IN
+mn_MN
+mni_IN
+mnw_MM
+mr_IN
+ms_MY.UTF-8
+mt_MT.UTF-8
+my_MM
+nan_TW
+nan_TW@latin
+nb_NO.UTF-8
+nds_DE
+nds_NL
+ne_NP
+nhn_MX
+niu_NU
+niu_NZ
+nl_AW
+nl_BE.UTF-8
+nl_NL.UTF-8
+nn_NO.UTF-8
+nr_ZA
+nso_ZA
+oc_FR.UTF-8
+om_ET
+om_KE.UTF-8
+or_IN
+os_RU
+pa_IN
+pa_PK
+pap_AW
+pap_CW
+pl_PL.UTF-8
+ps_AF
+pt_BR.UTF-8
+pt_PT.UTF-8
+quz_PE
+raj_IN
+ro_RO.UTF-8
+ru_RU.UTF-8
+ru_UA.UTF-8
+rw_RW
+sa_IN
+sah_RU
+sat_IN
+sc_IT
+sd_IN
+sd_IN@devanagari
+sd_PK
+se_NO
+sgs_LT
+shn_MM
+shs_CA
+si_LK
+sid_ET
+sk_SK.UTF-8
+sl_SI.UTF-8
+sm_WS
+so_DJ.UTF-8
+so_ET
+so_KE.UTF-8
+so_SO.UTF-8
+sq_AL.UTF-8
+sq_MK
+sr_ME
+sr_RS
+sr_RS@latin
+ss_ZA
+st_ZA.UTF-8
+sv_FI.UTF-8
+sv_SE.UTF-8
+sw_KE
+sw_TZ
+szl_PL
+ta_IN
+ta_LK
+tcy_IN.UTF-8
+te_IN
+tg_TJ.UTF-8
+th_TH.UTF-8
+the_NP
+ti_ER
+ti_ET
+tig_ER
+tk_TM
+tl_PH.UTF-8
+tn_ZA
+to_TO
+tpi_PG
+tr_CY.UTF-8
+tr_TR.UTF-8
+ts_ZA
+tt_RU
+tt_RU@iqtelif
+ug_CN
+ug_CN@latin
+uk_UA.UTF-8
+unm_US
+ur_IN
+ur_PK
+uz_UZ.UTF-8
+uz_UZ@cyrillic
+ve_ZA
+vi_VN
+wa_BE.UTF-8
+wae_CH
+wal_ET
+wo_SN
+xh_ZA.UTF-8
+yi_US.UTF-8
+yo_NG
+yue_HK
+yuw_PG
+zh_CN.UTF-8
+zh_HK.UTF-8
+zh_SG.UTF-8
+zh_TW.UTF-8
+zu_ZA.UTF-8
diff --git a/src/modules/localeq/CMakeLists.txt b/src/modules/localeq/CMakeLists.txt
index ee3f0731432b12a61efc207f5a3a776ba96dcdf5..d9741e5065d789b72907d12ea9fa89235aeaaf94 100644
--- a/src/modules/localeq/CMakeLists.txt
+++ b/src/modules/localeq/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-if( NOT WITH_QML )
+if(NOT WITH_QML)
calamares_skip_module( "localeq (QML is not supported in this build)" )
return()
endif()
@@ -11,34 +11,39 @@ endif()
# When debugging the timezone widget, add this debugging definition
# to have a debugging-friendly timezone widget, debug logging,
# and no intrusive timezone-setting while clicking around.
-option( DEBUG_TIMEZONES "Debug-friendly timezone widget." OFF )
-if( DEBUG_TIMEZONES )
- add_definitions( -DDEBUG_TIMEZONES )
+option(DEBUG_TIMEZONES "Debug-friendly timezone widget." OFF)
+if(DEBUG_TIMEZONES)
+ add_definitions(-DDEBUG_TIMEZONES)
endif()
find_package(Qt5Location CONFIG)
-set_package_properties(Qt5Location PROPERTIES
+set_package_properties(
+ Qt5Location
+ PROPERTIES
DESCRIPTION "Used for rendering the map"
TYPE RUNTIME
)
find_package(Qt5Positioning CONFIG)
-set_package_properties(Qt5Positioning PROPERTIES
+set_package_properties(
+ Qt5Positioning
+ PROPERTIES
DESCRIPTION "Used for GeoLocation and GeoCoding"
TYPE RUNTIME
)
# Because we're sharing sources with the regular locale module
-set( _locale ${CMAKE_CURRENT_SOURCE_DIR}/../locale )
+set(_locale ${CMAKE_CURRENT_SOURCE_DIR}/../locale)
-include_directories( ${_locale} )
+include_directories(${_locale})
-calamares_add_plugin( localeq
+calamares_add_plugin(localeq
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
LocaleQmlViewStep.cpp
- ${_locale}/LocaleConfiguration.cpp
${_locale}/Config.cpp
+ ${_locale}/LocaleConfiguration.cpp
+ ${_locale}/LocaleNames.cpp
${_locale}/SetTimezoneJob.cpp
RESOURCES
localeq.qrc
diff --git a/src/modules/luksopenswaphookcfg/CMakeLists.txt b/src/modules/luksopenswaphookcfg/CMakeLists.txt
index caede06a7b0be6ac4ed53c0e17116ca9da3a20fa..dbec1dc554705acbe9080908946200bd492d8cee 100644
--- a/src/modules/luksopenswaphookcfg/CMakeLists.txt
+++ b/src/modules/luksopenswaphookcfg/CMakeLists.txt
@@ -6,7 +6,7 @@
# Because LUKS Open Swap Hook (Job) is such a mouthful, we'll
# use LOSH all over the place as a shorthand.
-calamares_add_plugin( luksopenswaphookcfg
+calamares_add_plugin(luksopenswaphookcfg
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.cpp b/src/modules/luksopenswaphookcfg/LOSHJob.cpp
index 42f160460d677eac423bada75f97b8464f008aac..39f8551e2f47810818d0380143763e341510d77f 100644
--- a/src/modules/luksopenswaphookcfg/LOSHJob.cpp
+++ b/src/modules/luksopenswaphookcfg/LOSHJob.cpp
@@ -165,7 +165,7 @@ globalStoragePartitionInfo( Calamares::GlobalStorage* gs, LOSHInfo& info )
{
CalamaresUtils::removeLeading( btrfsRootSubvolume, '/' );
info.keyfile_device_mount_options
- = QStringLiteral( "keyfile_device_mount_options=--options=subvol=" ) + btrfsRootSubvolume;
+ = QStringLiteral( "--options=subvol=" ) + btrfsRootSubvolume;
}
}
diff --git a/src/modules/machineid/CMakeLists.txt b/src/modules/machineid/CMakeLists.txt
index 0ab035ab4d2fbfe7788a8dc186f6951750162fac..a0b60a6ef0e075f170b41a1026fdbf74bd1c048a 100644
--- a/src/modules/machineid/CMakeLists.txt
+++ b/src/modules/machineid/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-calamares_add_plugin( machineid
+calamares_add_plugin(machineid
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/netinstall/CMakeLists.txt b/src/modules/netinstall/CMakeLists.txt
index 13c6fa0ce8f4e20d2d0a3384a341279b73c8173c..6b51b138832be24e5772b476be38ece65ede8899 100644
--- a/src/modules/netinstall/CMakeLists.txt
+++ b/src/modules/netinstall/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-calamares_add_plugin( netinstall
+calamares_add_plugin(netinstall
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
@@ -32,4 +32,3 @@ calamares_add_test(
LIBRARIES
Qt5::Gui
)
-
diff --git a/src/modules/notesqml/CMakeLists.txt b/src/modules/notesqml/CMakeLists.txt
index 5eab06663cea0ea8e841e51d910fd3cdaa1e1be6..c76ab5179eb286d39e901c0c566f0a34a68ac91d 100644
--- a/src/modules/notesqml/CMakeLists.txt
+++ b/src/modules/notesqml/CMakeLists.txt
@@ -3,12 +3,12 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-if( NOT WITH_QML )
+if(NOT WITH_QML)
calamares_skip_module( "notesqml (QML is not supported in this build)" )
return()
endif()
-calamares_add_plugin( notesqml
+calamares_add_plugin(notesqml
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/oemid/CMakeLists.txt b/src/modules/oemid/CMakeLists.txt
index af7fe1ff74b0370c2d89c9abdef5638e789e7b6a..45825c85ead1386de958f8dad5ac9b3e3ced5d79 100644
--- a/src/modules/oemid/CMakeLists.txt
+++ b/src/modules/oemid/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-calamares_add_plugin( oemid
+calamares_add_plugin(oemid
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/packagechooser/CMakeLists.txt b/src/modules/packagechooser/CMakeLists.txt
index d2e6ff1183f800479e6e0dfb54e87e26638c9c82..4fbb0b533977d84d2774fe847c29cd1512c44a17 100644
--- a/src/modules/packagechooser/CMakeLists.txt
+++ b/src/modules/packagechooser/CMakeLists.txt
@@ -3,45 +3,54 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-find_package( Qt5 COMPONENTS Core Gui Widgets REQUIRED )
-set( _extra_libraries "" )
-set( _extra_src "" )
+find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
+set(_extra_libraries "")
+set(_extra_src "")
### OPTIONAL AppData XML support in PackageModel
#
#
# TODO:3.3:WITH->BUILD (this doesn't affect the ABI offered by Calamares)
-option( WITH_APPDATA "Support appdata: items in PackageChooser (requires QtXml)" ON )
-if ( WITH_APPDATA )
+option(
+ WITH_APPDATA
+ "Support appdata: items in PackageChooser (requires QtXml)"
+ ON
+)
+if(WITH_APPDATA)
find_package(Qt5 COMPONENTS Xml)
- if ( Qt5Xml_FOUND )
- add_definitions( -DHAVE_APPDATA )
- list( APPEND _extra_libraries Qt5::Xml )
- list( APPEND _extra_src ItemAppData.cpp )
+ if(Qt5Xml_FOUND)
+ add_definitions(-DHAVE_APPDATA)
+ list(APPEND _extra_libraries Qt5::Xml)
+ list(APPEND _extra_src ItemAppData.cpp)
endif()
endif()
### OPTIONAL AppStream support in PackageModel
#
#
-option( WITH_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON )
-if ( WITH_APPSTREAM )
+option(
+ WITH_APPSTREAM
+ "Support appstream: items in PackageChooser (requires libappstream-qt)"
+ ON
+)
+if(WITH_APPSTREAM)
find_package(AppStreamQt)
set_package_properties(
- AppStreamQt PROPERTIES
+ AppStreamQt
+ PROPERTIES
DESCRIPTION "Support for AppStream (cache) data"
URL "https://github.com/ximion/appstream"
PURPOSE "AppStream provides package data"
TYPE OPTIONAL
)
- if ( AppStreamQt_FOUND )
- add_definitions( -DHAVE_APPSTREAM )
- list( APPEND _extra_libraries AppStreamQt )
- list( APPEND _extra_src ItemAppStream.cpp )
+ if(AppStreamQt_FOUND)
+ add_definitions(-DHAVE_APPSTREAM)
+ list(APPEND _extra_libraries AppStreamQt)
+ list(APPEND _extra_src ItemAppStream.cpp)
endif()
endif()
-calamares_add_plugin( packagechooser
+calamares_add_plugin(packagechooser
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/packagechooserq/CMakeLists.txt b/src/modules/packagechooserq/CMakeLists.txt
index 51a17e215df7442442c505416141baa33cade703..e92b8b30ea2e182f39ea74e43d23d35e03243e12 100644
--- a/src/modules/packagechooserq/CMakeLists.txt
+++ b/src/modules/packagechooserq/CMakeLists.txt
@@ -4,55 +4,64 @@
# SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
# SPDX-License-Identifier: BSD-2-Clause
#
-if( NOT WITH_QML )
- calamares_skip_module( "packagechooserq (QML is not supported in this build)" )
+if(NOT WITH_QML)
+ calamares_skip_module("packagechooserq (QML is not supported in this build)")
return()
endif()
-find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core )
+find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Core)
# Add optional libraries here
-set( USER_EXTRA_LIB )
+set(USER_EXTRA_LIB)
# include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../packagechooser )
-set( _packagechooser ${CMAKE_CURRENT_SOURCE_DIR}/../packagechooser )
-include_directories( ${_packagechooser} )
+set(_packagechooser ${CMAKE_CURRENT_SOURCE_DIR}/../packagechooser)
+include_directories(${_packagechooser})
### OPTIONAL AppData XML support in PackageModel
#
#
# TODO:3.3:WITH->BUILD (this doesn't affect the ABI offered by Calamares)
-option( WITH_APPDATA "Support appdata: items in PackageChooser (requires QtXml)" ON )
-if ( WITH_APPDATA )
+option(
+ WITH_APPDATA
+ "Support appdata: items in PackageChooser (requires QtXml)"
+ ON
+)
+if(WITH_APPDATA)
find_package(Qt5 COMPONENTS Xml)
- if ( Qt5Xml_FOUND )
- add_definitions( -DHAVE_APPDATA )
- list( APPEND _extra_libraries Qt5::Xml )
- list( APPEND _extra_src ${_packagechooser}/ItemAppData.cpp )
+ if(Qt5Xml_FOUND)
+ add_definitions(-DHAVE_APPDATA)
+ list(APPEND _extra_libraries Qt5::Xml)
+ list(APPEND _extra_src ${_packagechooser}/ItemAppData.cpp)
endif()
endif()
### OPTIONAL AppStream support in PackageModel
#
#
-option( WITH_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON )
-if ( WITH_APPSTREAM )
+option(
+ WITH_APPSTREAM
+ "Support appstream: items in PackageChooser (requires libappstream-qt)"
+ ON
+)
+if(WITH_APPSTREAM)
find_package(AppStreamQt)
set_package_properties(
- AppStreamQt PROPERTIES
+ AppStreamQt
+ PROPERTIES
DESCRIPTION "Support for AppStream (cache) data"
URL "https://github.com/ximion/appstream"
PURPOSE "AppStream provides package data"
TYPE OPTIONAL
)
- if ( AppStreamQt_FOUND )
- add_definitions( -DHAVE_APPSTREAM )
- list( APPEND _extra_libraries AppStreamQt )
- list( APPEND _extra_src ${_packagechooser}/ItemAppStream.cpp )
+ if(AppStreamQt_FOUND)
+ add_definitions(-DHAVE_APPSTREAM)
+ list(APPEND _extra_libraries AppStreamQt)
+ list(APPEND _extra_src ${_packagechooser}/ItemAppStream.cpp)
endif()
endif()
-calamares_add_plugin( packagechooserq
+calamares_add_plugin(packagechooserq
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt
index 940aacdd8b27df2d06566f6ba0e253433e98cee6..6c923cc5dba18790eaac01cae37bb6ce569e56d7 100644
--- a/src/modules/partition/CMakeLists.txt
+++ b/src/modules/partition/CMakeLists.txt
@@ -18,45 +18,49 @@
# modules since the partitions on disk won't match GS, but it can be
# useful for debugging simulated installations that don't need to
# mount the target filesystems.
-option( DEBUG_PARTITION_UNSAFE "Allow unsafe partitioning choices." OFF )
-option( DEBUG_PARTITION_BAIL_OUT "Unsafe partitioning will error out on exec." ON )
-option( DEBUG_PARTITION_SKIP "Don't actually do any partitioning." OFF)
+option(DEBUG_PARTITION_UNSAFE "Allow unsafe partitioning choices." OFF)
+option(
+ DEBUG_PARTITION_BAIL_OUT
+ "Unsafe partitioning will error out on exec."
+ ON
+)
+option(DEBUG_PARTITION_SKIP "Don't actually do any partitioning." OFF)
# This is very chatty, useful mostly if you don't know what KPMCore offers.
-option( DEBUG_FILESYSTEMS "Log all available Filesystems from KPMCore." OFF )
+option(DEBUG_FILESYSTEMS "Log all available Filesystems from KPMCore." OFF)
-include_directories( ${CMAKE_SOURCE_DIR} ) # For 3rdparty
+include_directories(${CMAKE_SOURCE_DIR}) # For 3rdparty
-set( _partition_defs )
-if( DEBUG_PARTITION_UNSAFE )
- if( DEBUG_PARTITION_BAIL_OUT )
- list( APPEND _partition_defs DEBUG_PARTITION_BAIL_OUT )
+set(_partition_defs)
+if(DEBUG_PARTITION_UNSAFE)
+ if(DEBUG_PARTITION_BAIL_OUT)
+ list(APPEND _partition_defs DEBUG_PARTITION_BAIL_OUT)
endif()
- list( APPEND _partition_defs DEBUG_PARTITION_UNSAFE )
+ list(APPEND _partition_defs DEBUG_PARTITION_UNSAFE)
endif()
-if ( DEBUG_FILESYSTEMS )
- list( APPEND _partition_defs DEBUG_FILESYSTEMS )
+if(DEBUG_FILESYSTEMS)
+ list(APPEND _partition_defs DEBUG_FILESYSTEMS)
endif()
-if( DEBUG_PARTITION_SKIP )
- list( APPEND _partition_defs DEBUG_PARTITION_SKIP )
+if(DEBUG_PARTITION_SKIP)
+ list(APPEND _partition_defs DEBUG_PARTITION_SKIP)
endif()
find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
-include( KPMcoreHelper )
+include(KPMcoreHelper)
-find_package( KF5Config CONFIG )
-find_package( KF5I18n CONFIG )
-find_package( KF5WidgetsAddons CONFIG )
+find_package(KF5Config CONFIG)
+find_package(KF5I18n CONFIG)
+find_package(KF5WidgetsAddons CONFIG)
-if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND )
- list( APPEND _partition_defs ${KPMcore_API_DEFINITIONS} )
- include_directories( ${KPMCORE_INCLUDE_DIR} )
- include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
+if(KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND)
+ list(APPEND _partition_defs ${KPMcore_API_DEFINITIONS})
+ include_directories(${KPMCORE_INCLUDE_DIR})
+ include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
- add_subdirectory( tests )
+ add_subdirectory(tests)
- calamares_add_plugin( partition
+ calamares_add_plugin(partition
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
@@ -124,10 +128,9 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND
SHARED_LIB
)
else()
- if ( NOT KPMcore_FOUND )
+ if(NOT KPMcore_FOUND)
calamares_skip_module( "partition (missing suitable KPMcore)" )
else()
calamares_skip_module( "partition (missing dependencies for KPMcore)" )
endif()
endif()
-
diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt
index da017d96ffbfbf7bf4f8aa7a3f02976d43e2e57d..5fb2ebacfa83764e7b3e94690692ee847ec1a088 100644
--- a/src/modules/partition/tests/CMakeLists.txt
+++ b/src/modules/partition/tests/CMakeLists.txt
@@ -3,9 +3,9 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-find_package( Qt5 COMPONENTS Gui REQUIRED )
+find_package(Qt5 COMPONENTS Gui REQUIRED)
-set( PartitionModule_SOURCE_DIR .. )
+set(PartitionModule_SOURCE_DIR ..)
include_directories(
${Qt5Gui_INCLUDE_DIRS}
@@ -40,7 +40,6 @@ calamares_add_test(
DEFINITIONS ${_partition_defs}
)
-
calamares_add_test(
partitioncreatelayoutstest
SOURCES
diff --git a/src/modules/plasmalnf/CMakeLists.txt b/src/modules/plasmalnf/CMakeLists.txt
index 8ae205aedd975b8b158f3d9677d900cac23c2b46..60152fc845c2a18c0f72831160c68358fe175e0c 100644
--- a/src/modules/plasmalnf/CMakeLists.txt
+++ b/src/modules/plasmalnf/CMakeLists.txt
@@ -7,28 +7,31 @@ find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
# Requires a sufficiently recent Plasma framework, but also
# needs a runtime support component (which we don't test for).
-set( lnf_ver 5.41 )
+set(lnf_ver 5.41)
-find_package( KF5Config ${lnf_ver} )
+find_package(KF5Config ${lnf_ver})
set_package_properties(
- KF5Config PROPERTIES
+ KF5Config
+ PROPERTIES
PURPOSE "For finding default Plasma Look-and-Feel"
)
-find_package( KF5Plasma ${lnf_ver} )
+find_package(KF5Plasma ${lnf_ver})
set_package_properties(
- KF5Plasma PROPERTIES
+ KF5Plasma
+ PROPERTIES
PURPOSE "For Plasma Look-and-Feel selection"
)
-find_package( KF5Package ${lnf_ver} )
+find_package(KF5Package ${lnf_ver})
set_package_properties(
- KF5Package PROPERTIES
+ KF5Package
+ PROPERTIES
PURPOSE "For Plasma Look-and-Feel selection"
)
-if ( KF5Plasma_FOUND AND KF5Package_FOUND )
- calamares_add_plugin( plasmalnf
+if(KF5Plasma_FOUND AND KF5Package_FOUND)
+ calamares_add_plugin(plasmalnf
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
COMPILE_DEFINITIONS
@@ -48,8 +51,11 @@ if ( KF5Plasma_FOUND AND KF5Package_FOUND )
KF5::Plasma
SHARED_LIB
)
- if ( KF5Config_FOUND )
- target_compile_definitions(calamares_viewmodule_plasmalnf PRIVATE WITH_KCONFIG)
+ if(KF5Config_FOUND)
+ target_compile_definitions(
+ calamares_viewmodule_plasmalnf
+ PRIVATE WITH_KCONFIG
+ )
endif()
else()
calamares_skip_module( "plasmalnf (missing requirements)" )
diff --git a/src/modules/preservefiles/CMakeLists.txt b/src/modules/preservefiles/CMakeLists.txt
index 5df637321a699396cec304d6637c65b8fabd1813..aa8c3060d4785ce588168febcbd2da5e523c1a50 100644
--- a/src/modules/preservefiles/CMakeLists.txt
+++ b/src/modules/preservefiles/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-calamares_add_plugin( preservefiles
+calamares_add_plugin(preservefiles
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/removeuser/CMakeLists.txt b/src/modules/removeuser/CMakeLists.txt
index 7663b3472c35b283690efc9ca9a621c11d6da99d..eaaf20157a63fdaab5ee4277a2cf60c6adb41ca9 100644
--- a/src/modules/removeuser/CMakeLists.txt
+++ b/src/modules/removeuser/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-calamares_add_plugin( removeuser
+calamares_add_plugin(removeuser
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/shellprocess/CMakeLists.txt b/src/modules/shellprocess/CMakeLists.txt
index ac6630c6d2d6dfa25c851ad936ed020e0154c4aa..aa1fadc6c72a93ee484c802807d2f27d9e7c4cb2 100644
--- a/src/modules/shellprocess/CMakeLists.txt
+++ b/src/modules/shellprocess/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-calamares_add_plugin( shellprocess
+calamares_add_plugin(shellprocess
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/summary/CMakeLists.txt b/src/modules/summary/CMakeLists.txt
index e3c1a381c862699d153c0127f0bc8d6ad32d42a8..16f98ebb49887817664e643661cdb16b29e7ec3a 100644
--- a/src/modules/summary/CMakeLists.txt
+++ b/src/modules/summary/CMakeLists.txt
@@ -3,8 +3,8 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
-calamares_add_plugin( summary
+include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
+calamares_add_plugin(summary
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/summaryq/CMakeLists.txt b/src/modules/summaryq/CMakeLists.txt
index 8aac1bc2f09d2bd9a22eb3b2ca192f554729d73e..071c344ef3b417943b80cec064c71fe2ae90e78a 100644
--- a/src/modules/summaryq/CMakeLists.txt
+++ b/src/modules/summaryq/CMakeLists.txt
@@ -3,15 +3,15 @@
# SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
# SPDX-License-Identifier: BSD-2-Clause
#
-if( NOT WITH_QML )
+if(NOT WITH_QML)
calamares_skip_module( "summaryq (QML is not supported in this build)" )
return()
endif()
-set( _summary ${CMAKE_CURRENT_SOURCE_DIR}/../summary )
-include_directories( ${_summary} )
+set(_summary ${CMAKE_CURRENT_SOURCE_DIR}/../summary)
+include_directories(${_summary})
-calamares_add_plugin( summaryq
+calamares_add_plugin(summaryq
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/tracking/CMakeLists.txt b/src/modules/tracking/CMakeLists.txt
index a878961b0b6825efebcbbb14a1e54d27b9f703d0..71ba1a8d783dea0b531943f30fd9afbced039d3b 100644
--- a/src/modules/tracking/CMakeLists.txt
+++ b/src/modules/tracking/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-calamares_add_plugin( tracking
+calamares_add_plugin(tracking
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/umount/CMakeLists.txt b/src/modules/umount/CMakeLists.txt
index d728470073150cbcc4923392e37ffa801594fb58..4e05d1b7c2882baf411a40965bed6f9af648819a 100644
--- a/src/modules/umount/CMakeLists.txt
+++ b/src/modules/umount/CMakeLists.txt
@@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-calamares_add_plugin( umount
+calamares_add_plugin(umount
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt
index 8203ecf089095478740c97cabcbf9d0ae1932a47..d01dec572b591fbbf79283d959e8cecb802708a7 100644
--- a/src/modules/users/CMakeLists.txt
+++ b/src/modules/users/CMakeLists.txt
@@ -3,39 +3,41 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus Network )
-find_package( Crypt REQUIRED )
+find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus Network)
+find_package(Crypt REQUIRED)
# Add optional libraries here
-set( USER_EXTRA_LIB )
+set(USER_EXTRA_LIB)
-find_package( LibPWQuality )
+find_package(LibPWQuality)
set_package_properties(
- LibPWQuality PROPERTIES
+ LibPWQuality
+ PROPERTIES
PURPOSE "Extra checks of password quality"
)
-if( LibPWQuality_FOUND )
- list( APPEND USER_EXTRA_LIB ${LibPWQuality_LIBRARIES} )
- include_directories( ${LibPWQuality_INCLUDE_DIRS} )
- add_definitions( -DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY )
+if(LibPWQuality_FOUND)
+ list(APPEND USER_EXTRA_LIB ${LibPWQuality_LIBRARIES})
+ include_directories(${LibPWQuality_INCLUDE_DIRS})
+ add_definitions(-DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY)
endif()
-find_package( ICU COMPONENTS uc i18n )
+find_package(ICU COMPONENTS uc i18n)
set_package_properties(
- ICU PROPERTIES
+ ICU
+ PROPERTIES
PURPOSE "Transliteration support for full name to username conversion"
)
-if( ICU_FOUND )
- list( APPEND USER_EXTRA_LIB ICU::uc ICU::i18n )
- include_directories( ${ICU_INCLUDE_DIRS} )
- add_definitions( -DHAVE_ICU )
+if(ICU_FOUND)
+ list(APPEND USER_EXTRA_LIB ICU::uc ICU::i18n)
+ include_directories(${ICU_INCLUDE_DIRS})
+ add_definitions(-DHAVE_ICU)
endif()
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
+include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
-set( _users_src
+set(_users_src
# Jobs
CreateUserJob.cpp
MiscJobs.cpp
@@ -59,7 +61,7 @@ calamares_add_library(
${CRYPT_LIBRARIES}
)
-calamares_add_plugin( users
+calamares_add_plugin(users
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/usersq/CMakeLists.txt b/src/modules/usersq/CMakeLists.txt
index 8465b02463b3e1f236433559a143df70a0ac0b9d..3e58a4a242dd9c99637b478bf24be36d60ea2ca5 100644
--- a/src/modules/usersq/CMakeLists.txt
+++ b/src/modules/usersq/CMakeLists.txt
@@ -3,45 +3,47 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-if( NOT WITH_QML )
+if(NOT WITH_QML)
calamares_skip_module( "usersq (QML is not supported in this build)" )
return()
endif()
-find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus Network )
-find_package( Crypt REQUIRED )
+find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus Network)
+find_package(Crypt REQUIRED)
# Add optional libraries here
-set( USER_EXTRA_LIB )
+set(USER_EXTRA_LIB)
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../users )
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../users)
-find_package( LibPWQuality )
+find_package(LibPWQuality)
set_package_properties(
- LibPWQuality PROPERTIES
+ LibPWQuality
+ PROPERTIES
PURPOSE "Extra checks of password quality"
)
-if( LibPWQuality_FOUND )
- list( APPEND USER_EXTRA_LIB ${LibPWQuality_LIBRARIES} )
- include_directories( ${LibPWQuality_INCLUDE_DIRS} )
- add_definitions( -DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY )
+if(LibPWQuality_FOUND)
+ list(APPEND USER_EXTRA_LIB ${LibPWQuality_LIBRARIES})
+ include_directories(${LibPWQuality_INCLUDE_DIRS})
+ add_definitions(-DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY)
endif()
#needed for ${_users}/Config.cpp
-find_package( ICU COMPONENTS uc i18n )
+find_package(ICU COMPONENTS uc i18n)
set_package_properties(
- ICU PROPERTIES
+ ICU
+ PROPERTIES
PURPOSE "Transliteration support for full name to username conversion"
)
-if( ICU_FOUND )
- list( APPEND USER_EXTRA_LIB ICU::uc ICU::i18n )
- include_directories( ${ICU_INCLUDE_DIRS} )
- add_definitions( -DHAVE_ICU )
+if(ICU_FOUND)
+ list(APPEND USER_EXTRA_LIB ICU::uc ICU::i18n)
+ include_directories(${ICU_INCLUDE_DIRS})
+ add_definitions(-DHAVE_ICU)
endif()
-calamares_add_plugin( usersq
+calamares_add_plugin(usersq
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/webview/CMakeLists.txt b/src/modules/webview/CMakeLists.txt
index 54e1d18b0a8690f4deb0fc7787984a0a6f320226..34ddb17383d1d1208e932c51ebf7e7b3cf522377 100644
--- a/src/modules/webview/CMakeLists.txt
+++ b/src/modules/webview/CMakeLists.txt
@@ -3,52 +3,57 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-set( CALA_WEBVIEW_LINK_LIBRARIES "" )
+set(CALA_WEBVIEW_LINK_LIBRARIES "")
-option( WEBVIEW_FORCE_WEBKIT "Always build webview with WebKit instead of WebEngine regardless of Qt version." OFF)
+option(
+ WEBVIEW_FORCE_WEBKIT
+ "Always build webview with WebKit instead of WebEngine regardless of Qt version."
+ OFF
+)
-set( _reason "" )
+set(_reason "")
-message( STATUS "Found Qt version ${Qt5Core_VERSION}")
-if ( Qt5Core_VERSION VERSION_LESS 5.6 OR WEBVIEW_FORCE_WEBKIT )
- message( STATUS " .. using webkit")
- find_package( Qt5 ${QT_VERSION} CONFIG COMPONENTS WebKit WebKitWidgets )
+message(STATUS "Found Qt version ${Qt5Core_VERSION}")
+if(Qt5Core_VERSION VERSION_LESS 5.6 OR WEBVIEW_FORCE_WEBKIT)
+ message(STATUS " .. using webkit")
+ find_package(Qt5 ${QT_VERSION} CONFIG COMPONENTS WebKit WebKitWidgets)
- if ( Qt5WebKit_FOUND AND Qt5WebKitWidgets_FOUND )
- list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES
- ${QT_QTWEBKIT_INCLUDE_DIR}
- )
- list( APPEND CALA_WEBVIEW_LINK_LIBRARIES
- Qt5::WebKit
- Qt5::WebKitWidgets
- )
- set( WEBVIEW_WITH_WEBKIT 1 )
+ if(Qt5WebKit_FOUND AND Qt5WebKitWidgets_FOUND)
+ list(APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES ${QT_QTWEBKIT_INCLUDE_DIR})
+ list(APPEND CALA_WEBVIEW_LINK_LIBRARIES Qt5::WebKit Qt5::WebKitWidgets)
+ set(WEBVIEW_WITH_WEBKIT 1)
else()
- set( _reason "No suitable WebKit" )
+ set(_reason "No suitable WebKit")
endif()
else()
- message( STATUS " .. using webengine")
- find_package( Qt5 ${QT_VERSION} CONFIG COMPONENTS WebEngine WebEngineWidgets )
+ message(STATUS " .. using webengine")
+ find_package(Qt5 ${QT_VERSION} CONFIG COMPONENTS WebEngine WebEngineWidgets)
- if ( Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND )
- list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES
+ if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
+ list(
+ APPEND
+ CALA_WEBVIEW_INCLUDE_DIRECTORIES
${QT_QTWEBENGINE_INCLUDE_DIR}
)
- list( APPEND CALA_WEBVIEW_LINK_LIBRARIES
+ list(
+ APPEND
+ CALA_WEBVIEW_LINK_LIBRARIES
Qt5::WebEngine
Qt5::WebEngineWidgets
)
- set( WEBVIEW_WITH_WEBENGINE 1 )
+ set(WEBVIEW_WITH_WEBENGINE 1)
else()
- set( _reason "No suitable WebEngine" )
+ set(_reason "No suitable WebEngine")
endif()
endif()
-if ( NOT _reason )
- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/WebViewConfig.h.in
- ${CMAKE_CURRENT_BINARY_DIR}/WebViewConfig.h )
+if(NOT _reason)
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/WebViewConfig.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/WebViewConfig.h
+ )
- calamares_add_plugin( webview
+ calamares_add_plugin(webview
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/welcome/CMakeLists.txt b/src/modules/welcome/CMakeLists.txt
index 01a89703a61a40ec9a9ce7ba20086789e85c61bb..50f30839a45db9690902eace815332e149db923a 100644
--- a/src/modules/welcome/CMakeLists.txt
+++ b/src/modules/welcome/CMakeLists.txt
@@ -3,19 +3,19 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network )
+find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network)
-find_package( LIBPARTED )
-if ( LIBPARTED_FOUND )
- set( PARTMAN_SRC checker/partman_devices.c )
- set( PARTMAN_LIB ${LIBPARTED_LIBRARY} )
+find_package(LIBPARTED)
+if(LIBPARTED_FOUND)
+ set(PARTMAN_SRC checker/partman_devices.c)
+ set(PARTMAN_LIB ${LIBPARTED_LIBRARY})
else()
- set( PARTMAN_SRC )
- set( PARTMAN_LIB )
- add_definitions( -DWITHOUT_LIBPARTED )
+ set(PARTMAN_SRC)
+ set(PARTMAN_LIB)
+ add_definitions(-DWITHOUT_LIBPARTED)
endif()
-calamares_add_plugin( welcome
+calamares_add_plugin(welcome
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/welcomeq/CMakeLists.txt b/src/modules/welcomeq/CMakeLists.txt
index b6f950dadd8934ec1fd598fd06096585c988478f..7afdf638c99fbc5895444a22a7fcaba57e63463f 100644
--- a/src/modules/welcomeq/CMakeLists.txt
+++ b/src/modules/welcomeq/CMakeLists.txt
@@ -7,34 +7,31 @@
# This is a re-write of the welcome module using QML view steps
# instead of widgets.
-if( NOT WITH_QML )
+if(NOT WITH_QML)
calamares_skip_module( "welcomeq (QML is not supported in this build)" )
return()
endif()
-set( _welcome ${CMAKE_CURRENT_SOURCE_DIR}/../welcome )
+set(_welcome ${CMAKE_CURRENT_SOURCE_DIR}/../welcome)
-include_directories( ${_welcome} )
+include_directories(${_welcome})
# DUPLICATED WITH WELCOME MODULE
-find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network )
+find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network)
-find_package( LIBPARTED )
-if ( LIBPARTED_FOUND )
- set( PARTMAN_SRC ${_welcome}/checker/partman_devices.c )
- set( CHECKER_LINK_LIBRARIES ${LIBPARTED_LIBRARY} )
+find_package(LIBPARTED)
+if(LIBPARTED_FOUND)
+ set(PARTMAN_SRC ${_welcome}/checker/partman_devices.c)
+ set(CHECKER_LINK_LIBRARIES ${LIBPARTED_LIBRARY})
else()
- set( PARTMAN_SRC )
- set( CHECKER_LINK_LIBRARIES )
- add_definitions( -DWITHOUT_LIBPARTED )
+ set(PARTMAN_SRC)
+ set(CHECKER_LINK_LIBRARIES)
+ add_definitions(-DWITHOUT_LIBPARTED)
endif()
-set( CHECKER_SOURCES
- ${_welcome}/checker/GeneralRequirements.cpp
- ${PARTMAN_SRC}
-)
+set(CHECKER_SOURCES ${_welcome}/checker/GeneralRequirements.cpp ${PARTMAN_SRC})
-calamares_add_plugin( welcomeq
+calamares_add_plugin(welcomeq
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
diff --git a/src/modules/zfs/CMakeLists.txt b/src/modules/zfs/CMakeLists.txt
index 2feb911d02ec99a585aee469bc6e81aaa237b736..07764a36093af89d79a26e0f45d3833c3b1629d4 100644
--- a/src/modules/zfs/CMakeLists.txt
+++ b/src/modules/zfs/CMakeLists.txt
@@ -3,11 +3,10 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
-calamares_add_plugin( zfs
+calamares_add_plugin(zfs
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
ZfsJob.cpp
SHARED_LIB
)
-
diff --git a/src/qml/calamares/CMakeLists.txt b/src/qml/calamares/CMakeLists.txt
index d74e79ea0cb25c4661385c062bcac4c67ae83303..38c46b48471e1845fd5e1289da44a70cc910f3e1 100644
--- a/src/qml/calamares/CMakeLists.txt
+++ b/src/qml/calamares/CMakeLists.txt
@@ -12,29 +12,46 @@
# Iterate over all the subdirectories which have a qmldir file, copy them over to the build dir,
# and install them into share/calamares/qml/calamares
-file( GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*" )
-foreach( SUBDIRECTORY ${SUBDIRECTORIES} )
- if( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}"
- AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/qmldir" )
-
- set( QML_DIR share/calamares/qml )
- set( QML_MODULE_DESTINATION ${QML_DIR}/calamares/${SUBDIRECTORY} )
+file(GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*")
+foreach(SUBDIRECTORY ${SUBDIRECTORIES})
+ if(
+ IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}"
+ AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/qmldir"
+ )
+ set(QML_DIR share/calamares/qml)
+ set(QML_MODULE_DESTINATION ${QML_DIR}/calamares/${SUBDIRECTORY})
# We glob all the files inside the subdirectory, and we make sure they are
# synced with the bindir structure and installed.
- file( GLOB QML_MODULE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY} "${SUBDIRECTORY}/*" )
- foreach( QML_MODULE_FILE ${QML_MODULE_FILES} )
- if( NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${QML_MODULE_FILE} )
- configure_file( ${SUBDIRECTORY}/${QML_MODULE_FILE} ${SUBDIRECTORY}/${QML_MODULE_FILE} COPYONLY )
-
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/${QML_MODULE_FILE}
- DESTINATION ${QML_MODULE_DESTINATION} )
+ file(
+ GLOB QML_MODULE_FILES
+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}
+ "${SUBDIRECTORY}/*"
+ )
+ foreach(QML_MODULE_FILE ${QML_MODULE_FILES})
+ if(
+ NOT
+ IS_DIRECTORY
+ ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${QML_MODULE_FILE}
+ )
+ configure_file(
+ ${SUBDIRECTORY}/${QML_MODULE_FILE}
+ ${SUBDIRECTORY}/${QML_MODULE_FILE}
+ COPYONLY
+ )
+
+ install(
+ FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/${QML_MODULE_FILE}
+ DESTINATION ${QML_MODULE_DESTINATION}
+ )
endif()
endforeach()
- message( "-- ${BoldYellow}Configured QML module: ${BoldRed}calamares.${SUBDIRECTORY}${ColorReset}" )
-
+ message(
+ "-- ${BoldYellow}Configured QML module: ${BoldRed}calamares.${SUBDIRECTORY}${ColorReset}"
+ )
endif()
endforeach()
-message( "" )
+message("")