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

This commit is contained in:
Philip Müller 2020-05-01 09:06:10 +02:00
commit d51bf842e1
32 changed files with 761 additions and 604 deletions

View File

@ -6,11 +6,14 @@ website will have to do for older versions.
# 3.2.24 (unreleased) # # 3.2.24 (unreleased) #
This release contains contributions from (alphabetically by first name): This release contains contributions from (alphabetically by first name):
- Bill Auger
- Gaël PORTAY - Gaël PORTAY
- Luna Jernberg
## Core ## ## Core ##
- There is now a bash-completions script for Calamares; turn on - There is now a bash-completions script for Calamares; turn on
the (CMake-time) option INSTALL_COMPLETION to get it. (Thanks Gaël) the (CMake-time) option INSTALL_COMPLETION to get it. (Thanks Gaël)
- The *productWallpaper* setting is documented and works. (Thanks Bill)
## Modules ## ## Modules ##
- No module changes yet - No module changes yet

44
ci/txreduce.py Normal file
View File

@ -0,0 +1,44 @@
#! /usr/bin/env python3
#
# Reduce a translation file -- generally, a Timezone translation -- by
# dropping untranslated strings. An untranslated string is one that
# has an empty translation **and** is marked unfinished.
#
# This is mostly useful to cut down the size of the source file:
# far and away most of the zones are not translated, and it's just a
# handful of places that get special treatment.
from xml.dom.minidom import parse
import sys
valid = True
dom = parse(sys.argv[1])
for n in dom.getElementsByTagName("translation"):
attrs = n.attributes.keys()
drop = True
if "type" not in attrs:
drop = False
elif "type" in attrs and n.attributes["type"].value != "unfinished":
# In the samples I've seen, only "unfinished" is a valid type;
# once something has been translated, the attribute vanishes (see
# the if branch, above).
print("WARNING ''{!s}'' unknown type".format(n.attributes["type"].value))
drop = False
valid = False
else:
t = n.firstChild
if t is None:
# Unfinished and empty
drop = True
else:
drop = bool(t.data)
if drop:
message = n.parentNode
message.parentNode.removeChild(message)
message.unlink()
if valid:
for line in dom.toxml().split("\n"):
if line.strip():
print(line)

View File

@ -1829,27 +1829,27 @@ L'instalador va colar y van perdese tolos cambeos.</translation>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="74"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="74"/>
<source>Communication</source> <source>Communication</source>
<translation type="unfinished"/> <translation>Comunicación</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="75"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="75"/>
<source>Development</source> <source>Development</source>
<translation type="unfinished"/> <translation>Desendolcu</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="76"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="76"/>
<source>Office</source> <source>Office</source>
<translation type="unfinished"/> <translation>Oficina</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="77"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="77"/>
<source>Multimedia</source> <source>Multimedia</source>
<translation type="unfinished"/> <translation>Multimedia</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="78"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="78"/>
<source>Internet</source> <source>Internet</source>
<translation type="unfinished"/> <translation>Internet</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="79"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="79"/>
@ -1864,7 +1864,7 @@ L'instalador va colar y van perdese tolos cambeos.</translation>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="81"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="81"/>
<source>Utilities</source> <source>Utilities</source>
<translation type="unfinished"/> <translation>Utilidaes</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3718,7 +3718,7 @@ Salida:
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="26"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="26"/>
<source>Pick your preferred keyboard model or use the default one based on the detected hardware</source> <source>Pick your preferred keyboard model or use the default one based on the detected hardware</source>
<translation type="unfinished"/> <translation>Escueyi'l modelu que prefieras o usa'l predetermináu según el hardware deteutáu</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="41"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="41"/>
@ -3740,12 +3740,12 @@ Salida:
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="101"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="101"/>
<source>Models</source> <source>Models</source>
<translation type="unfinished"/> <translation>Modelos</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="109"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="109"/>
<source>Variants</source> <source>Variants</source>
<translation type="unfinished"/> <translation>Variantes</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="189"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="189"/>

View File

@ -3666,7 +3666,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="234"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="234"/>
<source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source> <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Ophavsret 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Ophavsret 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Tak til &lt;a href="https://calamares.io/team/"&gt;Calamares-teamet&lt;/a&gt; og &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares-oversætterteamet&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;Udviklingen af &lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; sponsoreres af &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
</message> </message>
</context> </context>
<context> <context>

View File

@ -252,171 +252,171 @@
<context> <context>
<name>Calamares::ViewManager</name> <name>Calamares::ViewManager</name>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="151"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="153"/>
<source>Setup Failed</source> <source>Setup Failed</source>
<translation>Setup Failed</translation> <translation>Setup Failed</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="151"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="153"/>
<source>Installation Failed</source> <source>Installation Failed</source>
<translation>Installation Failed</translation> <translation>Installation Failed</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="152"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="154"/>
<source>Would you like to paste the install log to the web?</source> <source>Would you like to paste the install log to the web?</source>
<translation>Would you like to paste the install log to the web?</translation> <translation>Would you like to paste the install log to the web?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="165"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="167"/>
<source>Error</source> <source>Error</source>
<translation>Error</translation> <translation>Error</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="172"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="174"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="516"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="518"/>
<source>&amp;Yes</source> <source>&amp;Yes</source>
<translation>&amp;Yes</translation> <translation>&amp;Yes</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="173"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="175"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="517"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="519"/>
<source>&amp;No</source> <source>&amp;No</source>
<translation>&amp;No</translation> <translation>&amp;No</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="179"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="181"/>
<source>&amp;Close</source> <source>&amp;Close</source>
<translation>&amp;Close</translation> <translation>&amp;Close</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="190"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="192"/>
<source>Install Log Paste URL</source> <source>Install Log Paste URL</source>
<translation>Install Log Paste URL</translation> <translation>Install Log Paste URL</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="193"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="195"/>
<source>The upload was unsuccessful. No web-paste was done.</source> <source>The upload was unsuccessful. No web-paste was done.</source>
<translation>The upload was unsuccessful. No web-paste was done.</translation> <translation>The upload was unsuccessful. No web-paste was done.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="209"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="211"/>
<source>Calamares Initialization Failed</source> <source>Calamares Initialization Failed</source>
<translation>Calamares Initialization Failed</translation> <translation>Calamares Initialization Failed</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="210"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="212"/>
<source>%1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.</source> <source>%1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.</source>
<translation>%1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.</translation> <translation>%1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="216"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="218"/>
<source>&lt;br/&gt;The following modules could not be loaded:</source> <source>&lt;br/&gt;The following modules could not be loaded:</source>
<translation>&lt;br/&gt;The following modules could not be loaded:</translation> <translation>&lt;br/&gt;The following modules could not be loaded:</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="326"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="328"/>
<source>Continue with setup?</source> <source>Continue with setup?</source>
<translation>Continue with setup?</translation> <translation>Continue with setup?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="326"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="328"/>
<source>Continue with installation?</source> <source>Continue with installation?</source>
<translation>Continue with installation?</translation> <translation>Continue with installation?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="328"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="330"/>
<source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source> <source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
<translation>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</translation> <translation>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="331"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="333"/>
<source>The %1 installer is about to make changes to your disk in order to install %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source> <source>The %1 installer is about to make changes to your disk in order to install %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
<translation>The %1 installer is about to make changes to your disk in order to install %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</translation> <translation>The %1 installer is about to make changes to your disk in order to install %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="334"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="336"/>
<source>&amp;Set up now</source> <source>&amp;Set up now</source>
<translation>&amp;Set up now</translation> <translation>&amp;Set up now</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="334"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="336"/>
<source>&amp;Install now</source> <source>&amp;Install now</source>
<translation>&amp;Install now</translation> <translation>&amp;Install now</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="341"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="343"/>
<source>Go &amp;back</source> <source>Go &amp;back</source>
<translation>Go &amp;back</translation> <translation>Go &amp;back</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="390"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="392"/>
<source>&amp;Set up</source> <source>&amp;Set up</source>
<translation>&amp;Set up</translation> <translation>&amp;Set up</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="390"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="392"/>
<source>&amp;Install</source> <source>&amp;Install</source>
<translation>&amp;Install</translation> <translation>&amp;Install</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="392"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="394"/>
<source>Setup is complete. Close the setup program.</source> <source>Setup is complete. Close the setup program.</source>
<translation>Setup is complete. Close the setup program.</translation> <translation>Setup is complete. Close the setup program.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="393"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="395"/>
<source>The installation is complete. Close the installer.</source> <source>The installation is complete. Close the installer.</source>
<translation>The installation is complete. Close the installer.</translation> <translation>The installation is complete. Close the installer.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="395"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="397"/>
<source>Cancel setup without changing the system.</source> <source>Cancel setup without changing the system.</source>
<translation>Cancel setup without changing the system.</translation> <translation>Cancel setup without changing the system.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="396"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="398"/>
<source>Cancel installation without changing the system.</source> <source>Cancel installation without changing the system.</source>
<translation>Cancel installation without changing the system.</translation> <translation>Cancel installation without changing the system.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="406"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="408"/>
<source>&amp;Next</source> <source>&amp;Next</source>
<translation>&amp;Next</translation> <translation>&amp;Next</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="411"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="413"/>
<source>&amp;Back</source> <source>&amp;Back</source>
<translation>&amp;Back</translation> <translation>&amp;Back</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="417"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="419"/>
<source>&amp;Done</source> <source>&amp;Done</source>
<translation>&amp;Done</translation> <translation>&amp;Done</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="436"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="438"/>
<source>&amp;Cancel</source> <source>&amp;Cancel</source>
<translation>&amp;Cancel</translation> <translation>&amp;Cancel</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="509"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="511"/>
<source>Cancel setup?</source> <source>Cancel setup?</source>
<translation>Cancel setup?</translation> <translation>Cancel setup?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="509"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="511"/>
<source>Cancel installation?</source> <source>Cancel installation?</source>
<translation>Cancel installation?</translation> <translation>Cancel installation?</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="510"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="512"/>
<source>Do you really want to cancel the current setup process? <source>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</source> The setup program will quit and all changes will be lost.</source>
<translation>Do you really want to cancel the current setup process? <translation>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</translation> The setup program will quit and all changes will be lost.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="512"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="514"/>
<source>Do you really want to cancel the current install process? <source>Do you really want to cancel the current install process?
The installer will quit and all changes will be lost.</source> The installer will quit and all changes will be lost.</source>
<translation>Do you really want to cancel the current install process? <translation>Do you really want to cancel the current install process?
@ -479,12 +479,12 @@ The installer will quit and all changes will be lost.</translation>
<translation>&amp;Cancel</translation> <translation>&amp;Cancel</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="286"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="281"/>
<source>%1 Setup Program</source> <source>%1 Setup Program</source>
<translation>%1 Setup Program</translation> <translation>%1 Setup Program</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="287"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="282"/>
<source>%1 Installer</source> <source>%1 Installer</source>
<translation>%1 Installer</translation> <translation>%1 Installer</translation>
</message> </message>
@ -770,22 +770,22 @@ The installer will quit and all changes will be lost.</translation>
<translation>This program will ask you some questions and set up %2 on your computer.</translation> <translation>This program will ask you some questions and set up %2 on your computer.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/Config.cpp" line="254"/> <location filename="../src/modules/welcome/Config.cpp" line="230"/>
<source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source>
<translation>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</translation> <translation>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/Config.cpp" line="255"/> <location filename="../src/modules/welcome/Config.cpp" line="231"/>
<source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source>
<translation>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</translation> <translation>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/Config.cpp" line="260"/> <location filename="../src/modules/welcome/Config.cpp" line="236"/>
<source>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</source>
<translation>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</translation> <translation>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/Config.cpp" line="261"/> <location filename="../src/modules/welcome/Config.cpp" line="237"/>
<source>&lt;h1&gt;Welcome to the %1 installer.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to the %1 installer.&lt;/h1&gt;</source>
<translation>&lt;h1&gt;Welcome to the %1 installer.&lt;/h1&gt;</translation> <translation>&lt;h1&gt;Welcome to the %1 installer.&lt;/h1&gt;</translation>
</message> </message>
@ -1668,33 +1668,33 @@ The installer will quit and all changes will be lost.</translation>
<context> <context>
<name>LocalePage</name> <name>LocalePage</name>
<message> <message>
<location filename="../src/modules/locale/LocalePage.cpp" line="125"/> <location filename="../src/modules/locale/LocalePage.cpp" line="127"/>
<source>Region:</source> <source>Region:</source>
<translation>Region:</translation> <translation>Region:</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/locale/LocalePage.cpp" line="126"/> <location filename="../src/modules/locale/LocalePage.cpp" line="128"/>
<source>Zone:</source> <source>Zone:</source>
<translation>Zone:</translation> <translation>Zone:</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/locale/LocalePage.cpp" line="127"/> <location filename="../src/modules/locale/LocalePage.cpp" line="129"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="128"/> <location filename="../src/modules/locale/LocalePage.cpp" line="130"/>
<source>&amp;Change...</source> <source>&amp;Change...</source>
<translation>&amp;Change...</translation> <translation>&amp;Change...</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/locale/LocalePage.cpp" line="260"/> <location filename="../src/modules/locale/LocalePage.cpp" line="262"/>
<source>The system language will be set to %1.</source> <source>The system language will be set to %1.</source>
<translation>The system language will be set to %1.</translation> <translation>The system language will be set to %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/locale/LocalePage.cpp" line="261"/> <location filename="../src/modules/locale/LocalePage.cpp" line="263"/>
<source>The numbers and dates locale will be set to %1.</source> <source>The numbers and dates locale will be set to %1.</source>
<translation>The numbers and dates locale will be set to %1.</translation> <translation>The numbers and dates locale will be set to %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/locale/LocalePage.cpp" line="268"/> <location filename="../src/modules/locale/LocalePage.cpp" line="270"/>
<source>Set timezone to %1/%2.&lt;br/&gt;</source> <source>Set timezone to %1/%2.&lt;br/&gt;</source>
<translation>Set timezone to %1/%2.&lt;br/&gt;</translation> <translation>Set timezone to %1/%2.&lt;br/&gt;</translation>
</message> </message>
@ -1710,7 +1710,7 @@ The installer will quit and all changes will be lost.</translation>
<context> <context>
<name>LocaleViewStep</name> <name>LocaleViewStep</name>
<message> <message>
<location filename="../src/modules/locale/LocaleViewStep.cpp" line="98"/> <location filename="../src/modules/locale/LocaleViewStep.cpp" line="100"/>
<source>Location</source> <source>Location</source>
<translation>Location</translation> <translation>Location</translation>
</message> </message>
@ -2549,52 +2549,52 @@ The installer will quit and all changes will be lost.</translation>
<translation>After:</translation> <translation>After:</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="426"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="432"/>
<source>No EFI system partition configured</source> <source>No EFI system partition configured</source>
<translation>No EFI system partition configured</translation> <translation>No EFI system partition configured</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="427"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="433"/>
<source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;To configure an EFI system partition, go back and select or create a FAT32 filesystem with the &lt;strong&gt;esp&lt;/strong&gt; flag enabled and mount point &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt;You can continue without setting up an EFI system partition but your system may fail to start.</source> <source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;To configure an EFI system partition, go back and select or create a FAT32 filesystem with the &lt;strong&gt;%3&lt;/strong&gt; flag enabled and mount point &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt;You can continue without setting up an EFI system partition but your system may fail to start.</source>
<translation>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;To configure an EFI system partition, go back and select or create a FAT32 filesystem with the &lt;strong&gt;esp&lt;/strong&gt; flag enabled and mount point &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt;You can continue without setting up an EFI system partition but your system may fail to start.</translation> <translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="440"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="447"/>
<source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;A partition was configured with mount point &lt;strong&gt;%2&lt;/strong&gt; but its &lt;strong&gt;%3&lt;/strong&gt; flag is not set.&lt;br/&gt;To set the flag, go back and edit the partition.&lt;br/&gt;&lt;br/&gt;You can continue without setting the flag but your system may fail to start.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="446"/>
<source>EFI system partition flag not set</source> <source>EFI system partition flag not set</source>
<translation>EFI system partition flag not set</translation> <translation>EFI system partition flag not set</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="441"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="473"/>
<source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;A partition was configured with mount point &lt;strong&gt;%2&lt;/strong&gt; but its &lt;strong&gt;esp&lt;/strong&gt; flag is not set.&lt;br/&gt;To set the flag, go back and edit the partition.&lt;br/&gt;&lt;br/&gt;You can continue without setting the flag but your system may fail to start.</source>
<translation>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;A partition was configured with mount point &lt;strong&gt;%2&lt;/strong&gt; but its &lt;strong&gt;esp&lt;/strong&gt; flag is not set.&lt;br/&gt;To set the flag, go back and edit the partition.&lt;br/&gt;&lt;br/&gt;You can continue without setting the flag but your system may fail to start.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="467"/>
<source>Option to use GPT on BIOS</source> <source>Option to use GPT on BIOS</source>
<translation>Option to use GPT on BIOS</translation> <translation>Option to use GPT on BIOS</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="468"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="474"/>
<source>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.&lt;br/&gt;&lt;br/&gt;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 &lt;strong&gt;bios_grub&lt;/strong&gt; flag enabled.&lt;br/&gt;&lt;br/&gt;An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</source> <source>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.&lt;br/&gt;&lt;br/&gt;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 &lt;strong&gt;bios_grub&lt;/strong&gt; flag enabled.&lt;br/&gt;&lt;br/&gt;An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</source>
<translation>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.&lt;br/&gt;&lt;br/&gt;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 &lt;strong&gt;bios_grub&lt;/strong&gt; flag enabled.&lt;br/&gt;&lt;br/&gt;An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</translation> <translation>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.&lt;br/&gt;&lt;br/&gt;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 &lt;strong&gt;bios_grub&lt;/strong&gt; flag enabled.&lt;br/&gt;&lt;br/&gt;An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="496"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="502"/>
<source>Boot partition not encrypted</source> <source>Boot partition not encrypted</source>
<translation>Boot partition not encrypted</translation> <translation>Boot partition not encrypted</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="497"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="503"/>
<source>A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.&lt;br/&gt;&lt;br/&gt;There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.&lt;br/&gt;You may continue if you wish, but filesystem unlocking will happen later during system startup.&lt;br/&gt;To encrypt the boot partition, go back and recreate it, selecting &lt;strong&gt;Encrypt&lt;/strong&gt; in the partition creation window.</source> <source>A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.&lt;br/&gt;&lt;br/&gt;There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.&lt;br/&gt;You may continue if you wish, but filesystem unlocking will happen later during system startup.&lt;br/&gt;To encrypt the boot partition, go back and recreate it, selecting &lt;strong&gt;Encrypt&lt;/strong&gt; in the partition creation window.</source>
<translation>A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.&lt;br/&gt;&lt;br/&gt;There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.&lt;br/&gt;You may continue if you wish, but filesystem unlocking will happen later during system startup.&lt;br/&gt;To encrypt the boot partition, go back and recreate it, selecting &lt;strong&gt;Encrypt&lt;/strong&gt; in the partition creation window.</translation> <translation>A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.&lt;br/&gt;&lt;br/&gt;There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.&lt;br/&gt;You may continue if you wish, but filesystem unlocking will happen later during system startup.&lt;br/&gt;To encrypt the boot partition, go back and recreate it, selecting &lt;strong&gt;Encrypt&lt;/strong&gt; in the partition creation window.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="708"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="720"/>
<source>has at least one disk device available.</source> <source>has at least one disk device available.</source>
<translation>has at least one disk device available.</translation> <translation>has at least one disk device available.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="709"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="721"/>
<source>There are no partitions to install on.</source> <source>There are no partitions to install on.</source>
<translation>There are no partitions to install on.</translation> <translation>There are no partitions to install on.</translation>
</message> </message>
@ -3578,93 +3578,93 @@ Output:
<translation>Form</translation> <translation>Form</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="69"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="75"/>
<location filename="../src/modules/welcome/WelcomePage.ui" line="82"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="94"/>
<source>Select application and system language</source> <source>Select application and system language</source>
<translation>Select application and system language</translation> <translation>Select application and system language</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="130"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="136"/>
<source>&amp;About</source> <source>&amp;About</source>
<translation>&amp;About</translation> <translation>&amp;About</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="140"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="146"/>
<source>Open donations website</source> <source>Open donations website</source>
<translation>Open donations website</translation> <translation>Open donations website</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="143"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="149"/>
<source>&amp;Donate</source> <source>&amp;Donate</source>
<translation>&amp;Donate</translation> <translation>&amp;Donate</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="153"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="159"/>
<source>Open help and support website</source> <source>Open help and support website</source>
<translation>Open help and support website</translation> <translation>Open help and support website</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="156"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="162"/>
<source>&amp;Support</source> <source>&amp;Support</source>
<translation>&amp;Support</translation> <translation>&amp;Support</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="166"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="172"/>
<source>Open issues and bug-tracking website</source> <source>Open issues and bug-tracking website</source>
<translation>Open issues and bug-tracking website</translation> <translation>Open issues and bug-tracking website</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="169"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="175"/>
<source>&amp;Known issues</source> <source>&amp;Known issues</source>
<translation>&amp;Known issues</translation> <translation>&amp;Known issues</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="179"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="185"/>
<source>Open release notes website</source> <source>Open release notes website</source>
<translation>Open release notes website</translation> <translation>Open release notes website</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="182"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="188"/>
<source>&amp;Release notes</source> <source>&amp;Release notes</source>
<translation>&amp;Release notes</translation> <translation>&amp;Release notes</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="228"/>
<source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source>
<translation>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</translation> <translation>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="213"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="229"/>
<source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source>
<translation>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</translation> <translation>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="218"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="234"/>
<source>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</source>
<translation>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</translation> <translation>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="219"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="235"/>
<source>&lt;h1&gt;Welcome to the %1 installer.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to the %1 installer.&lt;/h1&gt;</source>
<translation>&lt;h1&gt;Welcome to the %1 installer.&lt;/h1&gt;</translation> <translation>&lt;h1&gt;Welcome to the %1 installer.&lt;/h1&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="224"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="240"/>
<source>%1 support</source> <source>%1 support</source>
<translation>%1 support</translation> <translation>%1 support</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="231"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="247"/>
<source>About %1 setup</source> <source>About %1 setup</source>
<translation>About %1 setup</translation> <translation>About %1 setup</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="231"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="247"/>
<source>About %1 installer</source> <source>About %1 installer</source>
<translation>About %1 installer</translation> <translation>About %1 installer</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="234"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="250"/>
<source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source> <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
<translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation> <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
</message> </message>
@ -3776,34 +3776,68 @@ Output:
</message> </message>
</context> </context>
<context> <context>
<name>welcomeq</name> <name>release_notes</name>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="43"/> <location filename="../src/modules/welcomeq/release_notes.qml" line="54"/>
<source>&lt;h3&gt;Welcome to the %1 &lt;quote&gt;%2&lt;/quote&gt; installer&lt;/h3&gt;</source> <source>&lt;h3&gt;%1&lt;/h3&gt;
<translation>&lt;h3&gt;Welcome to the %1 &lt;quote&gt;%2&lt;/quote&gt; installer&lt;/h3&gt;</translation> &lt;p&gt;This an example QML file, showing options in RichText with Flickable content.&lt;/p&gt;
&lt;p&gt;QML with RichText can use HTML tags, Flickable content is useful for touchscreens.&lt;/p&gt;
&lt;p&gt;&lt;b&gt;This is bold text&lt;/b&gt;&lt;/p&gt;
&lt;p&gt;&lt;i&gt;This is italic text&lt;/i&gt;&lt;/p&gt;
&lt;p&gt;&lt;u&gt;This is underlined text&lt;/u&gt;&lt;/p&gt;
&lt;p&gt;&lt;center&gt;This text will be center-aligned.&lt;/center&gt;&lt;/p&gt;
&lt;p&gt;&lt;s&gt;This is strikethrough&lt;/s&gt;&lt;/p&gt;
&lt;p&gt;Code example:
&lt;code&gt;ls -l /home&lt;/code&gt;&lt;/p&gt;
&lt;p&gt;&lt;b&gt;Lists:&lt;/b&gt;&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Intel CPU systems&lt;/li&gt;
&lt;li&gt;AMD CPU systems&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;The vertical scrollbar is adjustable, current width set to 10.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="75"/> <location filename="../src/modules/welcomeq/release_notes.qml" line="85"/>
<source>Back</source>
<translation type="unfinished">Back</translation>
</message>
</context>
<context>
<name>welcomeq</name>
<message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="44"/>
<source>&lt;h3&gt;Welcome to the %1 &lt;quote&gt;%2&lt;/quote&gt; installer&lt;/h3&gt;
&lt;p&gt;This program will ask you some questions and set up %1 on your computer.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="71"/>
<source>About</source> <source>About</source>
<translation>About</translation> <translation>About</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="89"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="85"/>
<source>Support</source> <source>Support</source>
<translation>Support</translation> <translation>Support</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="96"/>
<source>Known issues</source> <source>Known issues</source>
<translation>Known issues</translation> <translation>Known issues</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="111"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="107"/>
<source>Release notes</source> <source>Release notes</source>
<translation>Release notes</translation> <translation>Release notes</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="122"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="119"/>
<source>Donate</source> <source>Donate</source>
<translation>Donate</translation> <translation>Donate</translation>
</message> </message>

View File

@ -811,7 +811,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="48"/> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="48"/>
<source> MiB</source> <source> MiB</source>
<translation type="unfinished"/> <translation> MiB</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="55"/> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="55"/>
@ -3542,7 +3542,7 @@ Output:
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/>
<source> MiB</source> <source> MiB</source>
<translation type="unfinished"/> <translation> MiB</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="82"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="82"/>

View File

@ -3668,7 +3668,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</tra
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="234"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="234"/>
<source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source> <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;- %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Kiitokset &lt;a href="https://calamares.io/team/"&gt;Calamares-tiimille&lt;/a&gt; ja &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares kääntäjille&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamaresin&lt;/a&gt; kehitystä sponsoroi &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
</message> </message>
</context> </context>
<context> <context>

View File

@ -412,14 +412,14 @@
<location filename="../src/libcalamaresui/ViewManager.cpp" line="510"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="510"/>
<source>Do you really want to cancel the current setup process? <source>Do you really want to cancel the current setup process?
The setup program will quit and all changes will be lost.</source> The setup program will quit and all changes will be lost.</source>
<translation>Voulez-vous réellement abandonner le processus de configuration ? <translation>Voulez-vous vraiment abandonner le processus de configuration ?
Le programme de configuration se fermera et les changements seront perdus.</translation> Le programme de configuration se fermera et les changements seront perdus.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="512"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="512"/>
<source>Do you really want to cancel the current install process? <source>Do you really want to cancel the current install process?
The installer will quit and all changes will be lost.</source> The installer will quit and all changes will be lost.</source>
<translation>Voulez-vous réellement abandonner le processus d'installation ? <translation>Voulez-vous vraiment abandonner le processus d'installation ?
L'installateur se fermera et les changements seront perdus.</translation> L'installateur se fermera et les changements seront perdus.</translation>
</message> </message>
</context> </context>
@ -782,7 +782,7 @@ L'installateur se fermera et les changements seront perdus.</translation>
<message> <message>
<location filename="../src/modules/welcome/Config.cpp" line="260"/> <location filename="../src/modules/welcome/Config.cpp" line="260"/>
<source>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</source> <source>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</source>
<translation>Bien dans l'installateur Calamares pour %1.</translation> <translation>Bienvenue dans l'installateur Calamares pour %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/Config.cpp" line="261"/> <location filename="../src/modules/welcome/Config.cpp" line="261"/>
@ -3769,7 +3769,7 @@ Sortie
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="43"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="43"/>
<source>&lt;h3&gt;Welcome to the %1 &lt;quote&gt;%2&lt;/quote&gt; installer&lt;/h3&gt;</source> <source>&lt;h3&gt;Welcome to the %1 &lt;quote&gt;%2&lt;/quote&gt; installer&lt;/h3&gt;</source>
<translation type="unfinished"/> <translation>&lt;h3&gt;Bienvenue dans l'installateur de %1 &lt;quote&gt;%2&lt;/quote&gt;&lt;/h3&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="75"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="75"/>

View File

@ -3665,7 +3665,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="234"/> <location filename="../src/modules/welcome/WelcomePage.cpp" line="234"/>
<source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source> <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
<translation type="unfinished"/> <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;per %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Grazie al &lt;a href="https://calamares.io/team/"&gt;Team di Calamares &lt;/a&gt; ed al &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;team dei traduttori di Calamares&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;Lo sviluppo di &lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; è sponsorizzato da &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
</message> </message>
</context> </context>
<context> <context>

View File

@ -525,7 +525,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="334"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="334"/>
<source>&lt;strong&gt;Manual partitioning&lt;/strong&gt;&lt;br/&gt;You can create or resize partitions yourself. Having a GPT partition table and &lt;strong&gt;fat32 512Mb /boot partition is a must for UEFI installs&lt;/strong&gt;, either use an existing without formatting or create one.</source> <source>&lt;strong&gt;Manual partitioning&lt;/strong&gt;&lt;br/&gt;You can create or resize partitions yourself. Having a GPT partition table and &lt;strong&gt;fat32 512Mb /boot partition is a must for UEFI installs&lt;/strong&gt;, either use an existing without formatting or create one.</source>
<translation type="unfinished"/> <translation>&lt;strong&gt;Particionamento manual&lt;/strong&gt;&lt;br/&gt; Pode criar ou redimensionar partições. Ter uma tabela de partições GPT e &lt;strong&gt;uma partição de arranque "/boot" de fat32 512Mb é um requisito obrigatório para as instalações UEFI&lt;/strong&gt;, ou utilizar uma existente sem formatação ou então criar uma.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="833"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="833"/>
@ -540,7 +540,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="973"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="973"/>
<source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source> <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source>
<translation type="unfinished"/> <translation>%1 será encolhida para %2MiB e uma nova %3MiB partição será criada para %4.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1030"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1030"/>
@ -727,7 +727,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message> <message>
<location filename="../src/modules/netinstall/Config.cpp" line="47"/> <location filename="../src/modules/netinstall/Config.cpp" line="47"/>
<source>Network Installation. (Disabled: Incorrect configuration)</source> <source>Network Installation. (Disabled: Incorrect configuration)</source>
<translation type="unfinished"/> <translation>Instalação de rede. (Desativada: Configuração incorreta)</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/Config.cpp" line="49"/> <location filename="../src/modules/netinstall/Config.cpp" line="49"/>
@ -737,17 +737,17 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message> <message>
<location filename="../src/modules/netinstall/Config.cpp" line="51"/> <location filename="../src/modules/netinstall/Config.cpp" line="51"/>
<source>Network Installation. (Disabled: internal error)</source> <source>Network Installation. (Disabled: internal error)</source>
<translation type="unfinished"/> <translation>Instalação de rede. (Desativada: erro interno)</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/Config.cpp" line="53"/> <location filename="../src/modules/netinstall/Config.cpp" line="53"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source> <source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation>Instalaçao de Rede. (Desativada: Incapaz de buscar listas de pacotes, verifique a sua ligação de rede)</translation> <translation>Instalação de rede. (Desativada: Incapaz de buscar listas de pacotes, verifique a sua ligação de rede)</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/Config.cpp" line="54"/> <location filename="../src/modules/welcome/Config.cpp" line="54"/>
<source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source> <source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source>
<translation type="unfinished"/> <translation>Este computador não satisfaz os requisitos mínimos para configurar %1.&lt;br/&gt;A configuração não pode continuar. &lt;a href="#details"&gt;Detalhes...&lt;/a&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/Config.cpp" line="58"/> <location filename="../src/modules/welcome/Config.cpp" line="58"/>
@ -757,7 +757,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message> <message>
<location filename="../src/modules/welcome/Config.cpp" line="65"/> <location filename="../src/modules/welcome/Config.cpp" line="65"/>
<source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source> <source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source>
<translation type="unfinished"/> <translation>Este computador não satisfaz alguns dos requisitos recomendados para configurar %1.&lt;br/&gt;A configuração pode continuar, mas algumas funcionalidades podem ser desativadas.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/Config.cpp" line="69"/> <location filename="../src/modules/welcome/Config.cpp" line="69"/>
@ -1358,22 +1358,22 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="126"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="126"/>
<source>has at least %1 GiB available drive space</source> <source>has at least %1 GiB available drive space</source>
<translation type="unfinished"/> <translation>tem pelo menos %1 GiB de espaço livre em disco</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="128"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="128"/>
<source>There is not enough drive space. At least %1 GiB is required.</source> <source>There is not enough drive space. At least %1 GiB is required.</source>
<translation type="unfinished"/> <translation>Não existe espaço livre suficiente em disco. É necessário pelo menos %1 GiB. </translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="137"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="137"/>
<source>has at least %1 GiB working memory</source> <source>has at least %1 GiB working memory</source>
<translation type="unfinished"/> <translation>tem pelo menos %1 GiB de memória disponível</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="139"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="139"/>
<source>The system does not have enough working memory. At least %1 GiB is required.</source> <source>The system does not have enough working memory. At least %1 GiB is required.</source>
<translation type="unfinished"/> <translation>O sistema não tem memória disponível suficiente. É necessário pelo menos %1 GiB.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="148"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="148"/>
@ -1398,7 +1398,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="164"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="164"/>
<source>is running the installer as an administrator (root)</source> <source>is running the installer as an administrator (root)</source>
<translation type="unfinished"/> <translation>está a executar o instalador como um administrador (root)</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="167"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="167"/>
@ -1408,7 +1408,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="168"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="168"/>
<source>The installer is not running with administrator rights.</source> <source>The installer is not running with administrator rights.</source>
<translation>O instalador não está a correr com permissões de administrador.</translation> <translation>O instalador não está a ser executado com permissões de administrador.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="176"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="176"/>
@ -1820,7 +1820,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="72"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="72"/>
<source>Desktop</source> <source>Desktop</source>
<translation type="unfinished"/> <translation>Ambiente de trabalho</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="73"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="73"/>
@ -3047,7 +3047,7 @@ Saída de Dados:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="261"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="261"/>
<source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source> <source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source>
<translation type="unfinished"/> <translation>Este computador não satisfaz os requisitos mínimos para configurar %1.&lt;br/&gt;A configuração não pode continuar. &lt;a href="#details"&gt;Detalhes...&lt;/a&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="265"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="265"/>
@ -3057,7 +3057,7 @@ Saída de Dados:
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="272"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="272"/>
<source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source> <source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source>
<translation type="unfinished"/> <translation>Este computador não satisfaz alguns dos requisitos recomendados para configurar %1.&lt;br/&gt;A configuração pode continuar, mas algumas funcionalidades podem ser desativadas.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="276"/> <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="276"/>

View File

@ -106,7 +106,7 @@
<message> <message>
<location filename="../src/calamares/DebugWindow.ui" line="113"/> <location filename="../src/calamares/DebugWindow.ui" line="113"/>
<source>Widget Tree</source> <source>Widget Tree</source>
<translation type="unfinished"/> <translation>Дерево виджетов</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/DebugWindow.cpp" line="231"/> <location filename="../src/calamares/DebugWindow.cpp" line="231"/>
@ -119,7 +119,7 @@
<message> <message>
<location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="92"/> <location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="92"/>
<source>Set up</source> <source>Set up</source>
<translation type="unfinished"/> <translation>Настроить</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="92"/> <location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="92"/>
@ -132,12 +132,12 @@
<message> <message>
<location filename="../src/libcalamares/JobExample.cpp" line="39"/> <location filename="../src/libcalamares/JobExample.cpp" line="39"/>
<source>Job failed (%1)</source> <source>Job failed (%1)</source>
<translation>Задание не успешно (%1)</translation> <translation>Не удалось выполнить задание (%1)</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/JobExample.cpp" line="40"/> <location filename="../src/libcalamares/JobExample.cpp" line="40"/>
<source>Programmed job failure was explicitly requested.</source> <source>Programmed job failure was explicitly requested.</source>
<translation type="unfinished"/> <translation>Работа программы была прекращена пользователем.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -153,7 +153,7 @@
<message> <message>
<location filename="../src/libcalamares/JobExample.cpp" line="27"/> <location filename="../src/libcalamares/JobExample.cpp" line="27"/>
<source>Example job (%1)</source> <source>Example job (%1)</source>
<translation type="unfinished"/> <translation>Пример задания (%1)</translation>
</message> </message>
</context> </context>
<context> <context>
@ -161,12 +161,12 @@
<message> <message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="52"/> <location filename="../src/libcalamares/ProcessJob.cpp" line="52"/>
<source>Run command '%1' in target system.</source> <source>Run command '%1' in target system.</source>
<translation type="unfinished"/> <translation>Запустить комманду'%1'в целевой системе.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="52"/> <location filename="../src/libcalamares/ProcessJob.cpp" line="52"/>
<source> Run command '%1'.</source> <source> Run command '%1'.</source>
<translation type="unfinished"/> <translation> Запустить команду '%1'.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="59"/> <location filename="../src/libcalamares/ProcessJob.cpp" line="59"/>
@ -212,7 +212,7 @@
<message> <message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="76"/> <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="76"/>
<source>Loading ...</source> <source>Loading ...</source>
<translation type="unfinished"/> <translation>Загрузка...</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="97"/> <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="97"/>
@ -222,7 +222,7 @@
<message> <message>
<location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="261"/> <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="261"/>
<source>Loading failed.</source> <source>Loading failed.</source>
<translation type="unfinished"/> <translation>Загрузка не удалась.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -230,21 +230,21 @@
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="164"/> <location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="164"/>
<source>Waiting for %n module(s).</source> <source>Waiting for %n module(s).</source>
<translation type="unfinished"> <translation>
<numerusform/> <numerusform>Ожидание %n модуля.</numerusform>
<numerusform/> <numerusform>Ожидание %n модулей.</numerusform>
<numerusform/> <numerusform>Ожидание %n модулей.</numerusform>
<numerusform/> <numerusform>Ожидание %n модуля(модулей).</numerusform>
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="165"/> <location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="165"/>
<source>(%n second(s))</source> <source>(%n second(s))</source>
<translation type="unfinished"> <translation>
<numerusform/> <numerusform>(% секунда)</numerusform>
<numerusform/> <numerusform>(% секунд)</numerusform>
<numerusform/> <numerusform>(% секунд)</numerusform>
<numerusform/> <numerusform>(% секунд)</numerusform>
</translation> </translation>
</message> </message>
<message> <message>
@ -300,7 +300,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="193"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="193"/>
<source>The upload was unsuccessful. No web-paste was done.</source> <source>The upload was unsuccessful. No web-paste was done.</source>
<translation type="unfinished"/> <translation>Загрузка не удалась. Веб-вставка не была завершена.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="209"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="209"/>
@ -340,7 +340,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="334"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="334"/>
<source>&amp;Set up now</source> <source>&amp;Set up now</source>
<translation type="unfinished"/> <translation>&amp;Настроить сейчас</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="334"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="334"/>
@ -355,7 +355,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="390"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="390"/>
<source>&amp;Set up</source> <source>&amp;Set up</source>
<translation type="unfinished"/> <translation>&amp;Настроить</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="390"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="390"/>
@ -370,7 +370,7 @@
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="393"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="393"/>
<source>The installation is complete. Close the installer.</source> <source>The installation is complete. Close the installer.</source>
<translation>Установка завершена. Закройте установщик. </translation> <translation>Установка завершена. Закройте установщик.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="395"/> <location filename="../src/libcalamaresui/ViewManager.cpp" line="395"/>
@ -455,7 +455,8 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/libcalamaresui/utils/Paste.cpp" line="34"/> <location filename="../src/libcalamaresui/utils/Paste.cpp" line="34"/>
<source>Install log posted to: <source>Install log posted to:
%1</source> %1</source>
<translation type="unfinished"/> <translation>Установочный журнал размещён на:
n%1</translation>
</message> </message>
</context> </context>
<context> <context>
@ -478,7 +479,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="197"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="197"/>
<source>&amp;Cancel</source> <source>&amp;Cancel</source>
<translation>О&amp;тмена</translation> <translation>&amp;Отмена</translation>
</message> </message>
<message> <message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="286"/> <location filename="../src/calamares/CalamaresWindow.cpp" line="286"/>
@ -527,7 +528,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="334"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="334"/>
<source>&lt;strong&gt;Manual partitioning&lt;/strong&gt;&lt;br/&gt;You can create or resize partitions yourself. Having a GPT partition table and &lt;strong&gt;fat32 512Mb /boot partition is a must for UEFI installs&lt;/strong&gt;, either use an existing without formatting or create one.</source> <source>&lt;strong&gt;Manual partitioning&lt;/strong&gt;&lt;br/&gt;You can create or resize partitions yourself. Having a GPT partition table and &lt;strong&gt;fat32 512Mb /boot partition is a must for UEFI installs&lt;/strong&gt;, either use an existing without formatting or create one.</source>
<translation type="unfinished"/> <translation>&lt;strong&gt;Ручная разметка&lt;/strong&gt;&lt;br/&gt;Вы можете создавать или изменять размеры разделов самостоятельно. Наличие таблицы разделов GPT и &lt;strong&gt;fat32 512Mb /boot раздела является обязательным для систем с UEFI&lt;/strong&gt;, либо используйте существующий без форматирования, либо создайте его.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="833"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="833"/>
@ -626,17 +627,17 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1515"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1515"/>
<source>Swap (no Hibernate)</source> <source>Swap (no Hibernate)</source>
<translation type="unfinished"/> <translation>Swap (без Гибернации)</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1518"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1518"/>
<source>Swap (with Hibernate)</source> <source>Swap (with Hibernate)</source>
<translation type="unfinished"/> <translation>Swap (с Гибернацией)</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1521"/> <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1521"/>
<source>Swap to file</source> <source>Swap to file</source>
<translation type="unfinished"/> <translation>Файл подкачки</translation>
</message> </message>
</context> </context>
<context> <context>
@ -729,7 +730,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/netinstall/Config.cpp" line="47"/> <location filename="../src/modules/netinstall/Config.cpp" line="47"/>
<source>Network Installation. (Disabled: Incorrect configuration)</source> <source>Network Installation. (Disabled: Incorrect configuration)</source>
<translation type="unfinished"/> <translation>Сетевая установка. (Отключено: неверная конфигурация)</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/Config.cpp" line="49"/> <location filename="../src/modules/netinstall/Config.cpp" line="49"/>
@ -739,7 +740,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/netinstall/Config.cpp" line="51"/> <location filename="../src/modules/netinstall/Config.cpp" line="51"/>
<source>Network Installation. (Disabled: internal error)</source> <source>Network Installation. (Disabled: internal error)</source>
<translation type="unfinished"/> <translation>Сетевая установка. (Отключено: внутренняя ошибка)</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/Config.cpp" line="53"/> <location filename="../src/modules/netinstall/Config.cpp" line="53"/>
@ -797,7 +798,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/contextualprocess/ContextualProcessJob.cpp" line="128"/> <location filename="../src/modules/contextualprocess/ContextualProcessJob.cpp" line="128"/>
<source>Contextual Processes Job</source> <source>Contextual Processes Job</source>
<translation type="unfinished"/> <translation>Работа с контекстными процессами</translation>
</message> </message>
</context> </context>
<context> <context>
@ -815,7 +816,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="48"/> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="48"/>
<source> MiB</source> <source> MiB</source>
<translation>МиБ</translation> <translation> МиБ</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="55"/> <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="55"/>
@ -855,7 +856,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="74"/> <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="74"/>
<source>En&amp;crypt</source> <source>En&amp;crypt</source>
<translation>Ши&amp;фровать</translation> <translation>&amp;Шифровать</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="159"/> <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="159"/>
@ -883,12 +884,12 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="47"/> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="47"/>
<source>Create new %2MiB partition on %4 (%3) with file system %1.</source> <source>Create new %2MiB partition on %4 (%3) with file system %1.</source>
<translation>Создать новый раздел %2 MB на %4 (%3) с файловой системой %1.</translation> <translation>Создать новый раздел %2 MiB на %4 (%3) с файловой системой %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="58"/> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="58"/>
<source>Create new &lt;strong&gt;%2MiB&lt;/strong&gt; partition on &lt;strong&gt;%4&lt;/strong&gt; (%3) with file system &lt;strong&gt;%1&lt;/strong&gt;.</source> <source>Create new &lt;strong&gt;%2MiB&lt;/strong&gt; partition on &lt;strong&gt;%4&lt;/strong&gt; (%3) with file system &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation>Создать новый раздел &lt;strong&gt;%2 MB&lt;/strong&gt; на &lt;strong&gt;%4&lt;/strong&gt; (%3) с файловой системой &lt;strong&gt;%1&lt;/strong&gt;.</translation> <translation>Создать новый раздел &lt;strong&gt;%2 MiB&lt;/strong&gt; на &lt;strong&gt;%4&lt;/strong&gt; (%3) с файловой системой &lt;strong&gt;%1&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="70"/> <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="70"/>
@ -1003,17 +1004,17 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="37"/> <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="37"/>
<source>Create new volume group named %1.</source> <source>Create new volume group named %1.</source>
<translation>Создать новую группу томов на диске %1</translation> <translation>Создать новую группу томов на диске %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="43"/> <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="43"/>
<source>Create new volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source> <source>Create new volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation>Создать новую группу томов на диске %1</translation> <translation>Создать новую группу томов на диске %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="49"/> <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="49"/>
<source>Creating new volume group named %1.</source> <source>Creating new volume group named %1.</source>
<translation>Cоздание новой группы томов на диске %1</translation> <translation>Создание новой группы томов на диске %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="61"/> <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="61"/>
@ -1027,17 +1028,17 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="33"/> <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="33"/>
<location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="45"/> <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="45"/>
<source>Deactivate volume group named %1.</source> <source>Deactivate volume group named %1.</source>
<translation type="unfinished"/> <translation>Отключить группу томов на диске %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="39"/> <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="39"/>
<source>Deactivate volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source> <source>Deactivate volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation type="unfinished"/> <translation>Отключить группу томов на диске &lt;strong&gt;%1&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="57"/> <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="57"/>
<source>The installer failed to deactivate a volume group named %1.</source> <source>The installer failed to deactivate a volume group named %1.</source>
<translation type="unfinished"/> <translation>Программа установки не смогла деактивировать группу томов на диске %1.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1177,7 +1178,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="129"/> <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="129"/>
<source> MiB</source> <source> MiB</source>
<translation>МиБ</translation> <translation> МиБ</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="136"/> <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="136"/>
@ -1337,7 +1338,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="45"/> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="45"/>
<source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source> <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source>
<translation>Форматировать раздел %1 (файловая система: %2, размер: %3 МБ) на %4.</translation> <translation>Форматировать раздел %1 (файловая система: %2, размер: %3 МиБ) на %4.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="56"/> <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="56"/>
@ -1400,7 +1401,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="164"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="164"/>
<source>is running the installer as an administrator (root)</source> <source>is running the installer as an administrator (root)</source>
<translation type="unfinished"/> <translation>запуск установщика с правами администратора (root)</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="167"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="167"/>
@ -1415,7 +1416,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="176"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="176"/>
<source>has a screen large enough to show the whole installer</source> <source>has a screen large enough to show the whole installer</source>
<translation type="unfinished"/> <translation>экран достаточно большой, чтобы показать установщик полностью</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="179"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="179"/>
@ -1425,7 +1426,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="180"/> <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="180"/>
<source>The screen is too small to display the installer.</source> <source>The screen is too small to display the installer.</source>
<translation>Слишком маленький экран для окна установщика.</translation> <translation>Экран слишком маленький, чтобы отобразить окно установщика.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1548,7 +1549,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/locale/LCLocaleDialog.cpp" line="63"/> <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="63"/>
<source>&amp;Cancel</source> <source>&amp;Cancel</source>
<translation>О&amp;тмена</translation> <translation>&amp;Отмена</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/locale/LCLocaleDialog.cpp" line="64"/> <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="64"/>
@ -1576,27 +1577,27 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/license/LicensePage.cpp" line="151"/> <location filename="../src/modules/license/LicensePage.cpp" line="151"/>
<source>Please review the End User License Agreements (EULAs).</source> <source>Please review the End User License Agreements (EULAs).</source>
<translation type="unfinished"/> <translation>Пожалуйста, ознакомьтесь с лицензионным соглашением (EULA).</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicensePage.cpp" line="156"/> <location filename="../src/modules/license/LicensePage.cpp" line="156"/>
<source>This setup procedure will install proprietary software that is subject to licensing terms.</source> <source>This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/> <translation>В ходе этой процедуры установки будет установлено проприетарное программное обеспечение, на которое распространяются условия лицензирования.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicensePage.cpp" line="159"/> <location filename="../src/modules/license/LicensePage.cpp" line="159"/>
<source>If you do not agree with the terms, the setup procedure cannot continue.</source> <source>If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/> <translation>если вы не согласны с условиями, процедура установки не может быть продолжена.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/license/LicensePage.cpp" line="164"/> <location filename="../src/modules/license/LicensePage.cpp" line="164"/>
<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> <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>
<message> <message>
<location filename="../src/modules/license/LicensePage.cpp" line="169"/> <location filename="../src/modules/license/LicensePage.cpp" line="169"/>
<source>If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.</source> <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> </message>
</context> </context>
<context> <context>
@ -1735,7 +1736,7 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="199"/> <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="199"/>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="207"/> <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="207"/>
<source>Encrypted rootfs setup error</source> <source>Encrypted rootfs setup error</source>
<translation type="unfinished"/> <translation>Ошибка шифрования корневой файловой системы</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="193"/> <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="193"/>
@ -1750,7 +1751,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="208"/> <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="208"/>
<source>Could not configure LUKS key file on partition %1.</source> <source>Could not configure LUKS key file on partition %1.</source>
<translation type="unfinished"/> <translation>Не удалось настроить файл ключа LUKS на разделе %1.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1763,7 +1764,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/machineid/MachineIdJob.cpp" line="62"/> <location filename="../src/modules/machineid/MachineIdJob.cpp" line="62"/>
<source>Configuration Error</source> <source>Configuration Error</source>
<translation type="unfinished"/> <translation>Ошибка конфигурации</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/machineid/MachineIdJob.cpp" line="63"/> <location filename="../src/modules/machineid/MachineIdJob.cpp" line="63"/>
@ -1782,22 +1783,22 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="64"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="64"/>
<source>Office software</source> <source>Office software</source>
<translation type="unfinished"/> <translation>Офисное программное обеспечение</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="65"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="65"/>
<source>Office package</source> <source>Office package</source>
<translation type="unfinished"/> <translation>Офисный пакет</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="66"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="66"/>
<source>Browser software</source> <source>Browser software</source>
<translation type="unfinished"/> <translation>Браузерное программное обеспечение</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="67"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="67"/>
<source>Browser package</source> <source>Browser package</source>
<translation type="unfinished"/> <translation>Браузерный пакет</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="68"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="68"/>
@ -1812,7 +1813,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="70"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="70"/>
<source>Services</source> <source>Services</source>
<translation type="unfinished"/> <translation>Сервисы</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="71"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="71"/>
@ -1822,7 +1823,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="72"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="72"/>
<source>Desktop</source> <source>Desktop</source>
<translation type="unfinished"/> <translation>Рабочий стол</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="73"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="73"/>
@ -1832,42 +1833,42 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="74"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="74"/>
<source>Communication</source> <source>Communication</source>
<translation type="unfinished"/> <translation>Общение</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="75"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="75"/>
<source>Development</source> <source>Development</source>
<translation type="unfinished"/> <translation>Разработка</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="76"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="76"/>
<source>Office</source> <source>Office</source>
<translation type="unfinished"/> <translation>Офис</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="77"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="77"/>
<source>Multimedia</source> <source>Multimedia</source>
<translation type="unfinished"/> <translation>Мультимедиа</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="78"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="78"/>
<source>Internet</source> <source>Internet</source>
<translation type="unfinished"/> <translation>Интернет</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="79"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="79"/>
<source>Theming</source> <source>Theming</source>
<translation type="unfinished"/> <translation>Темы</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="80"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="80"/>
<source>Gaming</source> <source>Gaming</source>
<translation type="unfinished"/> <translation>Игры</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="81"/> <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="81"/>
<source>Utilities</source> <source>Utilities</source>
<translation type="unfinished"/> <translation>Утилиты</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1875,7 +1876,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/notesqml/NotesQmlViewStep.cpp" line="34"/> <location filename="../src/modules/notesqml/NotesQmlViewStep.cpp" line="34"/>
<source>Notes</source> <source>Notes</source>
<translation type="unfinished"/> <translation>Заметки</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1888,7 +1889,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/oemid/OEMPage.ui" line="38"/> <location filename="../src/modules/oemid/OEMPage.ui" line="38"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a batch-identifier here. This will be stored in the target system.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a batch-identifier here. This will be stored in the target system.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"/> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Введите идентификатор партии здесь. Это будет сохранено в целевой системе.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/oemid/OEMPage.ui" line="48"/> <location filename="../src/modules/oemid/OEMPage.ui" line="48"/>
@ -2079,7 +2080,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="254"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="254"/>
<source>Password generation failed - required entropy too low for settings</source> <source>Password generation failed - required entropy too low for settings</source>
<translation type="unfinished"/> <translation>Сбой генерации пароля - слишком низкая энтропия для настроек</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/CheckPWQuality.cpp" line="260"/> <location filename="../src/modules/users/CheckPWQuality.cpp" line="260"/>
@ -2167,27 +2168,27 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/packagechooser/page_package.ui" line="40"/> <location filename="../src/modules/packagechooser/page_package.ui" line="40"/>
<source>Product Name</source> <source>Product Name</source>
<translation type="unfinished"/> <translation>Имя продукта</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/packagechooser/page_package.ui" line="53"/> <location filename="../src/modules/packagechooser/page_package.ui" line="53"/>
<source>TextLabel</source> <source>TextLabel</source>
<translation type="unfinished"/> <translation>Текстовая метка</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/packagechooser/page_package.ui" line="69"/> <location filename="../src/modules/packagechooser/page_package.ui" line="69"/>
<source>Long Product Description</source> <source>Long Product Description</source>
<translation type="unfinished"/> <translation>Длинное описание продукта</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="34"/> <location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="34"/>
<source>Package Selection</source> <source>Package Selection</source>
<translation type="unfinished"/> <translation>Выбор пакета</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="35"/> <location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="35"/>
<source>Please pick a product from the list. The selected product will be installed.</source> <source>Please pick a product from the list. The selected product will be installed.</source>
<translation type="unfinished"/> <translation>Пожалуйста, выберите продукт из списка. Выбранный продукт будет установлен.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2195,7 +2196,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/packagechooser/PackageChooserViewStep.cpp" line="70"/> <location filename="../src/modules/packagechooser/PackageChooserViewStep.cpp" line="70"/>
<source>Packages</source> <source>Packages</source>
<translation type="unfinished"/> <translation>Пакеты</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2297,12 +2298,12 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="451"/> <location filename="../src/modules/users/page_usersetup.ui" line="451"/>
<source>When this box is checked, password-strength checking is done and you will not be able to use a weak password.</source> <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>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="454"/> <location filename="../src/modules/users/page_usersetup.ui" line="454"/>
<source>Require strong passwords.</source> <source>Require strong passwords.</source>
<translation type="unfinished"/> <translation>Требовать надежный пароль.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/page_usersetup.ui" line="461"/> <location filename="../src/modules/users/page_usersetup.ui" line="461"/>
@ -2430,7 +2431,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="107"/> <location filename="../src/modules/partition/gui/PartitionPage.ui" line="107"/>
<source>Cre&amp;ate</source> <source>Cre&amp;ate</source>
<translation>Со&amp;здать</translation> <translation>&amp;Создать</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="114"/> <location filename="../src/modules/partition/gui/PartitionPage.ui" line="114"/>
@ -2455,7 +2456,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="146"/> <location filename="../src/modules/partition/gui/PartitionPage.ui" line="146"/>
<source>Deactivate Volume Group</source> <source>Deactivate Volume Group</source>
<translation type="unfinished"/> <translation>Отключить группу томов</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionPage.ui" line="153"/> <location filename="../src/modules/partition/gui/PartitionPage.ui" line="153"/>
@ -2573,12 +2574,12 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="467"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="467"/>
<source>Option to use GPT on BIOS</source> <source>Option to use GPT on BIOS</source>
<translation type="unfinished"/> <translation>Возможность для использования GPT в BIOS</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="468"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="468"/>
<source>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.&lt;br/&gt;&lt;br/&gt;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 &lt;strong&gt;bios_grub&lt;/strong&gt; flag enabled.&lt;br/&gt;&lt;br/&gt;An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</source> <source>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.&lt;br/&gt;&lt;br/&gt;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 &lt;strong&gt;bios_grub&lt;/strong&gt; flag enabled.&lt;br/&gt;&lt;br/&gt;An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</source>
<translation type="unfinished"/> <translation>Таблица разделов GPT - наилучший вариант для всех систем. Этот установщик позволяет использовать таблицу разделов GPT для систем с BIOS. &lt;br/&gt; &lt;br/&gt; Чтобы установить таблицу разделов как GPT (если это еще не сделано) вернитесь назад и создайте таблицу разделов GPT, затем создайте 8 МБ Не форматированный раздел с включенным флагом &lt;strong&gt; bios-grub&lt;/strong&gt; &lt;/ strong&gt;. &lt;br/&gt; &lt;br/&gt; Не форматированный раздел в 8 МБ необходим для запуска %1 на системе с BIOS и таблицей разделов GPT.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="496"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="496"/>
@ -2598,7 +2599,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="709"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="709"/>
<source>There are no partitions to install on.</source> <source>There are no partitions to install on.</source>
<translation type="unfinished"/> <translation>Нет разделов для установки.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2625,7 +2626,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="70"/>
<source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source> <source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source>
<translation type="unfinished"/> <translation>Пожалуйста, выберите внешний вид рабочего стола KDE Plasma. Вы также можете пропустить этот шаг и настроить внешний вид после настройки системы. Нажав на внешний вид, вы получите живой предварительный просмотр этого стиля.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/> <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="76"/>
@ -2656,7 +2657,7 @@ The installer will quit and all changes will be lost.</source>
<message> <message>
<location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/> <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="176"/>
<source>Not all of the configured files could be preserved.</source> <source>Not all of the configured files could be preserved.</source>
<translation type="unfinished"/> <translation>Не все настроенные файлы могут быть сохранены.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2720,7 +2721,7 @@ Output:
<message> <message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="447"/> <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="447"/>
<source>External command finished with errors.</source> <source>External command finished with errors.</source>
<translation>Внешняя команда завершилась с ошибками</translation> <translation>Внешняя команда завершилась с ошибками.</translation>
</message> </message>
<message> <message>
<location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="448"/> <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="448"/>
@ -2792,12 +2793,12 @@ Output:
<message> <message>
<location filename="../src/modules/packagechooser/PackageModel.cpp" line="79"/> <location filename="../src/modules/packagechooser/PackageModel.cpp" line="79"/>
<source>No product</source> <source>No product</source>
<translation type="unfinished"/> <translation>Нет продукта</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/packagechooser/PackageModel.cpp" line="87"/> <location filename="../src/modules/packagechooser/PackageModel.cpp" line="87"/>
<source>No description provided.</source> <source>No description provided.</source>
<translation type="unfinished"/> <translation>Описание не предоставлено.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionDialogHelpers.cpp" line="47"/> <location filename="../src/modules/partition/gui/PartitionDialogHelpers.cpp" line="47"/>
@ -2815,7 +2816,7 @@ Output:
<message> <message>
<location filename="../src/modules/removeuser/RemoveUserJob.cpp" line="43"/> <location filename="../src/modules/removeuser/RemoveUserJob.cpp" line="43"/>
<source>Remove live user from target system</source> <source>Remove live user from target system</source>
<translation type="unfinished"/> <translation>Удалить live пользователя из целевой системы</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2824,12 +2825,12 @@ Output:
<location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="33"/> <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="33"/>
<location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="45"/> <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="45"/>
<source>Remove Volume Group named %1.</source> <source>Remove Volume Group named %1.</source>
<translation>Удалить группу томов на диске %1</translation> <translation>Удалить группу томов на диске %1.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="39"/> <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="39"/>
<source>Remove Volume Group named &lt;strong&gt;%1&lt;/strong&gt;.</source> <source>Remove Volume Group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
<translation>Удалить группу томов на диске %1</translation> <translation>Удалить группу томов на диске &lt;strong&gt;%1&lt;/strong&gt;.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="57"/> <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="57"/>
@ -2927,17 +2928,17 @@ Output:
<message> <message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="171"/> <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="171"/>
<source>The file-system resize job has an invalid configuration and will not run.</source> <source>The file-system resize job has an invalid configuration and will not run.</source>
<translation type="unfinished"/> <translation>Задание на изменения размера файловой системы имеет недопустимую конфигурацию и не будет запущено.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="177"/> <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="177"/>
<source>KPMCore not Available</source> <source>KPMCore not Available</source>
<translation type="unfinished"/> <translation>KPMCore недоступен</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="178"/> <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="178"/>
<source>Calamares cannot start KPMCore for the file-system resize job.</source> <source>Calamares cannot start KPMCore for the file-system resize job.</source>
<translation type="unfinished"/> <translation>Calamares не может запустить KPMCore для задания изменения размера файловой системы.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="186"/> <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="186"/>
@ -3160,7 +3161,7 @@ Output:
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="62"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="62"/>
<source>Set flags on new partition.</source> <source>Set flags on new partition.</source>
<translation>Установить флаги нового раздела.</translation> <translation>Установите флаги на новый раздел.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="74"/> <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="74"/>
@ -3314,7 +3315,7 @@ Output:
<message> <message>
<location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="46"/> <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="46"/>
<source>Shell Processes Job</source> <source>Shell Processes Job</source>
<translation type="unfinished"/> <translation>Работа с контекстными процессами</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3362,7 +3363,7 @@ Output:
<message> <message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="71"/> <location filename="../src/modules/tracking/TrackingJobs.cpp" line="71"/>
<source>Internal error in install-tracking.</source> <source>Internal error in install-tracking.</source>
<translation type="unfinished"/> <translation>Внутренняя ошибка в install-tracking.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/tracking/TrackingJobs.cpp" line="72"/> <location filename="../src/modules/tracking/TrackingJobs.cpp" line="72"/>
@ -3470,7 +3471,7 @@ Output:
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="402"/> <location filename="../src/modules/users/UsersPage.cpp" line="402"/>
<source>Your username must start with a lowercase letter or underscore.</source> <source>Your username must start with a lowercase letter or underscore.</source>
<translation type="unfinished"/> <translation>Ваше имя пользователя должно начинаться со строчной буквы или подчеркивания.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/users/UsersPage.cpp" line="409"/> <location filename="../src/modules/users/UsersPage.cpp" line="409"/>
@ -3544,12 +3545,12 @@ Output:
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="56"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="56"/>
<source>Physical Extent Size:</source> <source>Physical Extent Size:</source>
<translation type="unfinished"/> <translation>Физический размер:</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/>
<source> MiB</source> <source> MiB</source>
<translation>МиБ</translation> <translation> МиБ</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="82"/> <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="82"/>
@ -3583,7 +3584,7 @@ Output:
<location filename="../src/modules/welcome/WelcomePage.ui" line="69"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="69"/>
<location filename="../src/modules/welcome/WelcomePage.ui" line="82"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="82"/>
<source>Select application and system language</source> <source>Select application and system language</source>
<translation type="unfinished"/> <translation>Выберите язык приложения и системы</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="130"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="130"/>
@ -3603,7 +3604,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="153"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
<source>Open help and support website</source> <source>Open help and support website</source>
<translation type="unfinished"/> <translation>Открыть сайт справки и поддержки</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="156"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
@ -3613,7 +3614,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="166"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
<source>Open issues and bug-tracking website</source> <source>Open issues and bug-tracking website</source>
<translation type="unfinished"/> <translation>Открыть сайт со списком известных проблем и отслеживанием ошибок</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="169"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
@ -3623,7 +3624,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="179"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
<source>Open release notes website</source> <source>Open release notes website</source>
<translation type="unfinished"/> <translation>Открыть сайт с заметками о выпуске</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="182"/> <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
@ -3708,7 +3709,7 @@ Output:
<message> <message>
<location filename="../src/modules/welcomeq/about.qml" line="105"/> <location filename="../src/modules/welcomeq/about.qml" line="105"/>
<source>Back</source> <source>Back</source>
<translation type="unfinished"/> <translation>Назад</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3716,17 +3717,17 @@ Output:
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="25"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="25"/>
<source>Keyboard Model</source> <source>Keyboard Model</source>
<translation type="unfinished"/> <translation>Модель клавиатуры</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="26"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="26"/>
<source>Pick your preferred keyboard model or use the default one based on the detected hardware</source> <source>Pick your preferred keyboard model or use the default one based on the detected hardware</source>
<translation type="unfinished"/> <translation>Выберите предпочитаемую модель клавиатуры или используйте модель по умолчанию на основе обнаруженного оборудования</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="41"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="41"/>
<source>Refresh</source> <source>Refresh</source>
<translation type="unfinished"/> <translation>Обновить</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="51"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="51"/>
@ -3738,22 +3739,22 @@ Output:
<location filename="../src/modules/keyboardq/keyboardq.qml" line="79"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="79"/>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="139"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="139"/>
<source>Keyboard Layout</source> <source>Keyboard Layout</source>
<translation type="unfinished"/> <translation>Раскладка клавиатуры</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="101"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="101"/>
<source>Models</source> <source>Models</source>
<translation type="unfinished"/> <translation>Модели</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="109"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="109"/>
<source>Variants</source> <source>Variants</source>
<translation type="unfinished"/> <translation>Варианты</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/keyboardq/keyboardq.qml" line="189"/> <location filename="../src/modules/keyboardq/keyboardq.qml" line="189"/>
<source>Test your keyboard</source> <source>Test your keyboard</source>
<translation type="unfinished"/> <translation>Проверьте свою клавиатуру</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3762,7 +3763,8 @@ Output:
<location filename="../src/modules/notesqml/notesqml.qml" line="61"/> <location filename="../src/modules/notesqml/notesqml.qml" line="61"/>
<source>&lt;h3&gt;%1&lt;/h3&gt; <source>&lt;h3&gt;%1&lt;/h3&gt;
&lt;p&gt;These are example release notes.&lt;/p&gt;</source> &lt;p&gt;These are example release notes.&lt;/p&gt;</source>
<translation type="unfinished"/> <translation>&lt;h3&gt;%1&lt;/h3&gt;
&lt;p&gt;Это пример заметок о выпуске..&lt;/p&gt;</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3770,27 +3772,27 @@ Output:
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="43"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="43"/>
<source>&lt;h3&gt;Welcome to the %1 &lt;quote&gt;%2&lt;/quote&gt; installer&lt;/h3&gt;</source> <source>&lt;h3&gt;Welcome to the %1 &lt;quote&gt;%2&lt;/quote&gt; installer&lt;/h3&gt;</source>
<translation type="unfinished"/> <translation>&lt;h3&gt;Добро пожаловать в %1 &lt;quote&gt;%2&lt;/quote&gt; установщик&lt;/h3&gt;</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="75"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="75"/>
<source>About</source> <source>About</source>
<translation type="unfinished"/> <translation>О Программе</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="89"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="89"/>
<source>Support</source> <source>Support</source>
<translation type="unfinished"/> <translation>Поддержка</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
<source>Known issues</source> <source>Known issues</source>
<translation type="unfinished"/> <translation>Известные проблемы</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="111"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="111"/>
<source>Release notes</source> <source>Release notes</source>
<translation type="unfinished"/> <translation>Примечания к выпуску</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/welcomeq/welcomeq.qml" line="122"/> <location filename="../src/modules/welcomeq/welcomeq.qml" line="122"/>

View File

@ -2580,7 +2580,7 @@ Sistem güç kaynağına bağlı değil.</translation>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="468"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="468"/>
<source>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.&lt;br/&gt;&lt;br/&gt;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 &lt;strong&gt;bios_grub&lt;/strong&gt; flag enabled.&lt;br/&gt;&lt;br/&gt;An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</source> <source>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.&lt;br/&gt;&lt;br/&gt;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 &lt;strong&gt;bios_grub&lt;/strong&gt; flag enabled.&lt;br/&gt;&lt;br/&gt;An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</source>
<translation>GPT bölümleme tablosu tüm sistemler için en iyi seçenektir. Bu yükleyici BIOS sistemleri için de böyle bir kurulumu destekler. &lt;br/&gt;&lt;br/&gt;BIOS'ta bir GPT bölümleme tablosu yapılandırmak için (daha önce yapılmadıysa) geri gidin ve bölümleme tablosunu GPT'ye ayarlayın, ardından &lt;strong&gt;bios_grub&lt;/strong&gt; bayrağı etkinken 8 MB biçimlendirilmemiş bir bölüm oluşturun.&lt;br/&gt; &lt;br/&gt;GPT'li bir BIOS sisteminde% 1'i başlatmak için biçimlendirilmemiş 8 MB'lik bir bölüm gereklidir.</translation> <translation>GPT disk bölümleme tablosu tüm sistemler için en iyi seçenektir. Bu yükleyici klasik BIOS sistemler için de böyle bir kurulumu destekler. &lt;br/&gt;&lt;br/&gt;Klasik BIOS sistemlerde diskinizi GPT tipinde yapılandırmak için (daha önce yapılmadıysa) geri gidin ve disk yapısını GPT olarak ayarlayın ve ardından &lt;strong&gt;bios_grub&lt;/strong&gt; bayrağı ile etiketlenmiş 8 MB biçimlendirilmemiş bir bölüm oluşturun.&lt;br/&gt; &lt;br/&gt;GPT disk yapısı ile kurulan klasik BIOS sistemi %1 başlatmak için biçimlendirilmemiş 8 MB bir disk bölümü gereklidir.</translation>
</message> </message>
<message> <message>
<location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="496"/> <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="496"/>

View File

@ -2,353 +2,335 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-15 13:39+0200\n" "POT-Creation-Date: 2020-04-30 23:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: \n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#: src/modules/grubcfg/main.py:37 #: src/modules/packages/main.py:59 src/modules/packages/main.py:68
msgid "Configure GRUB." #: src/modules/packages/main.py:78
msgstr "Configure GRUB." msgid "Install packages."
msgstr ""
#: src/modules/mount/main.py:38 #: src/modules/packages/main.py:66
msgid "Mounting partitions." #, python-format
msgstr "Mounting partitions." msgid "Processing packages (%(count)d / %(total)d)"
msgstr ""
#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:205 #: src/modules/packages/main.py:71
#: src/modules/initcpiocfg/main.py:209 #, python-format
#: src/modules/luksopenswaphookcfg/main.py:95 msgid "Installing one package."
#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171 msgid_plural "Installing %(num)d packages."
#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98 msgstr[0] ""
#: src/modules/openrcdmcryptcfg/main.py:78 msgstr[1] ""
#: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:332
#: src/modules/fstab/main.py:338 src/modules/localecfg/main.py:144 #: src/modules/packages/main.py:74
#: src/modules/networkcfg/main.py:48 #, python-format
msgid "Removing one package."
msgid_plural "Removing %(num)d packages."
msgstr[0] ""
msgstr[1] ""
#: src/modules/networkcfg/main.py:37
msgid "Saving network configuration."
msgstr ""
#: src/modules/networkcfg/main.py:48 src/modules/initcpiocfg/main.py:205
#: src/modules/initcpiocfg/main.py:209 src/modules/openrcdmcryptcfg/main.py:78
#: src/modules/openrcdmcryptcfg/main.py:82 src/modules/localecfg/main.py:144
#: src/modules/mount/main.py:145 src/modules/luksopenswaphookcfg/main.py:95
#: src/modules/luksopenswaphookcfg/main.py:99 src/modules/fstab/main.py:332
#: src/modules/fstab/main.py:338 src/modules/initramfscfg/main.py:94
#: src/modules/initramfscfg/main.py:98 src/modules/rawfs/main.py:171
msgid "Configuration Error" msgid "Configuration Error"
msgstr "Configuration Error"
#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:206
#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
#: src/modules/fstab/main.py:333
msgid "No partitions are defined for <pre>{!s}</pre> to use."
msgstr "No partitions are defined for <pre>{!s}</pre> to use."
#: src/modules/services-systemd/main.py:35
msgid "Configure systemd services"
msgstr "Configure systemd services"
#: src/modules/services-systemd/main.py:68
#: src/modules/services-openrc/main.py:102
msgid "Cannot modify service"
msgstr "Cannot modify service"
#: src/modules/services-systemd/main.py:69
msgid ""
"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
msgstr "" msgstr ""
"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
#: src/modules/services-systemd/main.py:72 #: src/modules/networkcfg/main.py:49 src/modules/initcpiocfg/main.py:210
#: src/modules/services-systemd/main.py:76 #: src/modules/openrcdmcryptcfg/main.py:83 src/modules/localecfg/main.py:145
msgid "Cannot enable systemd service <code>{name!s}</code>." #: src/modules/luksopenswaphookcfg/main.py:100 src/modules/fstab/main.py:339
msgstr "Cannot enable systemd service <code>{name!s}</code>." #: src/modules/initramfscfg/main.py:99
msgid "No root mount point is given for <pre>{!s}</pre> to use."
#: src/modules/services-systemd/main.py:74
msgid "Cannot enable systemd target <code>{name!s}</code>."
msgstr "Cannot enable systemd target <code>{name!s}</code>."
#: src/modules/services-systemd/main.py:78
msgid "Cannot disable systemd target <code>{name!s}</code>."
msgstr "Cannot disable systemd target <code>{name!s}</code>."
#: src/modules/services-systemd/main.py:80
msgid "Cannot mask systemd unit <code>{name!s}</code>."
msgstr "Cannot mask systemd unit <code>{name!s}</code>."
#: src/modules/services-systemd/main.py:82
msgid ""
"Unknown systemd commands <code>{command!s}</code> and "
"<code>{suffix!s}</code> for unit {name!s}."
msgstr "" msgstr ""
"Unknown systemd commands <code>{command!s}</code> and "
"<code>{suffix!s}</code> for unit {name!s}."
#: src/modules/umount/main.py:40 #: src/modules/umount/main.py:40
msgid "Unmount file systems." msgid "Unmount file systems."
msgstr "Unmount file systems." msgstr ""
#: src/modules/initcpiocfg/main.py:37
msgid "Configuring mkinitcpio."
msgstr ""
#: src/modules/initcpiocfg/main.py:206 src/modules/openrcdmcryptcfg/main.py:79
#: src/modules/mount/main.py:146 src/modules/luksopenswaphookcfg/main.py:96
#: src/modules/fstab/main.py:333 src/modules/initramfscfg/main.py:95
#: src/modules/rawfs/main.py:172
msgid "No partitions are defined for <pre>{!s}</pre> to use."
msgstr ""
#: src/modules/openrcdmcryptcfg/main.py:34
msgid "Configuring OpenRC dmcrypt service."
msgstr ""
#: src/modules/unpackfs/main.py:44 #: src/modules/unpackfs/main.py:44
msgid "Filling up filesystems." msgid "Filling up filesystems."
msgstr "Filling up filesystems." msgstr ""
#: src/modules/unpackfs/main.py:257 #: src/modules/unpackfs/main.py:257
msgid "rsync failed with error code {}." msgid "rsync failed with error code {}."
msgstr "rsync failed with error code {}." msgstr ""
#: src/modules/unpackfs/main.py:302 #: src/modules/unpackfs/main.py:302
msgid "Unpacking image {}/{}, file {}/{}" msgid "Unpacking image {}/{}, file {}/{}"
msgstr "Unpacking image {}/{}, file {}/{}" msgstr ""
#: src/modules/unpackfs/main.py:317 #: src/modules/unpackfs/main.py:317
msgid "Starting to unpack {}" msgid "Starting to unpack {}"
msgstr "Starting to unpack {}" msgstr ""
#: src/modules/unpackfs/main.py:326 src/modules/unpackfs/main.py:432 #: src/modules/unpackfs/main.py:326 src/modules/unpackfs/main.py:432
msgid "Failed to unpack image \"{}\"" msgid "Failed to unpack image \"{}\""
msgstr "Failed to unpack image \"{}\"" msgstr ""
#: src/modules/unpackfs/main.py:399 #: src/modules/unpackfs/main.py:399
msgid "No mount point for root partition" msgid "No mount point for root partition"
msgstr "No mount point for root partition" msgstr ""
#: src/modules/unpackfs/main.py:400 #: src/modules/unpackfs/main.py:400
msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr ""
#: src/modules/unpackfs/main.py:405 #: src/modules/unpackfs/main.py:405
msgid "Bad mount point for root partition" msgid "Bad mount point for root partition"
msgstr "Bad mount point for root partition" msgstr ""
#: src/modules/unpackfs/main.py:406 #: src/modules/unpackfs/main.py:406
msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing" msgstr ""
#: src/modules/unpackfs/main.py:422 src/modules/unpackfs/main.py:426 #: src/modules/unpackfs/main.py:422 src/modules/unpackfs/main.py:426
#: src/modules/unpackfs/main.py:446 #: src/modules/unpackfs/main.py:446
msgid "Bad unsquash configuration" msgid "Bad unsquash configuration"
msgstr "Bad unsquash configuration" msgstr ""
#: src/modules/unpackfs/main.py:423 #: src/modules/unpackfs/main.py:423
msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel" msgstr ""
#: src/modules/unpackfs/main.py:427 #: src/modules/unpackfs/main.py:427
msgid "The source filesystem \"{}\" does not exist" msgid "The source filesystem \"{}\" does not exist"
msgstr "The source filesystem \"{}\" does not exist" msgstr ""
#: src/modules/unpackfs/main.py:433 #: src/modules/unpackfs/main.py:433
msgid "" msgid ""
"Failed to find unsquashfs, make sure you have the squashfs-tools package " "Failed to find unsquashfs, make sure you have the squashfs-tools package "
"installed" "installed"
msgstr "" msgstr ""
"Failed to find unsquashfs, make sure you have the squashfs-tools package "
"installed"
#: src/modules/unpackfs/main.py:447 #: src/modules/unpackfs/main.py:447
msgid "The destination \"{}\" in the target system is not a directory" msgid "The destination \"{}\" in the target system is not a directory"
msgstr "The destination \"{}\" in the target system is not a directory"
#: src/modules/displaymanager/main.py:515
msgid "Cannot write KDM configuration file"
msgstr "Cannot write KDM configuration file"
#: src/modules/displaymanager/main.py:516
msgid "KDM config file {!s} does not exist"
msgstr "KDM config file {!s} does not exist"
#: src/modules/displaymanager/main.py:577
msgid "Cannot write LXDM configuration file"
msgstr "Cannot write LXDM configuration file"
#: src/modules/displaymanager/main.py:578
msgid "LXDM config file {!s} does not exist"
msgstr "LXDM config file {!s} does not exist"
#: src/modules/displaymanager/main.py:661
msgid "Cannot write LightDM configuration file"
msgstr "Cannot write LightDM configuration file"
#: src/modules/displaymanager/main.py:662
msgid "LightDM config file {!s} does not exist"
msgstr "LightDM config file {!s} does not exist"
#: src/modules/displaymanager/main.py:736
msgid "Cannot configure LightDM"
msgstr "Cannot configure LightDM"
#: src/modules/displaymanager/main.py:737
msgid "No LightDM greeter installed."
msgstr "No LightDM greeter installed."
#: src/modules/displaymanager/main.py:768
msgid "Cannot write SLIM configuration file"
msgstr "Cannot write SLIM configuration file"
#: src/modules/displaymanager/main.py:769
msgid "SLIM config file {!s} does not exist"
msgstr "SLIM config file {!s} does not exist"
#: src/modules/displaymanager/main.py:895
msgid "No display managers selected for the displaymanager module."
msgstr "No display managers selected for the displaymanager module."
#: src/modules/displaymanager/main.py:896
msgid ""
"The displaymanagers list is empty or undefined in bothglobalstorage and "
"displaymanager.conf."
msgstr "" msgstr ""
"The displaymanagers list is empty or undefined in bothglobalstorage and "
"displaymanager.conf."
#: src/modules/displaymanager/main.py:978 #: src/modules/services-systemd/main.py:35
msgid "Display manager configuration was incomplete" msgid "Configure systemd services"
msgstr "Display manager configuration was incomplete" msgstr ""
#: src/modules/initcpiocfg/main.py:37 #: src/modules/services-systemd/main.py:68
msgid "Configuring mkinitcpio." #: src/modules/services-openrc/main.py:102
msgstr "Configuring mkinitcpio." msgid "Cannot modify service"
msgstr ""
#: src/modules/initcpiocfg/main.py:210 #: src/modules/services-systemd/main.py:69
#: src/modules/luksopenswaphookcfg/main.py:100 msgid ""
#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83 "<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
#: src/modules/fstab/main.py:339 src/modules/localecfg/main.py:145 msgstr ""
#: src/modules/networkcfg/main.py:49
msgid "No root mount point is given for <pre>{!s}</pre> to use." #: src/modules/services-systemd/main.py:72
msgstr "No root mount point is given for <pre>{!s}</pre> to use." #: src/modules/services-systemd/main.py:76
msgid "Cannot enable systemd service <code>{name!s}</code>."
msgstr ""
#: src/modules/services-systemd/main.py:74
msgid "Cannot enable systemd target <code>{name!s}</code>."
msgstr ""
#: src/modules/services-systemd/main.py:78
msgid "Cannot disable systemd target <code>{name!s}</code>."
msgstr ""
#: src/modules/services-systemd/main.py:80
msgid "Cannot mask systemd unit <code>{name!s}</code>."
msgstr ""
#: src/modules/services-systemd/main.py:82
msgid ""
"Unknown systemd commands <code>{command!s}</code> and <code>{suffix!s}</"
"code> for unit {name!s}."
msgstr ""
#: src/modules/dummypython/main.py:44
msgid "Dummy python job."
msgstr ""
#: src/modules/dummypython/main.py:46 src/modules/dummypython/main.py:102
#: src/modules/dummypython/main.py:103
msgid "Dummy python step {}"
msgstr ""
#: src/modules/bootloader/main.py:51
msgid "Install bootloader."
msgstr ""
#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr ""
#: src/modules/mount/main.py:38
msgid "Mounting partitions."
msgstr ""
#: src/modules/plymouthcfg/main.py:36
msgid "Configure Plymouth theme"
msgstr ""
#: src/modules/luksopenswaphookcfg/main.py:35 #: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap." msgid "Configuring encrypted swap."
msgstr "Configuring encrypted swap." msgstr ""
#: src/modules/rawfs/main.py:35 #: src/modules/fstab/main.py:38
msgid "Installing data." msgid "Writing fstab."
msgstr "Installing data." msgstr ""
#: src/modules/services-openrc/main.py:38 #: src/modules/services-openrc/main.py:38
msgid "Configure OpenRC services" msgid "Configure OpenRC services"
msgstr "Configure OpenRC services" msgstr ""
#: src/modules/services-openrc/main.py:66 #: src/modules/services-openrc/main.py:66
msgid "Cannot add service {name!s} to run-level {level!s}." msgid "Cannot add service {name!s} to run-level {level!s}."
msgstr "Cannot add service {name!s} to run-level {level!s}." msgstr ""
#: src/modules/services-openrc/main.py:68 #: src/modules/services-openrc/main.py:68
msgid "Cannot remove service {name!s} from run-level {level!s}." msgid "Cannot remove service {name!s} from run-level {level!s}."
msgstr "Cannot remove service {name!s} from run-level {level!s}." msgstr ""
#: src/modules/services-openrc/main.py:70 #: src/modules/services-openrc/main.py:70
msgid "" msgid ""
"Unknown service-action <code>{arg!s}</code> for service {name!s} in run-" "Unknown service-action <code>{arg!s}</code> for service {name!s} in run-"
"level {level!s}." "level {level!s}."
msgstr "" msgstr ""
"Unknown service-action <code>{arg!s}</code> for service {name!s} in run-"
"level {level!s}."
#: src/modules/services-openrc/main.py:103 #: src/modules/services-openrc/main.py:103
msgid "" msgid ""
"<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}." "<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}."
msgstr "" msgstr ""
"<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}."
#: src/modules/services-openrc/main.py:110 #: src/modules/services-openrc/main.py:110
msgid "Target runlevel does not exist" msgid "Target runlevel does not exist"
msgstr "Target runlevel does not exist" msgstr ""
#: src/modules/services-openrc/main.py:111 #: src/modules/services-openrc/main.py:111
msgid "" msgid ""
"The path for runlevel {level!s} is <code>{path!s}</code>, which does not " "The path for runlevel {level!s} is <code>{path!s}</code>, which does not "
"exist." "exist."
msgstr "" msgstr ""
"The path for runlevel {level!s} is <code>{path!s}</code>, which does not "
"exist."
#: src/modules/services-openrc/main.py:119 #: src/modules/services-openrc/main.py:119
msgid "Target service does not exist" msgid "Target service does not exist"
msgstr "Target service does not exist" msgstr ""
#: src/modules/services-openrc/main.py:120 #: src/modules/services-openrc/main.py:120
msgid "" msgid ""
"The path for service {name!s} is <code>{path!s}</code>, which does not " "The path for service {name!s} is <code>{path!s}</code>, which does not exist."
"exist."
msgstr "" msgstr ""
"The path for service {name!s} is <code>{path!s}</code>, which does not "
"exist."
#: src/modules/plymouthcfg/main.py:36
msgid "Configure Plymouth theme"
msgstr "Configure Plymouth theme"
#: src/modules/packages/main.py:59 src/modules/packages/main.py:68
#: src/modules/packages/main.py:78
msgid "Install packages."
msgstr "Install packages."
#: src/modules/packages/main.py:66
#, python-format
msgid "Processing packages (%(count)d / %(total)d)"
msgstr "Processing packages (%(count)d / %(total)d)"
#: src/modules/packages/main.py:71
#, python-format
msgid "Installing one package."
msgid_plural "Installing %(num)d packages."
msgstr[0] "Installing one package."
msgstr[1] "Installing %(num)d packages."
#: src/modules/packages/main.py:74
#, python-format
msgid "Removing one package."
msgid_plural "Removing %(num)d packages."
msgstr[0] "Removing one package."
msgstr[1] "Removing %(num)d packages."
#: src/modules/bootloader/main.py:51
msgid "Install bootloader."
msgstr "Install bootloader."
#: src/modules/hwclock/main.py:35
msgid "Setting hardware clock."
msgstr "Setting hardware clock."
#: src/modules/dracut/main.py:36 #: src/modules/dracut/main.py:36
msgid "Creating initramfs with dracut." msgid "Creating initramfs with dracut."
msgstr "Creating initramfs with dracut." msgstr ""
#: src/modules/dracut/main.py:58 #: src/modules/dracut/main.py:58
msgid "Failed to run dracut on the target" msgid "Failed to run dracut on the target"
msgstr "Failed to run dracut on the target" msgstr ""
#: src/modules/dracut/main.py:59 #: src/modules/dracut/main.py:59
msgid "The exit code was {}" msgid "The exit code was {}"
msgstr "The exit code was {}" msgstr ""
#: src/modules/grubcfg/main.py:37
msgid "Configure GRUB."
msgstr ""
#: src/modules/displaymanager/main.py:515
msgid "Cannot write KDM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:516
msgid "KDM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:577
msgid "Cannot write LXDM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:578
msgid "LXDM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:661
msgid "Cannot write LightDM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:662
msgid "LightDM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:736
msgid "Cannot configure LightDM"
msgstr ""
#: src/modules/displaymanager/main.py:737
msgid "No LightDM greeter installed."
msgstr ""
#: src/modules/displaymanager/main.py:768
msgid "Cannot write SLIM configuration file"
msgstr ""
#: src/modules/displaymanager/main.py:769
msgid "SLIM config file {!s} does not exist"
msgstr ""
#: src/modules/displaymanager/main.py:895
msgid "No display managers selected for the displaymanager module."
msgstr ""
#: src/modules/displaymanager/main.py:896
msgid ""
"The displaymanagers list is empty or undefined in bothglobalstorage and "
"displaymanager.conf."
msgstr ""
#: src/modules/displaymanager/main.py:978
msgid "Display manager configuration was incomplete"
msgstr ""
#: src/modules/initramfscfg/main.py:41 #: src/modules/initramfscfg/main.py:41
msgid "Configuring initramfs." msgid "Configuring initramfs."
msgstr "Configuring initramfs." msgstr ""
#: src/modules/openrcdmcryptcfg/main.py:34 #: src/modules/hwclock/main.py:35
msgid "Configuring OpenRC dmcrypt service." msgid "Setting hardware clock."
msgstr "Configuring OpenRC dmcrypt service." msgstr ""
#: src/modules/fstab/main.py:38 #: src/modules/rawfs/main.py:35
msgid "Writing fstab." msgid "Installing data."
msgstr "Writing fstab." msgstr ""
#: src/modules/dummypython/main.py:44
msgid "Dummy python job."
msgstr "Dummy python job."
#: src/modules/dummypython/main.py:46 src/modules/dummypython/main.py:102
#: src/modules/dummypython/main.py:103
msgid "Dummy python step {}"
msgstr "Dummy python step {}"
#: src/modules/localecfg/main.py:39
msgid "Configuring locales."
msgstr "Configuring locales."
#: src/modules/networkcfg/main.py:37
msgid "Saving network configuration."
msgstr "Saving network configuration."

Binary file not shown.

View File

@ -5,6 +5,7 @@
# #
# Translators: # Translators:
# Aleksey Kabanov <ak099@mail.ru>, 2018 # Aleksey Kabanov <ak099@mail.ru>, 2018
# ZIzA, 2020
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
@ -13,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-15 13:39+0200\n" "POT-Creation-Date: 2020-04-15 13:39+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Aleksey Kabanov <ak099@mail.ru>, 2018\n" "Last-Translator: ZIzA, 2020\n"
"Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n" "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -23,11 +24,11 @@ msgstr ""
#: src/modules/grubcfg/main.py:37 #: src/modules/grubcfg/main.py:37
msgid "Configure GRUB." msgid "Configure GRUB."
msgstr "" msgstr "Настройте GRUB."
#: src/modules/mount/main.py:38 #: src/modules/mount/main.py:38
msgid "Mounting partitions." msgid "Mounting partitions."
msgstr "" msgstr "Монтирование разделов."
#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:205 #: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:205
#: src/modules/initcpiocfg/main.py:209 #: src/modules/initcpiocfg/main.py:209
@ -39,28 +40,29 @@ msgstr ""
#: src/modules/fstab/main.py:338 src/modules/localecfg/main.py:144 #: src/modules/fstab/main.py:338 src/modules/localecfg/main.py:144
#: src/modules/networkcfg/main.py:48 #: src/modules/networkcfg/main.py:48
msgid "Configuration Error" msgid "Configuration Error"
msgstr "" msgstr "Ошибка конфигурации"
#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:206 #: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:206
#: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172 #: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
#: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79 #: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
#: src/modules/fstab/main.py:333 #: src/modules/fstab/main.py:333
msgid "No partitions are defined for <pre>{!s}</pre> to use." msgid "No partitions are defined for <pre>{!s}</pre> to use."
msgstr "" msgstr "Не определены разделы для использования <pre>{!S}</pre>."
#: src/modules/services-systemd/main.py:35 #: src/modules/services-systemd/main.py:35
msgid "Configure systemd services" msgid "Configure systemd services"
msgstr "" msgstr "Настройка systemd сервисов"
#: src/modules/services-systemd/main.py:68 #: src/modules/services-systemd/main.py:68
#: src/modules/services-openrc/main.py:102 #: src/modules/services-openrc/main.py:102
msgid "Cannot modify service" msgid "Cannot modify service"
msgstr "" msgstr "Не могу изменить сервис"
#: src/modules/services-systemd/main.py:69 #: src/modules/services-systemd/main.py:69
msgid "" msgid ""
"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}." "<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
msgstr "" msgstr ""
"Вызов <code>systemctl {arg!s}</code> в chroot вернул код ошибки {num!s}."
#: src/modules/services-systemd/main.py:72 #: src/modules/services-systemd/main.py:72
#: src/modules/services-systemd/main.py:76 #: src/modules/services-systemd/main.py:76
@ -87,11 +89,11 @@ msgstr ""
#: src/modules/umount/main.py:40 #: src/modules/umount/main.py:40
msgid "Unmount file systems." msgid "Unmount file systems."
msgstr "" msgstr "Размонтирование файловой системы."
#: src/modules/unpackfs/main.py:44 #: src/modules/unpackfs/main.py:44
msgid "Filling up filesystems." msgid "Filling up filesystems."
msgstr "" msgstr "Наполнение файловой системы."
#: src/modules/unpackfs/main.py:257 #: src/modules/unpackfs/main.py:257
msgid "rsync failed with error code {}." msgid "rsync failed with error code {}."
@ -216,15 +218,15 @@ msgstr ""
#: src/modules/luksopenswaphookcfg/main.py:35 #: src/modules/luksopenswaphookcfg/main.py:35
msgid "Configuring encrypted swap." msgid "Configuring encrypted swap."
msgstr "" msgstr "Настройка зашифрованного swap."
#: src/modules/rawfs/main.py:35 #: src/modules/rawfs/main.py:35
msgid "Installing data." msgid "Installing data."
msgstr "" msgstr "Установка данных."
#: src/modules/services-openrc/main.py:38 #: src/modules/services-openrc/main.py:38
msgid "Configure OpenRC services" msgid "Configure OpenRC services"
msgstr "" msgstr "Настройка служб OpenRC"
#: src/modules/services-openrc/main.py:66 #: src/modules/services-openrc/main.py:66
msgid "Cannot add service {name!s} to run-level {level!s}." msgid "Cannot add service {name!s} to run-level {level!s}."
@ -257,7 +259,7 @@ msgstr ""
#: src/modules/services-openrc/main.py:119 #: src/modules/services-openrc/main.py:119
msgid "Target service does not exist" msgid "Target service does not exist"
msgstr "" msgstr "Целевой сервис не существует."
#: src/modules/services-openrc/main.py:120 #: src/modules/services-openrc/main.py:120
msgid "" msgid ""
@ -267,12 +269,12 @@ msgstr ""
#: src/modules/plymouthcfg/main.py:36 #: src/modules/plymouthcfg/main.py:36
msgid "Configure Plymouth theme" msgid "Configure Plymouth theme"
msgstr "" msgstr "Настроить тему Plymouth"
#: src/modules/packages/main.py:59 src/modules/packages/main.py:68 #: src/modules/packages/main.py:59 src/modules/packages/main.py:68
#: src/modules/packages/main.py:78 #: src/modules/packages/main.py:78
msgid "Install packages." msgid "Install packages."
msgstr "" msgstr "Установить пакеты."
#: src/modules/packages/main.py:66 #: src/modules/packages/main.py:66
#, python-format #, python-format
@ -283,51 +285,51 @@ msgstr "Обработка пакетов (%(count)d / %(total)d)"
#, python-format #, python-format
msgid "Installing one package." msgid "Installing one package."
msgid_plural "Installing %(num)d packages." msgid_plural "Installing %(num)d packages."
msgstr[0] "" msgstr[0] "Установка одного пакета."
msgstr[1] "" msgstr[1] "Установка %(num)d пакетов."
msgstr[2] "" msgstr[2] "Установка %(num)d пакетов."
msgstr[3] "" msgstr[3] "Установка %(num)d пакетов."
#: src/modules/packages/main.py:74 #: src/modules/packages/main.py:74
#, python-format #, python-format
msgid "Removing one package." msgid "Removing one package."
msgid_plural "Removing %(num)d packages." msgid_plural "Removing %(num)d packages."
msgstr[0] "" msgstr[0] "Удаление одного пакета."
msgstr[1] "" msgstr[1] "Удаление %(num)d пакетов."
msgstr[2] "" msgstr[2] "Удаление %(num)d пакетов."
msgstr[3] "" msgstr[3] "Удаление %(num)d пакетов."
#: src/modules/bootloader/main.py:51 #: src/modules/bootloader/main.py:51
msgid "Install bootloader." msgid "Install bootloader."
msgstr "" msgstr "Установить загрузчик."
#: src/modules/hwclock/main.py:35 #: src/modules/hwclock/main.py:35
msgid "Setting hardware clock." msgid "Setting hardware clock."
msgstr "" msgstr "Установка аппаратных часов."
#: src/modules/dracut/main.py:36 #: src/modules/dracut/main.py:36
msgid "Creating initramfs with dracut." msgid "Creating initramfs with dracut."
msgstr "" msgstr "Создание initramfs с помощью dracut."
#: src/modules/dracut/main.py:58 #: src/modules/dracut/main.py:58
msgid "Failed to run dracut on the target" msgid "Failed to run dracut on the target"
msgstr "" msgstr "Не удалось запустить dracut на цели"
#: src/modules/dracut/main.py:59 #: src/modules/dracut/main.py:59
msgid "The exit code was {}" msgid "The exit code was {}"
msgstr "" msgstr "Код выхода {}"
#: src/modules/initramfscfg/main.py:41 #: src/modules/initramfscfg/main.py:41
msgid "Configuring initramfs." msgid "Configuring initramfs."
msgstr "" msgstr "Настройка initramfs."
#: src/modules/openrcdmcryptcfg/main.py:34 #: src/modules/openrcdmcryptcfg/main.py:34
msgid "Configuring OpenRC dmcrypt service." msgid "Configuring OpenRC dmcrypt service."
msgstr "" msgstr "Настройка службы OpenRC dmcrypt."
#: src/modules/fstab/main.py:38 #: src/modules/fstab/main.py:38
msgid "Writing fstab." msgid "Writing fstab."
msgstr "" msgstr "Запись fstab."
#: src/modules/dummypython/main.py:44 #: src/modules/dummypython/main.py:44
msgid "Dummy python job." msgid "Dummy python job."
@ -340,8 +342,8 @@ msgstr ""
#: src/modules/localecfg/main.py:39 #: src/modules/localecfg/main.py:39
msgid "Configuring locales." msgid "Configuring locales."
msgstr "" msgstr "Настройка языка."
#: src/modules/networkcfg/main.py:37 #: src/modules/networkcfg/main.py:37
msgid "Saving network configuration." msgid "Saving network configuration."
msgstr "" msgstr "Сохранение настроек сети."

Binary file not shown.

View File

@ -4,7 +4,7 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
# Translators: # Translators:
# Besnik <besnik@programeshqip.org>, 2020 # Besnik Bleta <besnik@programeshqip.org>, 2020
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
@ -13,7 +13,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-15 13:39+0200\n" "POT-Creation-Date: 2020-04-15 13:39+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: Besnik <besnik@programeshqip.org>, 2020\n" "Last-Translator: Besnik Bleta <besnik@programeshqip.org>, 2020\n"
"Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n" "Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"

View File

@ -4,8 +4,8 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
# Translators: # Translators:
# Demiray Muhterem <mdemiray@msn.com>, 2020
# abc Def <hdogan1974@gmail.com>, 2020 # abc Def <hdogan1974@gmail.com>, 2020
# Demiray Muhterem <mdemiray@msn.com>, 2020
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
@ -14,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-15 13:39+0200\n" "POT-Creation-Date: 2020-04-15 13:39+0200\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n"
"Last-Translator: abc Def <hdogan1974@gmail.com>, 2020\n" "Last-Translator: Demiray Muhterem <mdemiray@msn.com>, 2020\n"
"Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -104,11 +104,11 @@ msgstr "rsync {} hata koduyla başarısız oldu."
#: src/modules/unpackfs/main.py:302 #: src/modules/unpackfs/main.py:302
msgid "Unpacking image {}/{}, file {}/{}" msgid "Unpacking image {}/{}, file {}/{}"
msgstr "Disk görüntüsü paketi açılıyor {}/{}, dosya {}/{}" msgstr "ılan kurulum medyası {}/{}, dışa aktarılan dosya sayısı {}/{}"
#: src/modules/unpackfs/main.py:317 #: src/modules/unpackfs/main.py:317
msgid "Starting to unpack {}" msgid "Starting to unpack {}"
msgstr "Paketi açmaya başlıyor {}" msgstr "Dışa aktarım başlatılıyor {}"
#: src/modules/unpackfs/main.py:326 src/modules/unpackfs/main.py:432 #: src/modules/unpackfs/main.py:326 src/modules/unpackfs/main.py:432
msgid "Failed to unpack image \"{}\"" msgid "Failed to unpack image \"{}\""
@ -233,7 +233,7 @@ msgstr "Veri yükleniyor."
#: src/modules/services-openrc/main.py:38 #: src/modules/services-openrc/main.py:38
msgid "Configure OpenRC services" msgid "Configure OpenRC services"
msgstr " OpenRC hizmetlerini yapılandır" msgstr " OpenRC servislerini yapılandır"
#: src/modules/services-openrc/main.py:66 #: src/modules/services-openrc/main.py:66
msgid "Cannot add service {name!s} to run-level {level!s}." msgid "Cannot add service {name!s} to run-level {level!s}."
@ -308,7 +308,7 @@ msgstr[1] "%(num)d paket kaldırılıyor."
#: src/modules/bootloader/main.py:51 #: src/modules/bootloader/main.py:51
msgid "Install bootloader." msgid "Install bootloader."
msgstr "Önyükleyici yükle" msgstr "Önyükleyici kuruluyor"
#: src/modules/hwclock/main.py:35 #: src/modules/hwclock/main.py:35
msgid "Setting hardware clock." msgid "Setting hardware clock."

77
lang/tz_sv.ts Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="en_US">
<context>
<name>QObject</name>
<message>
<location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="30"/>
<source>Africa</source>
<comment>tz_regions</comment>
<translation>Afrika</translation>
</message>
<message>
<location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="31"/>
<source>America</source>
<comment>tz_regions</comment>
<translation>Amerika</translation>
</message>
<message>
<location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="32"/>
<source>Antarctica</source>
<comment>tz_regions</comment>
<translation>Antarktis</translation>
</message>
<message>
<location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="34"/>
<source>Asia</source>
<comment>tz_regions</comment>
<translation>Asien</translation>
</message>
<message>
<location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="36"/>
<source>Australia</source>
<comment>tz_regions</comment>
<translation>Australien</translation>
</message>
<message>
<location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="37"/>
<source>Europe</source>
<comment>tz_regions</comment>
<translation>Europa</translation>
</message>
<message>
<location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="38"/>
<source>Indian</source>
<comment>tz_regions</comment>
<translation>Indien</translation>
</message>
<message>
<location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="68"/>
<source>Aqtobe</source>
<comment>tz_names</comment>
<translation>Aqtöbe</translation>
</message>
<message>
<location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="87"/>
<source>Athens</source>
<comment>tz_names</comment>
<translation>Aten</translation>
</message>
<message>
<location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="91"/>
<source>Azores</source>
<comment>tz_names</comment>
<translation>Azorerna</translation>
</message>
<message>
<location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="253"/>
<source>Kiev</source>
<comment>tz_names</comment>
<translation>Kyiv</translation>
</message>
<message>
<location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="326"/>
<source>Moscow</source>
<comment>tz_names</comment>
<translation>Moskva</translation>
</message>
</context>
</TS>

View File

@ -118,6 +118,12 @@ strings:
# productLogo is used as the logo at the top of the left-hand column # productLogo is used as the logo at the top of the left-hand column
# which shows the steps to be taken. The image should be square, # which shows the steps to be taken. The image should be square,
# and is displayed at 80x80 pixels (also on HiDPI). # and is displayed at 80x80 pixels (also on HiDPI).
# productWallpaper is an optional image, which if present, will replace
# the normal solid background on every page of the application.
# It can be any size and proportion,
# and will be tiled to fit the entire window.
# For a non-tiled wallpaper, the size should be the same as
# the overall window, see *windowSize* above (800x520).
# productWelcome is shown on the welcome page of the application in # productWelcome is shown on the welcome page of the application in
# the middle of the window, below the welcome text. It can be # the middle of the window, below the welcome text. It can be
# any size and proportion, and will be scaled to fit inside # any size and proportion, and will be scaled to fit inside
@ -129,6 +135,7 @@ images:
# productBanner: "banner.png" # productBanner: "banner.png"
productIcon: "squid.png" productIcon: "squid.png"
productLogo: "squid.png" productLogo: "squid.png"
# productWallpaper: "wallpaper.png"
productWelcome: "languages.png" productWelcome: "languages.png"
# The slideshow is displayed during execution steps (e.g. when the # The slideshow is displayed during execution steps (e.g. when the

View File

@ -61,11 +61,11 @@ windowDimensionToPixels( const Calamares::Branding::WindowDimension& u )
QWidget* QWidget*
CalamaresWindow::getWidgetSidebar( int desiredWidth ) CalamaresWindow::getWidgetSidebar( QWidget* parent, int desiredWidth )
{ {
const Calamares::Branding* const branding = Calamares::Branding::instance(); const Calamares::Branding* const branding = Calamares::Branding::instance();
QWidget* sideBox = new QWidget( this ); QWidget* sideBox = new QWidget( parent );
sideBox->setObjectName( "sidebarApp" ); sideBox->setObjectName( "sidebarApp" );
QBoxLayout* sideLayout = new QVBoxLayout; QBoxLayout* sideLayout = new QVBoxLayout;
@ -107,12 +107,12 @@ CalamaresWindow::getWidgetSidebar( int desiredWidth )
sideLayout->addWidget( debugWindowBtn ); sideLayout->addWidget( debugWindowBtn );
debugWindowBtn->setFlat( true ); debugWindowBtn->setFlat( true );
debugWindowBtn->setCheckable( true ); debugWindowBtn->setCheckable( true );
connect( debugWindowBtn, &QPushButton::clicked, this, [=]( bool checked ) { connect( debugWindowBtn, &QPushButton::clicked, this, [ = ]( bool checked ) {
if ( checked ) if ( checked )
{ {
m_debugWindow = new Calamares::DebugWindow(); m_debugWindow = new Calamares::DebugWindow();
m_debugWindow->show(); m_debugWindow->show();
connect( m_debugWindow.data(), &Calamares::DebugWindow::closed, this, [=]() { connect( m_debugWindow.data(), &Calamares::DebugWindow::closed, this, [ = ]() {
m_debugWindow->deleteLater(); m_debugWindow->deleteLater();
debugWindowBtn->setChecked( false ); debugWindowBtn->setChecked( false );
} ); } );
@ -132,10 +132,10 @@ CalamaresWindow::getWidgetSidebar( int desiredWidth )
} }
QWidget* QWidget*
CalamaresWindow::getQmlSidebar( int ) CalamaresWindow::getQmlSidebar( QWidget* parent, int )
{ {
CalamaresUtils::registerCalamaresModels(); CalamaresUtils::registerCalamaresModels();
QQuickWidget* w = new QQuickWidget( this ); QQuickWidget* w = new QQuickWidget( parent );
w->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); w->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
w->setResizeMode( QQuickWidget::SizeRootObjectToView ); w->setResizeMode( QQuickWidget::SizeRootObjectToView );
w->setSource( QUrl( w->setSource( QUrl(
@ -161,9 +161,9 @@ setButtonIcon( QPushButton* button, const QString& name )
} }
QWidget* QWidget*
CalamaresWindow::getWidgetNavigation() CalamaresWindow::getWidgetNavigation( QWidget* parent )
{ {
QWidget* navigation = new QWidget( this ); QWidget* navigation = new QWidget( parent );
QBoxLayout* bottomLayout = new QHBoxLayout; QBoxLayout* bottomLayout = new QHBoxLayout;
bottomLayout->addStretch(); bottomLayout->addStretch();
@ -175,7 +175,7 @@ CalamaresWindow::getWidgetNavigation()
connect( back, &QPushButton::clicked, m_viewManager, &Calamares::ViewManager::back ); connect( back, &QPushButton::clicked, m_viewManager, &Calamares::ViewManager::back );
connect( m_viewManager, &Calamares::ViewManager::backEnabledChanged, back, &QPushButton::setEnabled ); connect( m_viewManager, &Calamares::ViewManager::backEnabledChanged, back, &QPushButton::setEnabled );
connect( m_viewManager, &Calamares::ViewManager::backLabelChanged, back, &QPushButton::setText ); connect( m_viewManager, &Calamares::ViewManager::backLabelChanged, back, &QPushButton::setText );
connect( m_viewManager, &Calamares::ViewManager::backIconChanged, this, [=]( QString n ) { connect( m_viewManager, &Calamares::ViewManager::backIconChanged, this, [ = ]( QString n ) {
setButtonIcon( back, n ); setButtonIcon( back, n );
} ); } );
bottomLayout->addWidget( back ); bottomLayout->addWidget( back );
@ -187,7 +187,7 @@ CalamaresWindow::getWidgetNavigation()
connect( next, &QPushButton::clicked, m_viewManager, &Calamares::ViewManager::next ); connect( next, &QPushButton::clicked, m_viewManager, &Calamares::ViewManager::next );
connect( m_viewManager, &Calamares::ViewManager::nextEnabledChanged, next, &QPushButton::setEnabled ); connect( m_viewManager, &Calamares::ViewManager::nextEnabledChanged, next, &QPushButton::setEnabled );
connect( m_viewManager, &Calamares::ViewManager::nextLabelChanged, next, &QPushButton::setText ); connect( m_viewManager, &Calamares::ViewManager::nextLabelChanged, next, &QPushButton::setText );
connect( m_viewManager, &Calamares::ViewManager::nextIconChanged, this, [=]( QString n ) { connect( m_viewManager, &Calamares::ViewManager::nextIconChanged, this, [ = ]( QString n ) {
setButtonIcon( next, n ); setButtonIcon( next, n );
} ); } );
bottomLayout->addWidget( next ); bottomLayout->addWidget( next );
@ -199,7 +199,7 @@ CalamaresWindow::getWidgetNavigation()
connect( quit, &QPushButton::clicked, m_viewManager, &Calamares::ViewManager::quit ); connect( quit, &QPushButton::clicked, m_viewManager, &Calamares::ViewManager::quit );
connect( m_viewManager, &Calamares::ViewManager::quitEnabledChanged, quit, &QPushButton::setEnabled ); connect( m_viewManager, &Calamares::ViewManager::quitEnabledChanged, quit, &QPushButton::setEnabled );
connect( m_viewManager, &Calamares::ViewManager::quitLabelChanged, quit, &QPushButton::setText ); connect( m_viewManager, &Calamares::ViewManager::quitLabelChanged, quit, &QPushButton::setText );
connect( m_viewManager, &Calamares::ViewManager::quitIconChanged, this, [=]( QString n ) { connect( m_viewManager, &Calamares::ViewManager::quitIconChanged, this, [ = ]( QString n ) {
setButtonIcon( quit, n ); setButtonIcon( quit, n );
} ); } );
connect( m_viewManager, &Calamares::ViewManager::quitTooltipChanged, quit, &QPushButton::setToolTip ); connect( m_viewManager, &Calamares::ViewManager::quitTooltipChanged, quit, &QPushButton::setToolTip );
@ -213,10 +213,10 @@ CalamaresWindow::getWidgetNavigation()
} }
QWidget* QWidget*
CalamaresWindow::getQmlNavigation() CalamaresWindow::getQmlNavigation( QWidget* parent )
{ {
CalamaresUtils::registerCalamaresModels(); CalamaresUtils::registerCalamaresModels();
QQuickWidget* w = new QQuickWidget( this ); QQuickWidget* w = new QQuickWidget( parent );
w->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); w->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
w->setResizeMode( QQuickWidget::SizeRootObjectToView ); w->setResizeMode( QQuickWidget::SizeRootObjectToView );
w->setSource( QUrl( w->setSource( QUrl(
@ -234,6 +234,7 @@ template < typename widgetMaker, typename... args >
QWidget* QWidget*
flavoredWidget( Calamares::Branding::PanelFlavor flavor, flavoredWidget( Calamares::Branding::PanelFlavor flavor,
CalamaresWindow* w, CalamaresWindow* w,
QWidget* parent,
widgetMaker widget, widgetMaker widget,
widgetMaker qml, widgetMaker qml,
args... a ) args... a )
@ -242,9 +243,9 @@ flavoredWidget( Calamares::Branding::PanelFlavor flavor,
switch ( flavor ) switch ( flavor )
{ {
case Calamares::Branding::PanelFlavor::Widget: case Calamares::Branding::PanelFlavor::Widget:
return ( w->*widget )( a... ); return ( w->*widget )( parent, a... );
case Calamares::Branding::PanelFlavor::Qml: case Calamares::Branding::PanelFlavor::Qml:
return ( w->*qml )( a... ); return ( w->*qml )( parent, a... );
case Calamares::Branding::PanelFlavor::None: case Calamares::Branding::PanelFlavor::None:
return nullptr; return nullptr;
} }
@ -281,6 +282,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
: tr( "%1 Installer" ).arg( *Calamares::Branding::ProductName ) ); ) : tr( "%1 Installer" ).arg( *Calamares::Branding::ProductName ) ); )
const Calamares::Branding* const branding = Calamares::Branding::instance(); const Calamares::Branding* const branding = Calamares::Branding::instance();
using ImageEntry = Calamares::Branding::ImageEntry;
using CalamaresUtils::windowMinimumHeight; using CalamaresUtils::windowMinimumHeight;
using CalamaresUtils::windowMinimumWidth; using CalamaresUtils::windowMinimumWidth;
@ -307,7 +309,23 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
cDebug() << Logger::SubEntry << "Proposed window size:" << w << h; cDebug() << Logger::SubEntry << "Proposed window size:" << w << h;
resize( w, h ); resize( w, h );
m_viewManager = Calamares::ViewManager::instance( this ); QWidget* baseWidget = this;
if ( !( branding->imagePath( ImageEntry::ProductWallpaper ).isEmpty() ) )
{
QWidget* label = new QWidget( this );
QVBoxLayout* l = new QVBoxLayout;
CalamaresUtils::unmarginLayout( l );
l->addWidget( label );
setLayout( l );
label->setObjectName( "backgroundWidget" );
label->setStyleSheet(
QStringLiteral( "#backgroundWidget { background-image: url(%1); background-repeat: repeat-xy; }" )
.arg( branding->imagePath( ImageEntry::ProductWallpaper ) ) );
baseWidget = label;
}
m_viewManager = Calamares::ViewManager::instance( baseWidget );
if ( branding->windowExpands() ) if ( branding->windowExpands() )
{ {
connect( m_viewManager, &Calamares::ViewManager::ensureSize, this, &CalamaresWindow::ensureSize ); connect( m_viewManager, &Calamares::ViewManager::ensureSize, this, &CalamaresWindow::ensureSize );
@ -328,11 +346,15 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
QWidget* sideBox = flavoredWidget( QWidget* sideBox = flavoredWidget(
branding->sidebarFlavor(), branding->sidebarFlavor(),
this, this,
baseWidget,
&CalamaresWindow::getWidgetSidebar, &CalamaresWindow::getWidgetSidebar,
&CalamaresWindow::getQmlSidebar, &CalamaresWindow::getQmlSidebar,
qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) ); qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) );
QWidget* navigation = flavoredWidget( QWidget* navigation = flavoredWidget( branding->navigationFlavor(),
branding->navigationFlavor(), this, &CalamaresWindow::getWidgetNavigation, &CalamaresWindow::getQmlNavigation ); this,
baseWidget,
&CalamaresWindow::getWidgetNavigation,
&CalamaresWindow::getQmlNavigation );
// Build up the contentsLayout (a VBox) top-to-bottom // Build up the contentsLayout (a VBox) top-to-bottom
// .. note that the bottom is mirrored wrt. the top // .. note that the bottom is mirrored wrt. the top
@ -351,7 +373,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
CalamaresUtils::unmarginLayout( mainLayout ); CalamaresUtils::unmarginLayout( mainLayout );
CalamaresUtils::unmarginLayout( contentsLayout ); CalamaresUtils::unmarginLayout( contentsLayout );
setLayout( mainLayout ); baseWidget->setLayout( mainLayout );
setStyleSheet( Calamares::Branding::instance()->stylesheet() ); setStyleSheet( Calamares::Branding::instance()->stylesheet() );
} }

View File

@ -37,7 +37,7 @@ class CalamaresWindow : public QWidget
Q_OBJECT Q_OBJECT
public: public:
CalamaresWindow( QWidget* parent = nullptr ); CalamaresWindow( QWidget* parent = nullptr );
virtual ~CalamaresWindow() override {} virtual ~CalamaresWindow() override { }
public slots: public slots:
/** /**
@ -52,12 +52,12 @@ protected:
private: private:
// Two variations on sidebar (the progress view) // Two variations on sidebar (the progress view)
QWidget* getWidgetSidebar( int desiredWidth ); QWidget* getWidgetSidebar( QWidget* parent, int desiredWidth );
QWidget* getQmlSidebar( int desiredWidth ); QWidget* getQmlSidebar( QWidget* parent, int desiredWidth );
// Two variations on navigation (buttons at bottom) // Two variations on navigation (buttons at bottom)
QWidget* getWidgetNavigation(); QWidget* getWidgetNavigation( QWidget* parent );
QWidget* getQmlNavigation(); QWidget* getQmlNavigation( QWidget* parent );
QPointer< Calamares::DebugWindow > m_debugWindow; // Managed by self QPointer< Calamares::DebugWindow > m_debugWindow; // Managed by self
Calamares::ViewManager* m_viewManager; Calamares::ViewManager* m_viewManager;

View File

@ -193,7 +193,7 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent )
{ QStringLiteral( "VARIANT" ), relInfo.variant() }, { QStringLiteral( "VARIANT" ), relInfo.variant() },
{ QStringLiteral( "VARIANT_ID" ), relInfo.variantId() }, { QStringLiteral( "VARIANT_ID" ), relInfo.variantId() },
{ QStringLiteral( "LOGO" ), relInfo.logo() } } }; { QStringLiteral( "LOGO" ), relInfo.logo() } } };
auto expand = [&]( const QString& s ) -> QString { auto expand = [ & ]( const QString& s ) -> QString {
return KMacroExpander::expandMacros( s, relMap, QLatin1Char( '@' ) ); return KMacroExpander::expandMacros( s, relMap, QLatin1Char( '@' ) );
}; };
#else #else
@ -203,7 +203,7 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent )
// Massage the strings, images and style sections. // Massage the strings, images and style sections.
loadStrings( m_strings, doc, "strings", expand ); loadStrings( m_strings, doc, "strings", expand );
loadStrings( m_images, doc, "images", [&]( const QString& s ) -> QString { loadStrings( m_images, doc, "images", [ & ]( const QString& s ) -> QString {
// See also image() // See also image()
const QString imageName( expand( s ) ); const QString imageName( expand( s ) );
QFileInfo imageFi( componentDir.absoluteFilePath( imageName ) ); QFileInfo imageFi( componentDir.absoluteFilePath( imageName ) );
@ -359,11 +359,10 @@ Branding::image( const QString& imageName, const QSize& size ) const
return ImageRegistry::instance()->pixmap( imageFi.absoluteFilePath(), size ); return ImageRegistry::instance()->pixmap( imageFi.absoluteFilePath(), size );
} }
QString static QString
Branding::stylesheet() const _stylesheet( const QDir& dir )
{ {
QFileInfo fi( m_descriptorPath ); QFileInfo importQSSPath( dir.filePath( "stylesheet.qss" ) );
QFileInfo importQSSPath( fi.absoluteDir().filePath( "stylesheet.qss" ) );
if ( importQSSPath.exists() && importQSSPath.isReadable() ) if ( importQSSPath.exists() && importQSSPath.isReadable() )
{ {
QFile stylesheetFile( importQSSPath.filePath() ); QFile stylesheetFile( importQSSPath.filePath() );
@ -372,11 +371,17 @@ Branding::stylesheet() const
} }
else else
{ {
cWarning() << "The branding component" << fi.absoluteDir().absolutePath() << "does not ship stylesheet.qss."; cWarning() << "The branding component" << dir.absolutePath() << "does not ship stylesheet.qss.";
} }
return QString(); return QString();
} }
QString
Branding::stylesheet() const
{
return _stylesheet( QFileInfo( m_descriptorPath ).absoluteDir() );
}
void void
Branding::setGlobals( GlobalStorage* globalStorage ) const Branding::setGlobals( GlobalStorage* globalStorage ) const
{ {
@ -538,7 +543,7 @@ Branding::initSimpleSettings( const YAML::Node& doc )
[[noreturn]] void [[noreturn]] void
Branding::bail( const QString& message ) Branding::bail( const QString& message )
{ {
cError() << "FATAL in" << m_descriptorPath << Logger::Continuation << Logger::NoQuote{} << message; cError() << "FATAL in" << m_descriptorPath << Logger::Continuation << Logger::NoQuote {} << message;
::exit( EXIT_FAILURE ); ::exit( EXIT_FAILURE );
} }

View File

@ -250,7 +250,8 @@ private:
}; };
template < typename U > template < typename U >
inline QString operator*( U e ) inline QString
operator*( U e )
{ {
return Branding::instance()->string( e ); return Branding::instance()->string( e );
} }

View File

@ -71,9 +71,11 @@ ViewManager::ViewManager( QObject* parent )
Q_ASSERT( !s_instance ); Q_ASSERT( !s_instance );
QBoxLayout* mainLayout = new QVBoxLayout; QBoxLayout* mainLayout = new QVBoxLayout;
m_widget->setObjectName( "viewManager" );
m_widget->setLayout( mainLayout ); m_widget->setLayout( mainLayout );
m_stack = new QStackedWidget( m_widget ); m_stack = new QStackedWidget( m_widget );
m_stack->setObjectName( "viewManagerStack" );
m_stack->setContentsMargins( 0, 0, 0, 0 ); m_stack->setContentsMargins( 0, 0, 0, 0 );
mainLayout->addWidget( m_stack ); mainLayout->addWidget( m_stack );
@ -181,7 +183,7 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail
msgBox->show(); msgBox->show();
cDebug() << "Calamares will quit when the dialog closes."; cDebug() << "Calamares will quit when the dialog closes.";
connect( msgBox, &QMessageBox::buttonClicked, [msgBox]( QAbstractButton* button ) { connect( msgBox, &QMessageBox::buttonClicked, [ msgBox ]( QAbstractButton* button ) {
if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole ) if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole )
{ {
// TODO: host and port should be configurable // TODO: host and port should be configurable

View File

@ -2,41 +2,41 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-07 22:12+0200\n" "POT-Creation-Date: 2020-04-30 23:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: \n"
#: src/modules/dummypythonqt/main.py:84 #: src/modules/dummypythonqt/main.py:84
msgid "Click me!" msgid "Click me!"
msgstr "Click me!" msgstr ""
#: src/modules/dummypythonqt/main.py:94 #: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel." msgid "A new QLabel."
msgstr "A new QLabel." msgstr ""
#: src/modules/dummypythonqt/main.py:97 #: src/modules/dummypythonqt/main.py:97
msgid "Dummy PythonQt ViewStep" msgid "Dummy PythonQt ViewStep"
msgstr "Dummy PythonQt ViewStep" msgstr ""
#: src/modules/dummypythonqt/main.py:183 #: src/modules/dummypythonqt/main.py:183
msgid "The Dummy PythonQt Job" msgid "The Dummy PythonQt Job"
msgstr "The Dummy PythonQt Job" msgstr ""
#: src/modules/dummypythonqt/main.py:186 #: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}" msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "This is the Dummy PythonQt Job. The dummy job says: {}" msgstr ""
#: src/modules/dummypythonqt/main.py:190 #: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job." msgid "A status message for Dummy PythonQt Job."
msgstr "A status message for Dummy PythonQt Job." msgstr ""

View File

@ -4,16 +4,16 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
# Translators: # Translators:
# Besnik <besnik@programeshqip.org>, 2017 # Besnik Bleta <besnik@programeshqip.org>, 2017
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-05 11:34-0400\n" "POT-Creation-Date: 2020-04-15 13:39+0200\n"
"PO-Revision-Date: 2016-12-16 12:18+0000\n" "PO-Revision-Date: 2016-12-16 12:18+0000\n"
"Last-Translator: Besnik <besnik@programeshqip.org>, 2017\n" "Last-Translator: Besnik Bleta <besnik@programeshqip.org>, 2017\n"
"Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n" "Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"

View File

@ -191,12 +191,6 @@ Config::setIsNextEnabled( bool isNextEnabled )
emit isNextEnabledChanged( m_isNextEnabled ); emit isNextEnabledChanged( m_isNextEnabled );
} }
QString
Config::donateUrl() const
{
return m_donateUrl;
}
void void
Config::setDonateUrl( const QString& url ) Config::setDonateUrl( const QString& url )
{ {
@ -204,12 +198,6 @@ Config::setDonateUrl( const QString& url )
emit donateUrlChanged(); emit donateUrlChanged();
} }
QString
Config::knownIssuesUrl() const
{
return m_knownIssuesUrl;
}
void void
Config::setKnownIssuesUrl( const QString& url ) Config::setKnownIssuesUrl( const QString& url )
{ {
@ -224,18 +212,6 @@ Config::setReleaseNotesUrl( const QString& url )
emit releaseNotesUrlChanged(); emit releaseNotesUrlChanged();
} }
QString
Config::releaseNotesUrl() const
{
return m_releaseNotesUrl;
}
QString
Config::supportUrl() const
{
return m_supportUrl;
}
void void
Config::setSupportUrl( const QString& url ) Config::setSupportUrl( const QString& url )
{ {

View File

@ -59,19 +59,19 @@ public:
void setIsNextEnabled( bool isNextEnabled ); void setIsNextEnabled( bool isNextEnabled );
void setLocaleIndex( int index );
int localeIndex() const { return m_localeIndex; } int localeIndex() const { return m_localeIndex; }
void setLocaleIndex( int index );
QString supportUrl() const; QString supportUrl() const { return m_supportUrl; }
void setSupportUrl( const QString& url ); void setSupportUrl( const QString& url );
QString knownIssuesUrl() const; QString knownIssuesUrl() const { return m_knownIssuesUrl; }
void setKnownIssuesUrl( const QString& url ); void setKnownIssuesUrl( const QString& url );
QString releaseNotesUrl() const; QString releaseNotesUrl() const { return m_releaseNotesUrl; }
void setReleaseNotesUrl( const QString& url ); void setReleaseNotesUrl( const QString& url );
QString donateUrl() const; QString donateUrl() const { return m_donateUrl; }
void setDonateUrl( const QString& url ); void setDonateUrl( const QString& url );
QString genericWelcomeMessage() const; QString genericWelcomeMessage() const;

View File

@ -72,14 +72,14 @@ Page
icon.name: "dialog-information" icon.name: "dialog-information"
Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4)
Kirigami.Theme.textColor: Kirigami.Theme.textColor Kirigami.Theme.textColor: Kirigami.Theme.textColor
visible: true visible: true
onClicked: { onClicked: {
//onClicked: load.source = "file:/usr/share/calamares/branding/default/show.qml" //onClicked: load.source = "file:/usr/share/calamares/branding/default/show.qml"
onClicked: load.source = "about.qml" onClicked: load.source = "about.qml"
} }
} }
Button { Button {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Support") text: qsTr("Support")
@ -90,7 +90,7 @@ Page
visible: config.supportUrl !== "" visible: config.supportUrl !== ""
onClicked: Qt.openUrlExternally(config.supportUrl) onClicked: Qt.openUrlExternally(config.supportUrl)
} }
Button { Button {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Known issues") text: qsTr("Known issues")
@ -101,7 +101,7 @@ Page
visible: config.knownIssuesUrl !== "" visible: config.knownIssuesUrl !== ""
onClicked: Qt.openUrlExternally(config.knownIssuesUrl) onClicked: Qt.openUrlExternally(config.knownIssuesUrl)
} }
Button { Button {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Release notes") text: qsTr("Release notes")
@ -113,7 +113,7 @@ Page
onClicked: load.source = "release_notes.qml" onClicked: load.source = "release_notes.qml"
//onClicked: load.source = "file:/usr/share/calamares/release_notes.qml" //onClicked: load.source = "file:/usr/share/calamares/release_notes.qml"
} }
Button { Button {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Donate") text: qsTr("Donate")
@ -125,17 +125,17 @@ Page
onClicked: Qt.openUrlExternally(config.donateUrl) onClicked: Qt.openUrlExternally(config.donateUrl)
} }
} }
RowLayout { RowLayout {
id: languageBar id: languageBar
width: parent.width /1.2 width: parent.width /1.2
height: 48 height: 48
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: parent.height /7 anchors.bottomMargin: parent.height /7
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
spacing: Kirigami.Units.largeSpacing* 4 spacing: Kirigami.Units.largeSpacing* 4
Rectangle { Rectangle {
width: parent.width width: parent.width
Layout.fillWidth: true Layout.fillWidth: true
@ -146,21 +146,21 @@ Page
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: "img/language-icon-48px.png" source: "img/language-icon-48px.png"
} }
ComboBox { ComboBox {
id: languages id: languages
anchors.left: image.right anchors.left: image.right
width: languageBar.width /1.1 width: languageBar.width /1.1
textRole: "label" textRole: "label"
currentIndex: 4 //model.currentIndex currentIndex: config.localeIndex
model: config.languagesModel model: config.languagesModel
onCurrentIndexChanged: console.debug(currentText, currentIndex) onCurrentIndexChanged: config.localeIndex = currentIndex
} }
} }
} }
Loader { Loader {
id:load id:load
anchors.fill: parent anchors.fill: parent
} }
} }