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

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

Browse Source
This commit is contained in:
Philip 2017-10-15 14:07:39 -04:00
commit 69c0125db5
42 changed files with 733 additions and 547 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -50,7 +50,7 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
# Clang warnings: doing *everything* is counter-productive, since it warns
# about things which we can't fix (e.g. C++98 incompatibilities, but
# Calaares is C++14).
# Calamares is C++14).
foreach( CLANG_WARNINGS
-Weverything
-Wno-c++98-compat
@ -88,6 +88,8 @@ else()
set( SUPPRESS_BOOST_WARNINGS "" )
endif()
# Use mark_thirdparty_code() to reduce warnings from the compiler
# on code that we're not going to fix. Call this with a list of files.
macro(mark_thirdparty_code)
set_source_files_properties( ${ARGV}
PROPERTIES
@ -265,11 +267,8 @@ else()
endif()
# Doesn't list mksquashfs as an optional dep, though, because it
# hasn't been sent through the find_package() scheme.
set_package_properties( mksquashfs PROPERTIES
DESCRIPTION "Create squashed filesystems"
URL "http://tldp.org/HOWTO/SquashFS-HOWTO/creatingandusing.html"
PURPOSE "Create example distro"
TYPE OPTIONAL
add_feature_info( mksquashfs mksquashfs_FOUND
"Create squashed filesystems for the example distro"
)
# add_subdirectory( thirdparty )

19
CMakeModules/CalamaresAddModuleSubdirectory.cmake
View File

@ -6,9 +6,12 @@ set( MODULE_DATA_DESTINATION share/calamares/modules )
function( calamares_add_module_subdirectory )
set( SUBDIRECTORY ${ARGV0} )
set( MODULE_CONFIG_FILES "" )
# If this subdirectory has a CMakeLists.txt, we add_subdirectory it...
if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt" )
add_subdirectory( ${SUBDIRECTORY} )
file( GLOB MODULE_CONFIG_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY} "${SUBDIRECTORY}/*.conf" )
# ...otherwise, we look for a module.desc.
elseif( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/module.desc" )
set( MODULES_DIR ${CMAKE_INSTALL_LIBDIR}/calamares/modules )
@ -56,9 +59,23 @@ function( calamares_add_module_subdirectory )
RENAME calamares-${SUBDIRECTORY}.mo
)
endif()
else()
message( "-- ${BoldYellow}Warning:${ColorReset} tried to add module subdirectory ${BoldRed}${SUBDIRECTORY}${ColorReset} which has no CMakeLists.txt or module.desc." )
message( "" )
endif()
# Check any config files for basic correctness
if ( BUILD_TESTING AND MODULE_CONFIG_FILES )
set( _count 0 )
foreach( _config_file ${MODULE_CONFIG_FILES} )
set( _count_str "-${_count}" )
if ( _count EQUAL 0 )
set( _count_str "" )
endif()
add_test(
NAME config-${SUBDIRECTORY}${_count_str}
COMMAND test_conf ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/${_config_file} )
math( EXPR _count "${_count} + 1" )
endforeach()
endif()
endfunction()

8
calamares.desktop
View File

@ -67,6 +67,10 @@ Name[lt]=Calamares
Icon[lt]=calamares
GenericName[lt]=Sistemos diegimas į kompiuterį
Comment[lt]=Calamares — sistemos diegyklė
Name[nb]=Calamares
Icon[nb]=calamares
GenericName[nb]=Systeminstallatør
Comment[nb]=Calamares-systeminstallatør
Name[nl]=Calamares
Icon[nl]=calamares
GenericName[nl]=Installatieprogramma
@ -81,8 +85,8 @@ GenericName[pt_BR]=Instalador de Sistema
Comment[pt_BR]=Calamares — Instalador de Sistema
Name[cs_CZ]=Calamares
Icon[cs_CZ]=calamares
GenericName[cs_CZ]=Instalační program systému
Comment[cs_CZ]=Calamares - instalační program systému
GenericName[cs_CZ]=Instalátor systému
Comment[cs_CZ]=Calamares – instalátor operačních systémů
Name[ru]=Calamares
Icon[ru]=calamares
GenericName[ru]=Установщик системы

33
ci/RELEASE.md
View File

@ -2,7 +2,9 @@ The Calamares release process
=============================
#### (0) A week in advance
* Run [Coverity scan][coverity], fix what's relevant. The Coverity scan runs
* (Only releases from master)
Run [Coverity scan][coverity], fix what's relevant. The Coverity scan runs
automatically once a week on master.
* Build with clang -Weverything, fix what's relevant.
```
@ -16,8 +18,10 @@ The Calamares release process
```
Note that *all* means all-that-make-sense. The partition-manager tests need
an additional environment variable to be set for some tests, which will
destroy an attached disk. This is not always desirable.
* Notify [translators][transifex]. In the dashboard there is an *Announcements*
destroy an attached disk. This is not always desirable. There are some
sample config-files that are empty and which fail the config-tests.
* (Only releases from master)
Notify [translators][transifex]. In the dashboard there is an *Announcements*
link that you can use to send a translation announcement.
[coverity]: https://scan.coverity.com/projects/calamares-calamares?tab=overview
@ -27,17 +31,24 @@ The Calamares release process
* Bump version in `CMakeLists.txt`, *CALAMARES_VERSION* variables, and set
RC to a non-zero value (e.g. doing -rc1, -rc2, ...). Push that.
* Check `README.md` and everything in `hacking`, make sure it's all still
relevant. Run `hacking/calamaresstyle` to check the C++ code style.
Python code is checked as part of the Travis CI builds.
* Check `README.md` and everything `ci/HACKING.md`, make sure it's all still
relevant. Run `ci/calamaresstyle` to check the C++ code style.
Run pycodestyle on recently-modified Python modules, fix what makes sense.
* Check defaults in `settings.conf` and other configuration files.
* Pull latest translations from Transifex. This is done nightly on Jenkins,
so a manual pull is rarely necessary.
* Update the list of enabled translation languages in `CMakeLists.txt`.
* (Only releases from master)
Pull latest translations from Transifex. We only push / pull translations
from master, so longer-lived branches (e.g. 3.1.x) don't get translation
updates. This is to keep the translation workflow simple.
```
sh ci/txpull.sh
```
* (Only releases from master)
Update the list of enabled translation languages in `CMakeLists.txt`.
Check the [translation site][transifex] for the list of languages with
fairly complete translations.
#### (2) Tarball
* Create tarball: `git-archive-all -v calamares-1.1-rc1.tar.gz` or without
the helper script,
```
@ -45,9 +56,10 @@ The Calamares release process
git archive -o $V.tar.gz --prefix $V/ master
```
Double check that the tarball matches the version number.
* Test tarball.
* Test tarball (e.g. unpack somewhere else and run the tests from step 0).
#### (3) Tag
* Set RC to zero in `CMakeLists.txt` if this is the actual release.
* `git tag -s v1.1.0` Make sure the signing key is known in GitHub, so that the
tag is shown as a verified tag. Do not sign -rc tags.
@ -57,6 +69,7 @@ The Calamares release process
* Write release article.
#### (4) Release day
* Publish tarball.
* Update download page.
* Publish release article on `calamares.io`.

4
lang/calamares_ca.ts
View File

@ -2225,12 +2225,12 @@ L&apos;instal·lador es tancarà i tots els canvis es perdran.</translation>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="494"/>
<source>Password is too short</source>
<translation type="unfinished"/>
<translation>La contrasenya és massa curta.</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="513"/>
<source>Password is too long</source>
<translation type="unfinished"/>
<translation>La contrasenya és massa llarga.</translation>
</message>
</context>
<context>

444
lang/calamares_cs_CZ.ts
View File

File diff suppressed because it is too large Load Diff

12
lang/calamares_da.ts
View File

@ -631,7 +631,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="73"/>
<source>Creating new %1 partition on %2.</source>
<translation>Opretter ny %1 partition på %2.</translation>
<translation>Opretter ny %1-partition på %2.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="85"/>
@ -692,12 +692,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="50"/>
<source>Create new %1 partition table on %2.</source>
<translation>Opret en ny %1 partitionstabel på %2.</translation>
<translation>Opret en ny %1-partitionstabel på %2.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="57"/>
<source>Create new &lt;strong&gt;%1&lt;/strong&gt; partition table on &lt;strong&gt;%2&lt;/strong&gt; (%3).</source>
<translation>Opret en ny &lt;strong&gt;%1&lt;/strong&gt; partitionstabel på &lt;strong&gt;%2&lt;/strong&gt; (%3).</translation>
<translation>Opret en ny &lt;strong&gt;%1&lt;/strong&gt;-partitionstabel på &lt;strong&gt;%2&lt;/strong&gt; (%3).</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="67"/>
@ -984,7 +984,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="191"/>
<source>Install %1 on &lt;strong&gt;new&lt;/strong&gt; %2 system partition.</source>
<translation>Installér %1 på &lt;strong&gt;nye&lt;/strong&gt; %2-systempartition.</translation>
<translation>Installér %1 på &lt;strong&gt;ny&lt;/strong&gt; %2-systempartition.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="195"/>
@ -2225,12 +2225,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="494"/>
<source>Password is too short</source>
<translation type="unfinished"/>
<translation>Adgangskoden er for kort</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="513"/>
<source>Password is too long</source>
<translation type="unfinished"/>
<translation>Adgangskoden er for lang</translation>
</message>
</context>
<context>

4
lang/calamares_fr.ts
View File

@ -2225,12 +2225,12 @@ L&apos;installateur se fermera et les changements seront perdus.</translation>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="494"/>
<source>Password is too short</source>
<translation type="unfinished"/>
<translation>Le mot de passe est trop court</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="513"/>
<source>Password is too long</source>
<translation type="unfinished"/>
<translation>Le mot de passe est trop long</translation>
</message>
</context>
<context>

66
lang/calamares_gl.ts
View File

@ -1254,39 +1254,39 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<message>
<location filename="../src/modules/locale/LocalePage.cpp" line="387"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
<translation>A linguaxe do sistema será establecida a %1.</translation>
</message>
<message>
<location filename="../src/modules/locale/LocalePage.cpp" line="389"/>
<source>The numbers and dates locale will be set to %1.</source>
<translation type="unfinished"/>
<translation>A localización de números e datas será establecida a %1.</translation>
</message>
<message>
<location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
<source>Region:</source>
<translation type="unfinished"/>
<translation>Rexión:</translation>
</message>
<message>
<location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
<source>Zone:</source>
<translation type="unfinished"/>
<translation>Zona:</translation>
</message>
<message>
<location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
<location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
<source>&amp;Change...</source>
<translation type="unfinished"/>
<translation>&amp;Cambio...</translation>
</message>
<message>
<location filename="../src/modules/locale/LocalePage.cpp" line="398"/>
<source>Set timezone to %1/%2.&lt;br/&gt;</source>
<translation type="unfinished"/>
<translation>Establecer a zona de tempo a %1/%2.&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/modules/locale/LocalePage.cpp" line="480"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
<translation>%1 (%2)</translation>
</message>
</context>
<context>
@ -1294,12 +1294,12 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<message>
<location filename="../src/modules/locale/LocaleViewStep.cpp" line="52"/>
<source>Loading location data...</source>
<translation type="unfinished"/>
<translation>Cargando datos de localización...</translation>
</message>
<message>
<location filename="../src/modules/locale/LocaleViewStep.cpp" line="169"/>
<source>Location</source>
<translation type="unfinished"/>
<translation>Localización...</translation>
</message>
</context>
<context>
@ -1307,48 +1307,48 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="66"/>
<source>Move file system of partition %1.</source>
<translation type="unfinished"/>
<translation>Move-lo sistema de ficheiro da partición %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="80"/>
<source>Could not open file system on partition %1 for moving.</source>
<translation type="unfinished"/>
<translation>Non foi posible abri-lo sistema de ficheiros na partición %1 para move-lo.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="86"/>
<source>Could not create target for moving file system on partition %1.</source>
<translation type="unfinished"/>
<translation>Non foi posible crea-lo destino para move-lo sistema de ficheiros na partición %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="95"/>
<source>Moving of partition %1 failed, changes have been rolled back.</source>
<translation type="unfinished"/>
<translation>Fallou move-la partición %1, desfixeronse os cambios.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="101"/>
<source>Moving of partition %1 failed. Roll back of the changes have failed.</source>
<translation type="unfinished"/>
<translation>Fallou move-la partición %1. Non se pudo desface-los cambios.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="113"/>
<source>Updating boot sector after the moving of partition %1 failed.</source>
<translation type="unfinished"/>
<translation>Actualizando o sector de arranque tra-lo fallo do movimento da partición %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="127"/>
<source>The logical sector sizes in the source and target for copying are not the same. This is currently unsupported.</source>
<translation type="unfinished"/>
<translation>O tamaño do sector lóxico na orixe e no destino para a copia non é o mesmo. Actualmente non é posible face-lo.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="201"/>
<source>Source and target for copying do not overlap: Rollback is not required.</source>
<translation type="unfinished"/>
<translation>Orixe e destino para copia non se superpoñen: Non cómpre desfacer.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="225"/>
<location filename="../src/modules/partition/jobs/MoveFileSystemJob.cpp" line="233"/>
<source>Could not open device %1 to rollback copying.</source>
<translation type="unfinished"/>
<translation>Non se pudo abrir o dispositivo %1 para copia de respaldo.</translation>
</message>
</context>
<context>
@ -1356,18 +1356,18 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<message>
<location filename="../src/modules/netinstall/NetInstallPage.cpp" line="79"/>
<source>Name</source>
<translation type="unfinished"/>
<translation>Nome</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallPage.cpp" line="80"/>
<source>Description</source>
<translation type="unfinished"/>
<translation>Descripción</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallPage.cpp" line="97"/>
<location filename="../src/modules/netinstall/NetInstallPage.cpp" line="104"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
<translation>Installación por rede. (Desactivadas. Non se pudo recupera-la lista de pacotes, comprobe a sua conexión a rede)</translation>
</message>
</context>
<context>
@ -1375,7 +1375,7 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="51"/>
<source>Package selection</source>
<translation type="unfinished"/>
<translation>Selección de pacotes.</translation>
</message>
</context>
<context>
@ -1388,12 +1388,12 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<message>
<location filename="../src/modules/keyboard/KeyboardPage.ui" line="70"/>
<source>Keyboard Model:</source>
<translation type="unfinished"/>
<translation>Modelo de teclado.</translation>
</message>
<message>
<location filename="../src/modules/keyboard/KeyboardPage.ui" line="131"/>
<source>Type here to test your keyboard</source>
<translation type="unfinished"/>
<translation>Teclee aquí para comproba-lo seu teclado.</translation>
</message>
</context>
<context>
@ -1406,49 +1406,49 @@ O instalador pecharase e perderanse todos os cambios.</translation>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="36"/>
<source>What is your name?</source>
<translation type="unfinished"/>
<translation>Cal é o seu nome?</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="117"/>
<source>What name do you want to use to log in?</source>
<translation type="unfinished"/>
<translation>Cal é o nome que quere usar para entrar?</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="306"/>
<location filename="../src/modules/users/page_usersetup.ui" line="437"/>
<location filename="../src/modules/users/page_usersetup.ui" line="582"/>
<source>font-weight: normal</source>
<translation type="unfinished"/>
<translation>Tamaño de letra: normal</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="200"/>
<source>&lt;small&gt;If more than one person will use this computer, you can set up multiple accounts after installation.&lt;/small&gt;</source>
<translation type="unfinished"/>
<translation>&lt;small&gt;Se máis dunha persoa vai usa-lo computador, pode configurar contas múltiples trala instalción.&lt;/small&gt;</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="335"/>
<source>Choose a password to keep your account safe.</source>
<translation type="unfinished"/>
<translation>Escolla un contrasinal para mante-la sua conta segura.</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="440"/>
<source>&lt;small&gt;Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.&lt;/small&gt;</source>
<translation type="unfinished"/>
<translation>&lt;small&gt;Entre o mesmo contrasinal dúas veces, deste xeito podese comprobar errores ó teclear. Un bo contrasinal debe conter un conxunto de letras, números e signos de puntuación, deberá ter como mínimo oito carácteres, e debe cambiarse a intervalos de tempo regulares.&lt;/small&gt;</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="226"/>
<source>What is the name of this computer?</source>
<translation type="unfinished"/>
<translation>Cal é o nome deste computador?</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="309"/>
<source>&lt;small&gt;This name will be used if you make the computer visible to others on a network.&lt;/small&gt;</source>
<translation type="unfinished"/>
<translation>&lt;small&gt;Este nome usarase se fai o computador visible para outros nunha rede.&lt;/small&gt;</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="450"/>
<source>Log in automatically without asking for the password.</source>
<translation type="unfinished"/>
<translation>Entrar automáticamente sen preguntar polo contrasinal.</translation>
</message>
<message>
<location filename="../src/modules/users/page_usersetup.ui" line="457"/>

4
lang/calamares_he.ts
View File

@ -2225,12 +2225,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="494"/>
<source>Password is too short</source>
<translation type="unfinished"/>
<translation>הסיסמה קצרה מדי</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="513"/>
<source>Password is too long</source>
<translation type="unfinished"/>
<translation>הסיסמה ארוכה מדי</translation>
</message>
</context>
<context>

4
lang/calamares_hr.ts
View File

@ -2225,12 +2225,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="494"/>
<source>Password is too short</source>
<translation type="unfinished"/>
<translation>Lozinka je prekratka</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="513"/>
<source>Password is too long</source>
<translation type="unfinished"/>
<translation>Lozinka je preduga</translation>
</message>
</context>
<context>

4
lang/calamares_lt.ts
View File

@ -2225,12 +2225,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="494"/>
<source>Password is too short</source>
<translation type="unfinished"/>
<translation>Slaptažodis yra per trumpas</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="513"/>
<source>Password is too long</source>
<translation type="unfinished"/>
<translation>Slaptažodis yra per ilgas</translation>
</message>
</context>
<context>

132
lang/calamares_mr.ts
View File

@ -37,12 +37,12 @@
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="111"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
<translation>आरंभ सूचक अधिष्ठापित करु नका</translation>
</message>
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="125"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
<translation>%1 (%2)</translation>
</message>
</context>
<context>
@ -115,12 +115,12 @@
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="51"/>
<source>Run command %1 %2</source>
<translation type="unfinished"/>
<translation>%1 %2 आज्ञा चालवा</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="60"/>
<source>Running command %1 %2</source>
<translation type="unfinished"/>
<translation>%1 %2 आज्ञा चालवला जातोय</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="89"/>
@ -137,17 +137,17 @@ Output:
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="95"/>
<source>External command failed to start</source>
<translation type="unfinished"/>
<translation>बाह्य आज्ञा सुरु करण्यात अपयश</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="96"/>
<source>Command %1 failed to start.</source>
<translation type="unfinished"/>
<translation>%1 आज्ञा सुरु करण्यात अपयश</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="100"/>
<source>Internal error when starting command</source>
<translation type="unfinished"/>
<translation>आज्ञा सुरु करताना अंतर्गत त्रुटी</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="101"/>
@ -157,26 +157,30 @@ Output:
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="104"/>
<source>External command failed to finish</source>
<translation type="unfinished"/>
<translation>बाह्य आज्ञा पूर्ण करताना अपयश</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="105"/>
<source>Command %1 failed to finish in %2s.
Output:
%3</source>
<translation type="unfinished"/>
<translation>%1 ही आज्ञा %2s मधे पूर्ण करताना अपयश.
आउटपुट :
%3</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="111"/>
<source>External command finished with errors</source>
<translation type="unfinished"/>
<translation>बाह्य आज्ञा त्रुट्यांसहित पूर्ण झाली</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="112"/>
<source>Command %1 finished with exit code %2.
Output:
%3</source>
<translation type="unfinished"/>
<translation>%1 ही आज्ञा %2 या निर्गम कोडसहित पूर्ण झाली.
आउटपुट :
%3</translation>
</message>
</context>
<context>
@ -184,7 +188,7 @@ Output:
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="265"/>
<source>Running %1 operation.</source>
<translation type="unfinished"/>
<translation>%1 क्रिया चालवला जातोय</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="280"/>
@ -217,29 +221,29 @@ Output:
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="73"/>
<source>&amp;Back</source>
<translation type="unfinished"/>
<translation>&amp;मागे</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="74"/>
<source>&amp;Next</source>
<translation type="unfinished"/>
<translation>&amp;पुढे</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="75"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/>
<source>&amp;Cancel</source>
<translation type="unfinished"/>
<translation>&amp;रद्द करा</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="76"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="301"/>
<source>Cancel installation without changing the system.</source>
<translation type="unfinished"/>
<translation>प्रणालीत बदल न करता अधिष्टापना रद्द करा.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="99"/>
<source>Cancel installation?</source>
<translation type="unfinished"/>
<translation>अधिष्ठापना रद्द करायचे?</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="100"/>
@ -250,17 +254,17 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="105"/>
<source>&amp;Yes</source>
<translation type="unfinished"/>
<translation>&amp;होय</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="106"/>
<source>&amp;No</source>
<translation type="unfinished"/>
<translation>&amp;नाही</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="183"/>
<source>&amp;Close</source>
<translation type="unfinished"/>
<translation>&amp;बंद करा</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="233"/>
@ -275,32 +279,32 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="239"/>
<source>&amp;Install now</source>
<translation type="unfinished"/>
<translation>&amp;आता अधिष्ठापित करा</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="240"/>
<source>Go &amp;back</source>
<translation type="unfinished"/>
<translation>&amp;मागे जा</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="269"/>
<source>&amp;Done</source>
<translation type="unfinished"/>
<translation>&amp;पूर्ण झाली</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="270"/>
<source>The installation is complete. Close the installer.</source>
<translation type="unfinished"/>
<translation>अधिष्ठापना संपूर्ण झाली. अधिष्ठापक बंद करा.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="180"/>
<source>Error</source>
<translation type="unfinished"/>
<translation>त्रुटी</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="181"/>
<source>Installation Failed</source>
<translation type="unfinished"/>
<translation>अधिष्ठापना अयशस्वी झाली</translation>
</message>
</context>
<context>
@ -331,7 +335,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="45"/>
<source>%1 Installer</source>
<translation type="unfinished"/>
<translation>%1 अधिष्ठापक</translation>
</message>
<message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="112"/>
@ -344,12 +348,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CheckFileSystemJob.cpp" line="39"/>
<source>Checking file system on partition %1.</source>
<translation type="unfinished"/>
<translation>%1 या विभाजनावरील फाइल प्रणाली तपासत आहे.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CheckFileSystemJob.cpp" line="77"/>
<source>The file system check on partition %1 failed.</source>
<translation type="unfinished"/>
<translation>%1 या विभाजनावरील प्रणाली विफल झाली.</translation>
</message>
</context>
<context>
@ -377,7 +381,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="202"/>
<source>System requirements</source>
<translation type="unfinished"/>
<translation>प्रणालीची आवशक्यता</translation>
</message>
</context>
<context>
@ -418,7 +422,7 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="950"/>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1029"/>
<source>Current:</source>
<translation type="unfinished"/>
<translation>सद्या :</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/ChoicePage.cpp" line="775"/>
@ -541,7 +545,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="14"/>
<source>Create a Partition</source>
<translation type="unfinished"/>
<translation>विभाजन निर्माण करा</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="48"/>
@ -551,12 +555,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="55"/>
<source>Partition &amp;Type:</source>
<translation type="unfinished"/>
<translation>विभाजन &amp;प्रकार :</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="67"/>
<source>&amp;Primary</source>
<translation type="unfinished"/>
<translation>&amp;प्राथमिक</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="77"/>
@ -591,12 +595,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="162"/>
<source>Logical</source>
<translation type="unfinished"/>
<translation>तार्किक</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="167"/>
<source>Primary</source>
<translation type="unfinished"/>
<translation>प्राथमिक</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="184"/>
@ -624,7 +628,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="73"/>
<source>Creating new %1 partition on %2.</source>
<translation type="unfinished"/>
<translation>%2 वर %1 हे नवीन विभाजन निर्माण करत आहे</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="85"/>
@ -657,7 +661,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="20"/>
<source>Create Partition Table</source>
<translation type="unfinished"/>
<translation>विभाजन कोष्टक निर्माण करा</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="39"/>
@ -1935,7 +1939,7 @@ The installer will quit and all changes will be lost.</source>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="61"/>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="68"/>
<source>Internal Error</source>
<translation type="unfinished"/>
<translation>अंतर्गत त्रूटी </translation>
</message>
<message>
<location filename="../src/modules/users/SetHostNameJob.cpp" line="75"/>
@ -2133,7 +2137,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="43"/>
<source>Set timezone to %1/%2</source>
<translation type="unfinished"/>
<translation>%1/%2 हा वेळक्षेत्र निश्चित करा</translation>
</message>
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="71"/>
@ -2148,7 +2152,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="86"/>
<source>Cannot set timezone.</source>
<translation type="unfinished"/>
<translation>वेळक्षेत्र निश्चित करु शकत नाही</translation>
</message>
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="87"/>
@ -2158,12 +2162,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="96"/>
<source>Cannot set timezone,</source>
<translation type="unfinished"/>
<translation>वेळक्षेत्र निश्चित करु शकत नाही,</translation>
</message>
<message>
<location filename="../src/modules/locale/SetTimezoneJob.cpp" line="97"/>
<source>Cannot open /etc/timezone for writing</source>
<translation type="unfinished"/>
<translation> /etc/timezone लिहिण्याकरिता उघडू शकत नाही</translation>
</message>
</context>
<context>
@ -2179,7 +2183,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/summary/SummaryViewStep.cpp" line="43"/>
<source>Summary</source>
<translation type="unfinished"/>
<translation>सारांश</translation>
</message>
</context>
<context>
@ -2187,43 +2191,43 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="287"/>
<source>Your username is too long.</source>
<translation type="unfinished"/>
<translation>तुमचा वापरकर्तानाव खूप लांब आहे</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="293"/>
<source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
<translation type="unfinished"/>
<translation>तुमच्या वापरकर्तानावात अवैध अक्षरे आहेत. फक्त अक्षरे, अंक आणि डॅश स्वीकारले जातील.</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="331"/>
<source>Your hostname is too short.</source>
<translation type="unfinished"/>
<translation>तुमचा संगणकनाव खूप लहान आहे</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="337"/>
<source>Your hostname is too long.</source>
<translation type="unfinished"/>
<translation>तुमचा संगणकनाव खूप लांब आहे</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="343"/>
<source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
<translation type="unfinished"/>
<translation>तुमच्या संगणकनावात अवैध अक्षरे आहेत. फक्त अक्षरे, अंक आणि डॅश स्वीकारले जातील.</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="371"/>
<location filename="../src/modules/users/UsersPage.cpp" line="415"/>
<source>Your passwords do not match!</source>
<translation type="unfinished"/>
<translation>तुमचा परवलीशब्द जुळत नाही</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="494"/>
<source>Password is too short</source>
<translation type="unfinished"/>
<translation>परवलीशब्द खूप लहान आहे</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="513"/>
<source>Password is too long</source>
<translation type="unfinished"/>
<translation>परवलीशब्द खूप लांब आहे</translation>
</message>
</context>
<context>
@ -2231,7 +2235,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/UsersViewStep.cpp" line="50"/>
<source>Users</source>
<translation type="unfinished"/>
<translation>वापरकर्ते</translation>
</message>
</context>
<context>
@ -2239,47 +2243,47 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"/>
<translation>स्वरुप</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="75"/>
<source>&amp;Language:</source>
<translation type="unfinished"/>
<translation>&amp;भाषा :</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
<source>&amp;Release notes</source>
<translation type="unfinished"/>
<translation>&amp;प्रकाशन टिपा</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
<source>&amp;Known issues</source>
<translation type="unfinished"/>
<translation>&amp;ज्ञात त्रुटी</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
<source>&amp;Support</source>
<translation type="unfinished"/>
<translation>%1 पाठबळ</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.ui" line="146"/>
<source>&amp;About</source>
<translation type="unfinished"/>
<translation>&amp;विषयी</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source>&lt;h1&gt;Welcome to the %1 installer.&lt;/h1&gt;</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;‌%1 अधिष्ठापकमधे स्वागत आहे.&lt;/h1&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
<source>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;‌%1 साठी असलेल्या अधिष्ठापकमध्ये स्वागत आहे.&lt;/h1&gt;</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="73"/>
<source>About %1 installer</source>
<translation type="unfinished"/>
<translation>%1 अधिष्ठापक बद्दल</translation>
</message>
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="75"/>
@ -2289,7 +2293,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/WelcomePage.cpp" line="201"/>
<source>%1 support</source>
<translation type="unfinished"/>
<translation>%1 पाठबळ</translation>
</message>
</context>
<context>
@ -2297,7 +2301,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/>
<source>Welcome</source>
<translation type="unfinished"/>
<translation>स्वागत</translation>
</message>
</context>
</TS>

8
lang/calamares_nb.ts
View File

@ -37,7 +37,7 @@
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="111"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
<translation>Ikke installer en oppstartslaster</translation>
</message>
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="125"/>
@ -81,12 +81,12 @@
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="71"/>
<source>Interface:</source>
<translation type="unfinished"/>
<translation>Grensesnitt:</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="93"/>
<source>Tools</source>
<translation type="unfinished"/>
<translation>Verktøy</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
@ -99,7 +99,7 @@
<message>
<location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="77"/>
<source>Install</source>
<translation type="unfinished"/>
<translation>Installer</translation>
</message>
</context>
<context>

4
lang/calamares_pl.ts
View File

@ -2225,12 +2225,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="494"/>
<source>Password is too short</source>
<translation type="unfinished"/>
<translation>Hasło jest zbyt krótkie</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="513"/>
<source>Password is too long</source>
<translation type="unfinished"/>
<translation>Hasło jest zbyt długie</translation>
</message>
</context>
<context>

4
lang/calamares_pt_BR.ts
View File

@ -2227,12 +2227,12 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.</trans
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="494"/>
<source>Password is too short</source>
<translation type="unfinished"/>
<translation>A senha é muito curta</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="513"/>
<source>Password is too long</source>
<translation type="unfinished"/>
<translation>A senha é muito longa</translation>
</message>
</context>
<context>

8
lang/calamares_pt_PT.ts
View File

@ -1162,12 +1162,12 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/locale/LCLocaleDialog.cpp" line="66"/>
<source>&amp;Cancel</source>
<translation type="unfinished"/>
<translation>&amp;Cancelar</translation>
</message>
<message>
<location filename="../src/modules/locale/LCLocaleDialog.cpp" line="67"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
<translation>&amp;OK</translation>
</message>
</context>
<context>
@ -2225,12 +2225,12 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="494"/>
<source>Password is too short</source>
<translation type="unfinished"/>
<translation>A palavra-passe é demasiado curta</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="513"/>
<source>Password is too long</source>
<translation type="unfinished"/>
<translation>A palavra-passe é demasiado longa</translation>
</message>
</context>
<context>

6
lang/calamares_sk.ts
View File

@ -2225,12 +2225,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="494"/>
<source>Password is too short</source>
<translation type="unfinished"/>
<translation>Heslo je príliš krátke</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="513"/>
<source>Password is too long</source>
<translation type="unfinished"/>
<translation>Heslo je príliš dlhé</translation>
</message>
</context>
<context>
@ -2304,7 +2304,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
<message>
<location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="51"/>
<source>Welcome</source>
<translation>Vitajte</translation>
<translation>Uvítanie</translation>
</message>
</context>
</TS>

26
lang/calamares_sv.ts
View File

@ -1162,12 +1162,12 @@ Alla ändringar kommer att gå förlorade.</translation>
<message>
<location filename="../src/modules/locale/LCLocaleDialog.cpp" line="66"/>
<source>&amp;Cancel</source>
<translation type="unfinished"/>
<translation>&amp;Avsluta</translation>
</message>
<message>
<location filename="../src/modules/locale/LCLocaleDialog.cpp" line="67"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
<translation>&amp;Okej</translation>
</message>
</context>
<context>
@ -1185,17 +1185,17 @@ Alla ändringar kommer att gå förlorade.</translation>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="115"/>
<source>&lt;h1&gt;License Agreement&lt;/h1&gt;This setup procedure will install proprietary software that is subject to licensing terms.</source>
<translation type="unfinished"/>
<translation>&lt;h1&gt;Licensavtal&lt;/h1&gt;Denna installationsprocedur kommer att installera proprietär mjukvara som omfattas av licensvillkor.</translation>
</message>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="118"/>
<source>Please review the End User License Agreements (EULAs) above.&lt;br/&gt;If you do not agree with the terms, the setup procedure cannot continue.</source>
<translation type="unfinished"/>
<translation>Läs igenom End User Agreements (EULA:s) ovan.&lt;br/&gt;Om du inte accepterar villkoren kan inte installationsproceduren fortsätta.</translation>
</message>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="124"/>
<source>&lt;h1&gt;License Agreement&lt;/h1&gt;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>&lt;h1&gt;Licensavtal&lt;/h1&gt;Denna installationsprocedur kan installera proprietär mjukvara som omfattas av licensvillkor för att tillhandahålla ytterligare funktioner och förbättra användarupplevelsen.</translation>
</message>
<message>
<location filename="../src/modules/license/LicensePage.cpp" line="129"/>
@ -1253,7 +1253,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message>
<location filename="../src/modules/locale/LocalePage.cpp" line="387"/>
<source>The system language will be set to %1.</source>
<translation type="unfinished"/>
<translation>Systemspråket kommer ändras till %1.</translation>
</message>
<message>
<location filename="../src/modules/locale/LocalePage.cpp" line="389"/>
@ -1285,7 +1285,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<location filename="../src/modules/locale/LocalePage.cpp" line="480"/>
<source>%1 (%2)</source>
<extracomment>Language (Country)</extracomment>
<translation type="unfinished"/>
<translation>%1 (%2)</translation>
</message>
</context>
<context>
@ -1355,18 +1355,18 @@ Alla ändringar kommer att gå förlorade.</translation>
<message>
<location filename="../src/modules/netinstall/NetInstallPage.cpp" line="79"/>
<source>Name</source>
<translation type="unfinished"/>
<translation>Namn</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallPage.cpp" line="80"/>
<source>Description</source>
<translation type="unfinished"/>
<translation>Beskrivning</translation>
</message>
<message>
<location filename="../src/modules/netinstall/NetInstallPage.cpp" line="97"/>
<location filename="../src/modules/netinstall/NetInstallPage.cpp" line="104"/>
<source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
<translation type="unfinished"/>
<translation>Nätverksinstallation. (Inaktiverad: Kan inte hämta paketlistor, kontrollera nätverksanslutningen)</translation>
</message>
</context>
<context>
@ -1374,7 +1374,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message>
<location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="51"/>
<source>Package selection</source>
<translation type="unfinished"/>
<translation>Paketval</translation>
</message>
</context>
<context>
@ -1500,7 +1500,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message>
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/>
<source>New partition</source>
<translation type="unfinished"/>
<translation>Ny partition</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="224"/>
@ -1858,7 +1858,7 @@ Alla ändringar kommer att gå förlorade.</translation>
<message>
<location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="156"/>
<source>The screen is too small to display the installer.</source>
<translation type="unfinished"/>
<translation>Skärmen är för liten för att visa installationshanteraren.</translation>
</message>
</context>
<context>

123
lang/calamares_uk.ts
View File

@ -4,17 +4,17 @@
<message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="69"/>
<source>The &lt;strong&gt;boot environment&lt;/strong&gt; of this system.&lt;br&gt;&lt;br&gt;Older x86 systems only support &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Modern systems usually use &lt;strong&gt;EFI&lt;/strong&gt;, but may also show up as BIOS if started in compatibility mode.</source>
<translation type="unfinished"/>
<translation>&lt;strong&gt;Завантажувальне середовище&lt;/strong&gt; цієї системи.&lt;br&gt;&lt;br&gt;Старі x86-системи підтримують тільки &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Нові системи зазвичай використовують&lt;strong&gt;EFI&lt;/strong&gt;, проте можуть також відображатися як BIOS, якщо запущені у режимі сумісності.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="79"/>
<source>This system was started with an &lt;strong&gt;EFI&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from an EFI environment, this installer must deploy a boot loader application, like &lt;strong&gt;GRUB&lt;/strong&gt; or &lt;strong&gt;systemd-boot&lt;/strong&gt; on an &lt;strong&gt;EFI System Partition&lt;/strong&gt;. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.</source>
<translation type="unfinished"/>
<translation>Цю систему було запущено із завантажувальним середовищем &lt;strong&gt;EFI&lt;/strong&gt;.&lt;br&gt;&lt;br&gt;Щоб налаштувати завантаження з середовища EFI, установник повинен встановити на &lt;strong&gt;Системний Розділ EFI&lt;/strong&gt; програму-завантажувач таку, як &lt;strong&gt;GRUB&lt;/strong&gt; або &lt;strong&gt;systemd-boot&lt;/strong&gt;. Це буде зроблено автоматично, якщо ви не обрали розподілення диску вручну. В останньому випадку вам потрібно обрати завантажувач або встановити його власноруч.</translation>
</message>
<message>
<location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="91"/>
<source>This system was started with a &lt;strong&gt;BIOS&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from a BIOS environment, this installer must install a boot loader, like &lt;strong&gt;GRUB&lt;/strong&gt;, either at the beginning of a partition or on the &lt;strong&gt;Master Boot Record&lt;/strong&gt; near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.</source>
<translation type="unfinished"/>
<translation>Цю систему було запущено із завантажувальним середовищем &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;&lt;br&gt;Щоб налаштувати завантаження з середовища BIOS, установник повинен встановити завантажувач, такий, як &lt;strong&gt;GRUB&lt;/strong&gt; або на початку розділу або у &lt;strong&gt;Головний Завантажувальний Запис (Master Boot Record)&lt;/strong&gt; біля початку таблиці розділів (рекомендовано). Це буде зроблено автотматично, якщо ви не обрали розподілення диску вручну. В останньому випадку вам потрібно встановити завантажувач власноруч.</translation>
</message>
</context>
<context>
@ -22,7 +22,7 @@
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
<source>Master Boot Record of %1</source>
<translation type="unfinished"/>
<translation>Головний Завантажувальний Запис (Master Boot Record) %1</translation>
</message>
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="76"/>
@ -37,12 +37,12 @@
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="111"/>
<source>Do not install a boot loader</source>
<translation type="unfinished"/>
<translation>Не встановлювати завантажувач</translation>
</message>
<message>
<location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="125"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
<translation>%1 (%2)</translation>
</message>
</context>
<context>
@ -50,48 +50,48 @@
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"/>
<translation>Форма</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="24"/>
<source>GlobalStorage</source>
<translation type="unfinished"/>
<translation>Глобальне сховище</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="34"/>
<source>JobQueue</source>
<translation type="unfinished"/>
<translation>Черга завдань</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="44"/>
<source>Modules</source>
<translation type="unfinished"/>
<translation>Модулі</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="57"/>
<source>Type:</source>
<translation type="unfinished"/>
<translation>Тип:</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="64"/>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="78"/>
<source>none</source>
<translation type="unfinished"/>
<translation>немає</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="71"/>
<source>Interface:</source>
<translation type="unfinished"/>
<translation>Інтерфейс:</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="93"/>
<source>Tools</source>
<translation type="unfinished"/>
<translation>Інструменти</translation>
</message>
<message>
<location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
<source>Debug information</source>
<translation type="unfinished"/>
<translation>Відлагоджувальна інформація</translation>
</message>
</context>
<context>
@ -99,7 +99,7 @@
<message>
<location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="77"/>
<source>Install</source>
<translation type="unfinished"/>
<translation>Встановити</translation>
</message>
</context>
<context>
@ -115,68 +115,74 @@
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="51"/>
<source>Run command %1 %2</source>
<translation type="unfinished"/>
<translation>Запустити команду %1 %2</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="60"/>
<source>Running command %1 %2</source>
<translation type="unfinished"/>
<translation>Запуск команди %1 %2</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="89"/>
<source>External command crashed</source>
<translation type="unfinished"/>
<translation>Зовнішня команда завершилася аварією</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="90"/>
<source>Command %1 crashed.
Output:
%2</source>
<translation type="unfinished"/>
<translation>Команда %1 завершилася аварією.
Вивід:
%2</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="95"/>
<source>External command failed to start</source>
<translation type="unfinished"/>
<translation>Не вдалося запустити зовнішню команду</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="96"/>
<source>Command %1 failed to start.</source>
<translation type="unfinished"/>
<translation>Не вдалося запустити команду %1.</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="100"/>
<source>Internal error when starting command</source>
<translation type="unfinished"/>
<translation>Внутрішня помилка під час запуску команди</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="101"/>
<source>Bad parameters for process job call.</source>
<translation type="unfinished"/>
<translation>Неправильні параметри визову завдання обробки.</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="104"/>
<source>External command failed to finish</source>
<translation type="unfinished"/>
<translation>Не вдалося завершити зовнішню команду</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="105"/>
<source>Command %1 failed to finish in %2s.
Output:
%3</source>
<translation type="unfinished"/>
<translation>Не вдалося завершити зовнішню команду %1 протягом %2с.
Вивід:
%3</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="111"/>
<source>External command finished with errors</source>
<translation type="unfinished"/>
<translation>Зовнішня програма завершилася з помилками</translation>
</message>
<message>
<location filename="../src/libcalamares/ProcessJob.cpp" line="112"/>
<source>Command %1 finished with exit code %2.
Output:
%3</source>
<translation type="unfinished"/>
<translation>Команда %1 завершилася з кодом %2.
Вивід:
%3</translation>
</message>
</context>
<context>
@ -184,32 +190,32 @@ Output:
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="265"/>
<source>Running %1 operation.</source>
<translation type="unfinished"/>
<translation>Запуск операції %1.</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="280"/>
<source>Bad working directory path</source>
<translation type="unfinished"/>
<translation>Неправильний шлях робочого каталогу</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="281"/>
<source>Working directory %1 for python job %2 is not readable.</source>
<translation type="unfinished"/>
<translation>Неможливо прочитати робочу директорію %1 для завдання python %2.</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="291"/>
<source>Bad main script file</source>
<translation type="unfinished"/>
<translation>Неправильний файл головного сценарію</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="292"/>
<source>Main script file %1 for python job %2 is not readable.</source>
<translation type="unfinished"/>
<translation>Неможливо прочитати файл головного сценарію %1 для завдання python %2.</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonJob.cpp" line="368"/>
<source>Boost.Python error in job &quot;%1&quot;.</source>
<translation type="unfinished"/>
<translation>Помилка Boost.Python у завданні &quot;%1&quot;.</translation>
</message>
</context>
<context>
@ -217,90 +223,91 @@ Output:
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="73"/>
<source>&amp;Back</source>
<translation type="unfinished"/>
<translation>&amp;Назад</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="74"/>
<source>&amp;Next</source>
<translation type="unfinished"/>
<translation>&amp;Вперед</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="75"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="300"/>
<source>&amp;Cancel</source>
<translation type="unfinished"/>
<translation>&amp;Скасувати</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="76"/>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="301"/>
<source>Cancel installation without changing the system.</source>
<translation type="unfinished"/>
<translation>Скасувати встановлення без змінення системи.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="99"/>
<source>Cancel installation?</source>
<translation type="unfinished"/>
<translation>Скасувати встановлення?</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="100"/>
<source>Do you really want to cancel the current install process?
The installer will quit and all changes will be lost.</source>
<translation type="unfinished"/>
<translation>Чи ви насправді бажаєте скасувати процес встановлення?
Установник закриється і всі зміни буде втрачено.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="105"/>
<source>&amp;Yes</source>
<translation type="unfinished"/>
<translation>&amp;Так</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="106"/>
<source>&amp;No</source>
<translation type="unfinished"/>
<translation>&amp;Ні</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="183"/>
<source>&amp;Close</source>
<translation type="unfinished"/>
<translation>&amp;Закрити</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="233"/>
<source>Continue with setup?</source>
<translation type="unfinished"/>
<translation>Продовжити встановлення?</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="234"/>
<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 type="unfinished"/>
<translation>Установник %1 збирається зробити зміни на вашому диску, щоб встановити %2.&lt;br/&gt;&lt;strong&gt;Ці зміни неможливо буде повернути.&lt;/strong&gt;</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="239"/>
<source>&amp;Install now</source>
<translation type="unfinished"/>
<translation>&amp;Встановити зараз</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="240"/>
<source>Go &amp;back</source>
<translation type="unfinished"/>
<translation>Перейти &amp;назад</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="269"/>
<source>&amp;Done</source>
<translation type="unfinished"/>
<translation>&amp;Закінчити</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="270"/>
<source>The installation is complete. Close the installer.</source>
<translation type="unfinished"/>
<translation>Встановлення виконано. Закрити установник.</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="180"/>
<source>Error</source>
<translation type="unfinished"/>
<translation>Помилка</translation>
</message>
<message>
<location filename="../src/libcalamaresui/ViewManager.cpp" line="181"/>
<source>Installation Failed</source>
<translation type="unfinished"/>
<translation>Втановлення завершилося невдачею</translation>
</message>
</context>
<context>
@ -308,22 +315,22 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/libcalamares/PythonHelper.cpp" line="263"/>
<source>Unknown exception type</source>
<translation type="unfinished"/>
<translation>Невідомий тип виключної ситуації</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonHelper.cpp" line="276"/>
<source>unparseable Python error</source>
<translation type="unfinished"/>
<translation>нерозбірлива помилка Python</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonHelper.cpp" line="292"/>
<source>unparseable Python traceback</source>
<translation type="unfinished"/>
<translation>нерозбірливе відстеження помилки Python</translation>
</message>
<message>
<location filename="../src/libcalamares/PythonHelper.cpp" line="296"/>
<source>Unfetchable Python error.</source>
<translation type="unfinished"/>
<translation>Помилка Python, інформацію про яку неможливо отримати.</translation>
</message>
</context>
<context>
@ -336,7 +343,7 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/calamares/CalamaresWindow.cpp" line="112"/>
<source>Show debug information</source>
<translation type="unfinished"/>
<translation>Показати відлагоджувальну інформацію</translation>
</message>
</context>
<context>
@ -344,12 +351,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/partition/jobs/CheckFileSystemJob.cpp" line="39"/>
<source>Checking file system on partition %1.</source>
<translation type="unfinished"/>
<translation>Перевірка файлової системи на розділі %1.</translation>
</message>
<message>
<location filename="../src/modules/partition/jobs/CheckFileSystemJob.cpp" line="77"/>
<source>The file system check on partition %1 failed.</source>
<translation type="unfinished"/>
<translation>Перевірка файлової системи на розділі %1 завершилася невдачею.</translation>
</message>
</context>
<context>

4
lang/calamares_zh_TW.ts
View File

@ -2225,12 +2225,12 @@ The installer will quit and all changes will be lost.</source>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="494"/>
<source>Password is too short</source>
<translation type="unfinished"/>
<translation>密碼太短</translation>
</message>
<message>
<location filename="../src/modules/users/UsersPage.cpp" line="513"/>
<source>Password is too long</source>
<translation type="unfinished"/>
<translation>密碼太長</translation>
</message>
</context>
<context>

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

Binary file not shown.

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

@ -10,7 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-28 10:35-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: pavelrz <pavel@rzehak.cz>, 2017\n"
"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2017\n"
"Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -21,23 +21,23 @@ msgstr ""
#: src/modules/packages/main.py:59
#, python-format
msgid "Processing packages (%(count)d / %(total)d)"
msgstr ""
msgstr "Zpracovávání balíčků (%(count)d / %(total)d)"
#: src/modules/packages/main.py:61
#, python-format
msgid "Installing one package."
msgid_plural "Installing %(num)d packages."
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
msgstr[0] "Je instalován jeden balíček."
msgstr[1] "Jsou instalovány %(num)d balíčky."
msgstr[2] "Je instalováno %(num)d balíčků."
#: src/modules/packages/main.py:64
#, python-format
msgid "Removing one package."
msgid_plural "Removing %(num)d packages."
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
msgstr[0] "Odebírá se jeden balíček."
msgstr[1] "Odebírají se %(num)d balíčky."
msgstr[2] "Odebírá se %(num)d balíčků."
#: src/modules/packages/main.py:68
msgid "Install packages."
@ -53,4 +53,4 @@ msgstr "Testovací krok {} python."
#: src/modules/machineid/main.py:35
msgid "Generate machine-id."
msgstr "Vytvořit machine-id."
msgstr "Vytvořit identifikátor stroje."

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

Binary file not shown.

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

@ -28,7 +28,7 @@ msgstr "Forarbejder pakker (%(count)d / %(total)d)"
msgid "Installing one package."
msgid_plural "Installing %(num)d packages."
msgstr[0] "Installerer én pakke."
msgstr[1] "Installer %(num)d pakker."
msgstr[1] "Installerer %(num)d pakker."
#: src/modules/packages/main.py:64
#, python-format

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

Binary file not shown.

7
lang/python/fr/LC_MESSAGES/python.po
View File

@ -10,6 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-28 10:35-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Paul Combal <abonnementspaul@gmail.com>, 2017\n"
"Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -20,7 +21,7 @@ msgstr ""
#: src/modules/packages/main.py:59
#, python-format
msgid "Processing packages (%(count)d / %(total)d)"
msgstr ""
msgstr "Traitement des paquets (%(count)d / %(total)d)"
#: src/modules/packages/main.py:61
#, python-format
@ -38,7 +39,7 @@ msgstr[1] ""
#: src/modules/packages/main.py:68
msgid "Install packages."
msgstr ""
msgstr "Installer des paquets."
#: src/modules/dummypython/main.py:44
msgid "Dummy python job."
@ -50,4 +51,4 @@ msgstr ""
#: src/modules/machineid/main.py:35
msgid "Generate machine-id."
msgstr ""
msgstr "Générer un machine-id."

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

Binary file not shown.

5
lang/python/nb/LC_MESSAGES/python.po
View File

@ -10,6 +10,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-28 10:35-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Tyler Moss <inactive+lazerbeta@transifex.com>, 2017\n"
"Language-Team: Norwegian Bokmål (https://www.transifex.com/calamares/teams/20061/nb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -38,7 +39,7 @@ msgstr[1] ""
#: src/modules/packages/main.py:68
msgid "Install packages."
msgstr ""
msgstr "Installer pakker."
#: src/modules/dummypython/main.py:44
msgid "Dummy python job."
@ -50,4 +51,4 @@ msgstr ""
#: src/modules/machineid/main.py:35
msgid "Generate machine-id."
msgstr ""
msgstr "Generer maskin-ID."

37
src/branding/default/branding.desc
View File

@ -8,10 +8,17 @@ componentName: default
# same distribution.
welcomeStyleCalamares: false
# Should the welcome image (productWelcome, below) be scaled
# up beyond its natural size?
welcomeExpandingLogo: true
# These are strings shown to the user in the user interface.
# There is no provision for translating them -- since they
# are names, the string is included as-is.
#
# The four Url strings are the Urls used by the buttons in
# the welcome screen, and are not shown to the user. Clicking
# on the "Support" button, for instance, opens the link supportUrl.
# If a Url is empty, the corresponding button is not shown.
#
# bootloaderEntryName is how this installation / distro is named
# in the boot loader (e.g. in the GRUB menu).
strings:
productName: Generic GNU/Linux
shortProductName: Generic
@ -25,11 +32,33 @@ strings:
knownIssuesUrl: http://calamares.io/about/
releaseNotesUrl: http://calamares.io/about/
# Should the welcome image (productWelcome, below) be scaled
# up beyond its natural size? If false, the image does not grow
# with the window but remains the same size throughout (this
# may have surprising effects on HiDPI monitors).
welcomeExpandingLogo: true
# These images are loaded from the branding module directory.
#
# productIcon is used as the window icon, and will (usually) be used
# by the window manager to represent the application. This image
# should be square, and may be displayed by the window manager
# as small as 32x32 (but possibly larger).
# 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,
# and is displayed at 80x80 pixels (also on HiDPI).
# productWelcome is shown on the welcome page of the application in
# the middle of the window, below the welcome text. It can be
# any size and proportion, and will be scaled to fit inside
# the window. Use `welcomeExpandingLogo` to make it non-scaled.
# Recommended size is 320x150.
images:
productLogo: "squid.png"
productIcon: "squid.png"
productWelcome: "languages.png"
# The slideshow is displayed during execution steps (e.g. when the
# installer is actually writing to disk and doing other slow things).
slideshow: "show.qml"
# Colors for text and background components.

2
src/calamares/CalamaresWindow.cpp
View File

@ -96,7 +96,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
logoLabel->setAlignment( Qt::AlignCenter );
logoLabel->setFixedSize( 80, 80 );
logoLabel->setPixmap( Calamares::Branding::instance()->
image( Calamares::Branding::ProductIcon,
image( Calamares::Branding::ProductLogo,
logoLabel->size() ) );
logoLayout->addWidget( logoLabel );
logoLayout->addStretch();

5
src/modules/CMakeLists.txt
View File

@ -1,5 +1,10 @@
include( CMakeColors )
if( BUILD_TESTING )
add_executable( test_conf test_conf.cpp )
target_link_libraries( test_conf ${YAMLCPP_LIBRARY} )
endif()
file( GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*" )
string( REPLACE " " ";" SKIP_LIST "${SKIP_MODULES}" )
foreach( SUBDIRECTORY ${SUBDIRECTORIES} )

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

Binary file not shown.

6
src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-04 08:16-0400\n"
"POT-Creation-Date: 2017-09-28 10:34-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: pavelrz <pavel@rzehak.cz>, 2016\n"
"Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n"
@ -20,7 +20,7 @@ msgstr ""
#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr "Klikni na mě!"
msgstr "Klikněte na mě!"
#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
@ -36,7 +36,7 @@ msgstr "Testovací úloha PythonQt"
#: src/modules/dummypythonqt/main.py:186
msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
msgstr "Toto je testovací úloha PythonQt. Testovací úloha říká: {}"
msgstr "Toto je testovací úloha PythonQt. Testovací úloha sděluje: {}"
#: src/modules/dummypythonqt/main.py:190
msgid "A status message for Dummy PythonQt Job."

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

Binary file not shown.

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

@ -8,8 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-04 08:16-0400\n"
"POT-Creation-Date: 2017-09-28 10:34-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Paul Combal <abonnementspaul@gmail.com>, 2017\n"
"Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -19,11 +20,11 @@ msgstr ""
#: src/modules/dummypythonqt/main.py:84
msgid "Click me!"
msgstr ""
msgstr "Cliquez-moi!"
#: src/modules/dummypythonqt/main.py:94
msgid "A new QLabel."
msgstr ""
msgstr "Un nouveau QLabel."
#: src/modules/dummypythonqt/main.py:97
msgid "Dummy PythonQt ViewStep"

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

@ -178,7 +178,7 @@ FinishedViewStep::setConfigurationMap( const QVariantMap& configurationMap )
configurationMap.value( "restartNowCommand" ).type() == QVariant::String )
m_widget->setRestartNowCommand( configurationMap.value( "restartNowCommand" ).toString() );
else
m_widget->setRestartNowCommand( "systemctl -i reboot" );
m_widget->setRestartNowCommand( "shutdown -r now" );
}
}
if ( configurationMap.contains( "notifyOnFinished" ) &&

12
src/modules/finished/finished.conf
View File

@ -1,14 +1,18 @@
Configuration for the "finished" page, which is usually shown only at
the end of the installation (successful or not).
# Configuration for the "finished" page, which is usually shown only at
# the end of the installation (successful or not).
---
# The finished page can hold a "restart system now" checkbox.
# If this is false, no checkbox is show and the system is not restarted
# If this is false, no checkbox is shown and the system is not restarted
# when Calamares exits.
restartNowEnabled: true
# Initial state of the checkbox "restart now".
# Initial state of the checkbox "restart now". Only relevant when the
# checkbox is shown by restartNowEnabled.
restartNowChecked: false
# If the checkbox is shown, and the checkbox is checked, then when
# Calamares exits from the finished-page it will run this command.
# If not set, falls back to "shutdown -r now".
restartNowCommand: "systemctl -i reboot"
# When the last page is (successfully) reached, send a DBus notification

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

@ -24,6 +24,8 @@
# along with Calamares. If not, see <http://www.gnu.org/licenses/>.
import libcalamares
import inspect
import os
import shutil

54
src/modules/locale/timezonewidget/timezonewidget.cpp
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Originally from the Manjaro Installation Framework
* by Roland Singer <roland@manjaro.org>
@ -20,8 +21,12 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <cmath>
#include "timezonewidget.h"
constexpr double MATH_PI = 3.14159265;
TimeZoneWidget::TimeZoneWidget( QWidget* parent ) :
QWidget( parent )
{
@ -47,15 +52,18 @@ TimeZoneWidget::TimeZoneWidget(QWidget* parent) :
}
void TimeZoneWidget::setCurrentLocation(QString region, QString zone) {
void TimeZoneWidget::setCurrentLocation( QString region, QString zone )
{
QHash<QString, QList<LocaleGlobal::Location> > hash = LocaleGlobal::getLocations();
if ( !hash.contains( region ) )
return;
QList<LocaleGlobal::Location> locations = hash.value( region );
for (int i = 0; i < locations.size(); ++i) {
if (locations.at(i).zone == zone) {
for ( int i = 0; i < locations.size(); ++i )
{
if ( locations.at( i ).zone == zone )
{
setCurrentLocation( locations.at( i ) );
break;
}
@ -63,18 +71,20 @@ void TimeZoneWidget::setCurrentLocation(QString region, QString zone) {
}
void TimeZoneWidget::setCurrentLocation(LocaleGlobal::Location location) {
void TimeZoneWidget::setCurrentLocation( LocaleGlobal::Location location )
{
currentLocation = location;
// Set zone
QPoint pos = getLocationPosition( currentLocation.longitude, currentLocation.latitude );
for (int i = 0; i < timeZoneImages.size(); ++i) {
for ( int i = 0; i < timeZoneImages.size(); ++i )
{
QImage zone = timeZoneImages[i];
// If not transparent set as current
if (zone.pixel(pos) != RGB_TRANSPARENT) {
if ( zone.pixel( pos ) != RGB_TRANSPARENT )
{
currentZoneImage = zone;
break;
}
@ -91,13 +101,25 @@ void TimeZoneWidget::setCurrentLocation(LocaleGlobal::Location location) {
//###
QPoint TimeZoneWidget::getLocationPosition(double longitude, double latitude) {
QPoint TimeZoneWidget::getLocationPosition( double longitude, double latitude )
{
const int width = this->width();
const int height = this->height();
double x = ( width / 2.0 + ( width / 2.0 ) * longitude / 180.0 ) + MAP_X_OFFSET * width;
double y = ( height / 2.0 - ( height / 2.0 ) * latitude / 90.0 ) + MAP_Y_OFFSET * height;
//Far north, the MAP_Y_OFFSET no longer holds, cancel the Y offset; it's noticeable
// from 62 degrees north, so scale those 28 degrees as if the world is flat south
// of there, and we have a funny "rounded" top of the world. In practice the locations
// of the different cities / regions looks ok -- at least Thule ends up in the right
// country, and Inuvik isn't in the ocean.
if ( latitude > 62.0 )
y -= sin( MATH_PI * ( latitude - 62.0 ) / 56.0 ) * MAP_Y_OFFSET * height;
// Antarctica isn't shown on the map, but you could try clicking there
if ( latitude < -60 )
y = height - 1;
if ( x < 0 )
x = width+x;
if ( x >= width )
@ -111,8 +133,8 @@ QPoint TimeZoneWidget::getLocationPosition(double longitude, double latitude) {
}
void TimeZoneWidget::paintEvent(QPaintEvent*) {
void TimeZoneWidget::paintEvent( QPaintEvent* )
{
const int width = this->width();
const int height = this->height();
QFontMetrics fontMetrics( font );
@ -157,7 +179,8 @@ void TimeZoneWidget::paintEvent(QPaintEvent*) {
void TimeZoneWidget::mousePressEvent(QMouseEvent* event) {
void TimeZoneWidget::mousePressEvent( QMouseEvent* event )
{
if ( event->button() != Qt::LeftButton )
return;
@ -167,14 +190,17 @@ void TimeZoneWidget::mousePressEvent(QMouseEvent* event) {
QHash<QString, QList<LocaleGlobal::Location> > hash = LocaleGlobal::getLocations();
QHash<QString, QList<LocaleGlobal::Location> >::iterator iter = hash.begin();
while (iter != hash.end()) {
while ( iter != hash.end() )
{
QList<LocaleGlobal::Location> locations = iter.value();
for (int i = 0; i < locations.size(); ++i) {
for ( int i = 0; i < locations.size(); ++i )
{
LocaleGlobal::Location loc = locations[i];
QPoint locPos = getLocationPosition( loc.longitude, loc.latitude );
if ((abs(mX - locPos.x()) + abs(mY - locPos.y()) < abs(mX - nX) + abs(mY - nY))) {
if ( ( abs( mX - locPos.x() ) + abs( mY - locPos.y() ) < abs( mX - nX ) + abs( mY - nY ) ) )
{
currentLocation = loc;
nX = locPos.x();
nY = locPos.y();

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

@ -50,7 +50,10 @@ class TimeZoneWidget : public QWidget
public:
explicit TimeZoneWidget( QWidget* parent = nullptr );
LocaleGlobal::Location getCurrentLocation() { return currentLocation; }
LocaleGlobal::Location getCurrentLocation()
{
return currentLocation;
}
void setCurrentLocation( QString region, QString zone );
void setCurrentLocation( LocaleGlobal::Location location );
@ -63,6 +66,10 @@ private:
QList<QImage> timeZoneImages;
LocaleGlobal::Location currentLocation;
QPoint getLocationPosition( const LocaleGlobal::Location& l )
{
return getLocationPosition( l.longitude, l.latitude );
}
QPoint getLocationPosition( double longitude, double latitude );
void paintEvent( QPaintEvent* event );

66
src/modules/test_conf.cpp Normal file
View File

@ -0,0 +1,66 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Calamares is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* This is a test-application that just checks the YAML config-file
* shipped with each module for correctness -- well, for parseability.
*/
#include <iostream>
#include <yaml-cpp/yaml.h>
using std::cerr;
int main(int argc, char** argv)
{
if (argc != 2)
{
cerr << "Usage: test_conf <file.conf>\n";
return 1;
}
try
{
YAML::Node doc = YAML::LoadFile( argv[1] );
if ( doc.IsNull() )
{
// Special case: empty config files are valid,
// but aren't a map. For the example configs,
// this is still an error.
cerr << "WARNING:" << argv[1] << '\n';
cerr << "WARNING: empty YAML\n";
return 1;
}
if ( !doc.IsMap() )
{
cerr << "WARNING:" << argv[1] << '\n';
cerr << "WARNING: not-a-YAML-map\n";
return 1;
}
}
catch ( YAML::Exception& e )
{
cerr << "WARNING:" << argv[1] << '\n';
cerr << "WARNING: YAML parser error " << e.what() << '\n';
return 1;
}
return 0;
}