diff --git a/.travis.yml b/.travis.yml index 72372ce22..ec6678a36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,6 @@ install: - pip install pycodestyle script: - - docker run -v $PWD:/src --tmpfs /build:rw,size=65536k calamares bash -lc "cd /build && cmake -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON /src && make -j2" + - docker run -v $PWD:/src --tmpfs /build:rw,size=65536k calamares bash -lc "cd /build && cmake -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON /src && make -j2 && make install DESTDIR=/build/INSTALL_ROOT" - pycodestyle --exclude=thirdparty,.git $PWD diff --git a/.tx/config b/.tx/config index 9a9b25666..0bbb150eb 100644 --- a/.tx/config +++ b/.tx/config @@ -12,3 +12,9 @@ file_filter = src/modules/dummypythonqt/lang//LC_MESSAGES/dummypythonqt.po source_file = src/modules/dummypythonqt/lang/dummypythonqt.pot source_lang = en +[calamares.fdo] +file_filter = lang/desktop_.desktop +source_file = calamares.desktop +source_lang = en +type = DESKTOP + diff --git a/CMakeLists.txt b/CMakeLists.txt index 0087d19c0..3138e198d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,21 @@ +### CMakeLists.txt for Calamares +# +# Generally, this CMakeLists.txt will find all the dependencies for Calamares +# and complain appropriately. See below (later in this file) for CMake-level +# options. There are some "secret" options as well: +# +# SKIP_MODULES : a space or semicolon-separated list of directory names +# under src/modules that should not be built. +# +# Example usage: +# +# cmake . -DSKIP_MODULES="partition luksbootkeycfg" + project( calamares CXX ) -# The partition manager uses ECM but ECMConfig.cmake -# will complain if we require CMake less than 2.8.13, -# so never change this. cmake_minimum_required( VERSION 3.2 ) -set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" ) +set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" ) set( CMAKE_CXX_STANDARD 14 ) set( CMAKE_CXX_STANDARD_REQUIRED ON ) @@ -170,12 +180,7 @@ configure_file( ) # Early configure these files as we need them later on -configure_file( CalamaresUse.cmake.in "${PROJECT_BINARY_DIR}/CalamaresUse.cmake" @ONLY ) -file( COPY CalamaresAddLibrary.cmake DESTINATION "${PROJECT_BINARY_DIR}" ) -file( COPY CalamaresAddModuleSubdirectory.cmake DESTINATION "${PROJECT_BINARY_DIR}" ) -file( COPY CalamaresAddPlugin.cmake DESTINATION "${PROJECT_BINARY_DIR}" ) -file( COPY CalamaresAddBrandingSubdirectory.cmake DESTINATION "${PROJECT_BINARY_DIR}" ) - +set( CALAMARES_CMAKE_DIR "${CMAKE_SOURCE_DIR}/CMakeModules" ) set( CALAMARES_LIBRARIES calamares ) set( THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/thirdparty" ) @@ -221,11 +226,10 @@ install( FILES "${PROJECT_BINARY_DIR}/CalamaresConfig.cmake" "${PROJECT_BINARY_DIR}/CalamaresConfigVersion.cmake" - "${PROJECT_BINARY_DIR}/CalamaresUse.cmake" - "${PROJECT_BINARY_DIR}/CalamaresAddPlugin.cmake" - "${PROJECT_BINARY_DIR}/CalamaresAddModuleSubdirectory.cmake" - "${PROJECT_BINARY_DIR}/CalamaresAddLibrary.cmake" - "${PROJECT_BINARY_DIR}/CalamaresAddBrandingSubdirectory.cmake" + "CMakeModules/CalamaresAddPlugin.cmake" + "CMakeModules/CalamaresAddModuleSubdirectory.cmake" + "CMakeModules/CalamaresAddLibrary.cmake" + "CMakeModules/CalamaresAddBrandingSubdirectory.cmake" DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" ) diff --git a/CMakeModules/CMakeColors.cmake b/CMakeModules/CMakeColors.cmake index 4b96ac8a8..97739627d 100644 --- a/CMakeModules/CMakeColors.cmake +++ b/CMakeModules/CMakeColors.cmake @@ -1,8 +1,16 @@ if(NOT WIN32) - # [ -t 2 ] tests whether stderr is interactive. - # The negation '!' is because for POSIX shells, 0 is true and 1 is false. - execute_process(COMMAND test ! -t 2 RESULT_VARIABLE IS_STDERR_INTERACTIVE) - if(IS_STDERR_INTERACTIVE) + set(_use_color ON) + if("0" STREQUAL "$ENV{CLICOLOR}") + set(_use_color OFF) + endif() + if("0" STREQUAL "$ENV{CLICOLOR_FORCE}") + set(_use_color OFF) + endif() + if(NOT CMAKE_COLOR_MAKEFILE) + set(_use_color OFF) + endif() + + if(_use_color) string(ASCII 27 Esc) set(ColorReset "${Esc}[m") set(ColorBold "${Esc}[1m") @@ -20,5 +28,5 @@ if(NOT WIN32) set(BoldMagenta "${Esc}[1;35m") set(BoldCyan "${Esc}[1;36m") set(BoldWhite "${Esc}[1;37m") - endif(IS_STDERR_INTERACTIVE) + endif() endif() diff --git a/CalamaresAddBrandingSubdirectory.cmake b/CMakeModules/CalamaresAddBrandingSubdirectory.cmake similarity index 100% rename from CalamaresAddBrandingSubdirectory.cmake rename to CMakeModules/CalamaresAddBrandingSubdirectory.cmake diff --git a/CalamaresAddLibrary.cmake b/CMakeModules/CalamaresAddLibrary.cmake similarity index 100% rename from CalamaresAddLibrary.cmake rename to CMakeModules/CalamaresAddLibrary.cmake diff --git a/CalamaresAddModuleSubdirectory.cmake b/CMakeModules/CalamaresAddModuleSubdirectory.cmake similarity index 100% rename from CalamaresAddModuleSubdirectory.cmake rename to CMakeModules/CalamaresAddModuleSubdirectory.cmake diff --git a/CalamaresAddPlugin.cmake b/CMakeModules/CalamaresAddPlugin.cmake similarity index 77% rename from CalamaresAddPlugin.cmake rename to CMakeModules/CalamaresAddPlugin.cmake index b2847f7a9..658fd364a 100644 --- a/CalamaresAddPlugin.cmake +++ b/CMakeModules/CalamaresAddPlugin.cmake @@ -1,5 +1,28 @@ +# Convenience function for creating a C++ (qtplugin) module for Calamares. +# This function provides cmake-time feedback about the plugin, adds +# targets for compilation and boilerplate information, and creates +# a module.desc with standard values if none is provided (which only +# happens for very unusual plugins). +# +# Usage: +# +# calamares_add_plugin( +# module-name +# TYPE +# EXPORT_MACRO macro-name +# SOURCES source-file... +# UI ui-file... +# LINK_LIBRARIES lib... +# LINK_PRIVATE_LIBRARIES lib... +# COMPILE_DEFINITIONS def... +# RESOURCES resource-file +# [NO_INSTALL] +# [SHARED_LIB] +# ) + include( CMakeParseArguments ) -include( ${CALAMARES_CMAKE_DIR}/CalamaresAddLibrary.cmake ) +include( CalamaresAddLibrary ) +include( CMakeColors ) function( calamares_add_plugin ) # parse arguments ( name needs to be saved before passing ARGN into the macro ) @@ -17,7 +40,6 @@ function( calamares_add_plugin ) set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) - include( CMakeColors ) message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} module: ${BoldRed}${PLUGIN_NAME}${ColorReset}" ) if( NOT CMAKE_BUILD_TYPE STREQUAL "Release" ) message( " ${Green}TYPE:${ColorReset} ${PLUGIN_TYPE}" ) @@ -83,7 +105,15 @@ function( calamares_add_plugin ) calamares_add_library( ${calamares_add_library_args} ) - configure_file( ${PLUGIN_DESC_FILE} ${PLUGIN_DESC_FILE} COPYONLY ) + if ( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PLUGIN_DESC_FILE} ) + configure_file( ${PLUGIN_DESC_FILE} ${PLUGIN_DESC_FILE} COPYONLY ) + else() + set( _file ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_DESC_FILE} ) + set( _type ${PLUGIN_TYPE} ) + file( WRITE ${_file} "# AUTO-GENERATED metadata file\n# Syntax is YAML 1.2\n---\n" ) + file( APPEND ${_file} "type: \"${_type}\"\nname: \"${PLUGIN_NAME}\"\ninterface: \"qtplugin\"\nload: \"lib${target}.so\"\n" ) + endif() + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_DESC_FILE} DESTINATION ${PLUGIN_DESTINATION} ) diff --git a/CalamaresUse.cmake.in b/CalamaresUse.cmake.in deleted file mode 100644 index 4e8d67ba5..000000000 --- a/CalamaresUse.cmake.in +++ /dev/null @@ -1,12 +0,0 @@ -#FIXME: this duplicates top level cmakelists: how can we reduce code duplication? - -find_package( Qt5 5.3.0 CONFIG REQUIRED Core Gui Widgets LinguistTools ) - -if(NOT CALAMARES_CMAKE_DIR) - set(CALAMARES_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR}) -endif() - -include( "${CALAMARES_CMAKE_DIR}/CalamaresAddLibrary.cmake" ) -include( "${CALAMARES_CMAKE_DIR}/CalamaresAddModuleSubdirectory.cmake" ) -include( "${CALAMARES_CMAKE_DIR}/CalamaresAddPlugin.cmake" ) -include( "${CALAMARES_CMAKE_DIR}/CalamaresAddBrandingSubdirectory.cmake" ) diff --git a/calamares.desktop b/calamares.desktop index 88cb71e20..c2e1c5f7f 100644 --- a/calamares.desktop +++ b/calamares.desktop @@ -11,3 +11,50 @@ Icon=calamares Terminal=false StartupNotify=true Categories=Qt;System; + + +# Translations +Name[ast]=Calamares +Icon[ast]=calamares +GenericName[ast]=Instalador del sistema +Comment[ast]=Calamares — Instalador del sistema +Name[hr]=Calamares +Icon[hr]=calamares +GenericName[hr]=Instalacija sustava +Comment[hr]=Calamares — Instalacija sustava +Name[ru]=Calamares +Icon[ru]=calamares +GenericName[ru]=Установщик системы +Comment[ru]=Calamares - Установщик системы +Name[sv]=Calamares +Icon[sv]=calamares +GenericName[sv]=Systeminstallerare +Comment[sv]=Calamares — Systeminstallerare +Name[da]=Calamares +Icon[da]=calamares +GenericName[da]=Systeminstallationsprogram +Comment[da]=Calamares — Systeminstallationsprogram +Name[de]=Calamares +Icon[de]=calamares +GenericName[de]=Installation des Betriebssystems +Comment[de]=Calamares - Installation des Betriebssystems +Name[lt]=Calamares +Icon[lt]=calamares +GenericName[lt]=Sistemos diegimas į kompiuterį +Comment[lt]=Calamares — sistemos diegyklė +Name[en_GB]=Calamares +Icon[en_GB]=calamares +GenericName[en_GB]=System Installer +Comment[en_GB]=Calamares — System Installer +Name[pl]=Calamares +Icon[pl]=calamares +GenericName[pl]=Instalator systemu +Comment[pl]=Calamares — Instalator systemu +Name[pt_PT]=Calamares +Icon[pt_PT]=calamares +GenericName[pt_PT]=Instalador de Sistema +Comment[pt_PT]=Calamares - Instalador de Sistema +Name[nl]=Calamares +Icon[nl]=calamares +GenericName[nl]=Installatieprogramma +Comment[nl]=Calamares — Installatieprogramma diff --git a/ci/txpull.sh b/ci/txpull.sh index 624da0bd4..5c9ae8773 100755 --- a/ci/txpull.sh +++ b/ci/txpull.sh @@ -1,37 +1,71 @@ -#!/bin/bash +#!/bin/sh +# +# Fetch the Transifex translations for Calamares and incorporate them +# into the source tree, adding commits of the different files. -# Make sure we can make Transifex and git operations from the Calamares Docker+Jenkins environment. -cp ~/jenkins-master/.transifexrc ~ -cp ~/jenkins-master/.gitconfig ~ -cp -R ~/jenkins-master/.ssh ~ +### INITIAL SETUP +# +# This stuff needs to be done once; in a real CI environment where it +# runs regularly in a container, the setup needs to be done when +# creating the container. +# +# +# cp ~/jenkins-master/.transifexrc ~ # Transifex user settings +# cp ~/jenkins-master/.gitconfig ~ # Git config, user settings +# cp -R ~/jenkins-master/.ssh ~ # SSH, presumably for github +# +# cd "$WORKSPACE" +# git config --global http.sslVerify false -cd "$WORKSPACE" -git config --global http.sslVerify false +test -f "CMakeLists.txt" || { echo "! Not at Calamares top-level" ; exit 1 ; } +test -f ".tx/config" || { echo "! Not at Calamares top-level" ; exit 1 ; } +test -f "calamares.desktop" || { echo "! Not at Calamares top-level" ; exit 1 ; } +### FETCH TRANSLATIONS +# +# Use Transifex client to get translations; this depends on the +# .tx/config file to locate files, and overwrites them in the +# filesystem with new (merged) translations. export QT_SELECT=5 tx pull --force --source --all +### COMMIT TRANSLATIONS +# +# Produce multiple commits (for the various parts of the i18n +# infrastructure used by Calamares) of the updated translations. +# Try to be a little smart about not committing trivial changes. + +# Who is credited with these CI commits +AUTHOR="--author='Calamares CI '" +# Message to put after the module name +BOILERPLATE="Automatic merge of Transifex translations" + git add --verbose lang/calamares*.ts -git commit --author='Calamares CI ' --message='[core] Automatic merge of Transifex translations' | true +git commit "$AUTHOR" --message="[core] $BOILERPLATE" | true + +git add --verbose lang/desktop*.desktop calamares.desktop +git commit "$AUTHOR" --message="[desktop] $BOILERPLATE" | true # Transifex updates the PO-Created timestamp also when nothing interesting # has happened, so drop the files which have just 1 line changed (the # PO-Created line). This applies only to modules which use po-files. git diff --numstat src/modules | awk '($1==1 && $2==1){print $3}' | xargs git checkout -- -for MODULE_DIR in `find src/modules -maxdepth 1 -mindepth 1 -type d`; do - FILES=(${MODULE_DIR}/*.py) - if [ ${#FILES[@]} -gt 0 ]; then +# Go through the Python modules; those with a lang/ subdir have their +# own complete gettext-based setup. +for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do + FILES=$(find "$MODULE_DIR" -name "*.py" -a -type f) + if test -n "$FILES" ; then MODULE_NAME=$(basename ${MODULE_DIR}) if [ -d ${MODULE_DIR}/lang ]; then # Convert PO files to MO files - for POFILE in `find ${MODULE_DIR} -name "*.po"` ; do - msgfmt -o ${POFILE/.po/.mo} $POFILE + for POFILE in $(find ${MODULE_DIR} -name "*.po") ; do + msgfmt -o ${POFILE%.po}.mo $POFILE done git add --verbose ${MODULE_DIR}/lang/* - git commit --author='Calamares CI ' --message="[${MODULE_NAME}] Automatic merge of Transifex translations" | true + git commit "$AUTHOR" --message="[${MODULE_NAME}] $BOILERPLATE" | true fi fi done -git push --set-upstream origin master +# git push --set-upstream origin master diff --git a/ci/txpush.sh b/ci/txpush.sh index d1a2d82be..186ede9b6 100755 --- a/ci/txpush.sh +++ b/ci/txpush.sh @@ -1,34 +1,62 @@ -#!/bin/bash +#!/bin/sh +# +# Fetch the Transifex translations for Calamares and incorporate them +# into the source tree, adding commits of the different files. -# Make sure we can make Transifex and git operations from the Calamares Docker+Jenkins environment. -cp ~/jenkins-master/.transifexrc ~ -cp ~/jenkins-master/.gitconfig ~ -cp -R ~/jenkins-master/.ssh ~ +### INITIAL SETUP +# +# This stuff needs to be done once; in a real CI environment where it +# runs regularly in a container, the setup needs to be done when +# creating the container. +# +# +# cp ~/jenkins-master/.transifexrc ~ # Transifex user settings +# cp ~/jenkins-master/.gitconfig ~ # Git config, user settings +# cp -R ~/jenkins-master/.ssh ~ # SSH, presumably for github +# +# cd "$WORKSPACE" +# git config --global http.sslVerify false -cd "$WORKSPACE" -git config --global http.sslVerify false +test -f "CMakeLists.txt" || { echo "! Not at Calamares top-level" ; exit 1 ; } +test -f ".tx/config" || { echo "! Not at Calamares top-level" ; exit 1 ; } +test -f "calamares.desktop" || { echo "! Not at Calamares top-level" ; exit 1 ; } + +### CREATE TRANSLATIONS +# +# Use local tools (depending on type of source) to create translation +# sources, then push to Transifex export QT_SELECT=5 lupdate src/ -ts -no-obsolete lang/calamares_en.ts +tx push --source --no-interactive -r calamares.calamares-master +tx push --no-interactive -r calamares.fdo + +### PYTHON MODULES +# +# The Python tooling depends on the underlying distro to provide +# gettext, and handles two cases: +# +# - python modules with their own lang/ subdir, for larger translations +# - python modules without lang/, which use one shared catalog +# + # Arch # PYGETTEXT=/usr/lib/python3.5/Tools/i18n/pygettext.py # Ubuntu PYGETTEXT=pygettext3 -for MODULE_DIR in `find src/modules -maxdepth 1 -mindepth 1 -type d`; do - FILES=(${MODULE_DIR}/*.py) - if [ ${#FILES[@]} -gt 0 ]; then +for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do + FILES=$(find "$MODULE_DIR" -name "*.py" -a -type f) + if test -n "$FILES" ; then MODULE_NAME=$(basename ${MODULE_DIR}) if [ -d ${MODULE_DIR}/lang ]; then ${PYGETTEXT} -p ${MODULE_DIR}/lang -d ${MODULE_NAME} ${MODULE_DIR}/*.py if [ -f ${MODULE_DIR}/lang/${MODULE_NAME}.pot ]; then tx set -r calamares.${MODULE_NAME} --source -l en ${MODULE_DIR}/lang/${MODULE_NAME}.pot - tx push --force --source --no-interactive -r calamares.${MODULE_NAME} + tx push --source --no-interactive -r calamares.${MODULE_NAME} fi fi fi done - -tx push --force --source --no-interactive -r calamares.calamares-master diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts index df49f45eb..8de6e0e04 100644 --- a/lang/calamares_ar.ts +++ b/lang/calamares_ar.ts @@ -240,7 +240,7 @@ Output: Cancel installation without changing the system. - + الغاء الـ تثبيت من دون احداث تغيير في النظام @@ -257,17 +257,17 @@ The installer will quit and all changes will be lost. &Yes - + &نعم &No - + &لا &Close - + &اغلاق @@ -523,22 +523,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1392,7 +1392,6 @@ The installer will quit and all changes will be lost. ما الاسم الذي تريده لتلج به؟ - diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts index c47df7df4..a454992bd 100644 --- a/lang/calamares_ast.ts +++ b/lang/calamares_ast.ts @@ -523,22 +523,22 @@ L'instalador colará y perderánse toles camudancies. ClearTempMountsJob - + Clear all temporary mounts. Llimpiar tolos montaxes temporales. - + Clearing all temporary mounts. Llimpiando tolos montaxes temporales. - + Cannot get list of temporary mounts. Nun pue consiguise la llista de montaxes temporales. - + Cleared all temporary mounts. Llimpiáronse tolos montaxes temporales. @@ -1392,7 +1392,6 @@ L'instalador colará y perderánse toles camudancies. ¿Qué nome quies usar p'aniciar sesión? - diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts index 2cfa94dc8..482981aa5 100644 --- a/lang/calamares_bg.ts +++ b/lang/calamares_bg.ts @@ -70,7 +70,7 @@ Type: - + Вид: @@ -81,7 +81,7 @@ Interface: - + Интерфейс: @@ -524,22 +524,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. Разчисти всички временни монтирания. - + Clearing all temporary mounts. Разчистване на всички временни монтирания. - + Cannot get list of temporary mounts. Не може да се вземе лист от временни монтирания. - + Cleared all temporary mounts. Разчистени всички временни монтирания. @@ -1393,7 +1393,6 @@ The installer will quit and all changes will be lost. Какво име искате да използвате за влизане? - diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts index ab9c5e925..5d94701ee 100644 --- a/lang/calamares_ca.ts +++ b/lang/calamares_ca.ts @@ -523,22 +523,22 @@ L'instal·lador es tancarà i tots els canvis es perdran. ClearTempMountsJob - + Clear all temporary mounts. Neteja tots els muntatges temporals - + Clearing all temporary mounts. Netejant tots els muntatges temporals. - + Cannot get list of temporary mounts. No es pot obtenir la llista dels muntatges temporals. - + Cleared all temporary mounts. S'han netejat tots els muntatges temporals. @@ -1392,7 +1392,6 @@ L'instal·lador es tancarà i tots els canvis es perdran. Quin nom voleu utilitzar per iniciar la sessió d'usuari? - diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts index cc02ed872..c16c96740 100644 --- a/lang/calamares_cs_CZ.ts +++ b/lang/calamares_cs_CZ.ts @@ -523,22 +523,22 @@ Instalační program bude ukončen a všechny změny ztraceny. ClearTempMountsJob - + Clear all temporary mounts. Odpojit všechny dočasné přípojné body. - + Clearing all temporary mounts. Odpojuji všechny dočasné přípojné body. - + Cannot get list of temporary mounts. Nelze zjistit dočasné přípojné body. - + Cleared all temporary mounts. Vyčištěno od všech dočasných přípojných bodů. @@ -1392,7 +1392,6 @@ Instalační program bude ukončen a všechny změny ztraceny. Jaké jméno chcete používat pro přihlašování do systému? - diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index 6955f2945..08411f70d 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -523,22 +523,22 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. ClearTempMountsJob - + Clear all temporary mounts. Ryd alle midlertidige monteringspunkter. - + Clearing all temporary mounts. Rydder alle midlertidige monteringspunkter. - + Cannot get list of temporary mounts. Kan ikke få liste over midlertidige monteringspunkter. - + Cleared all temporary mounts. Rydder alle midlertidige monteringspunkter. @@ -1392,7 +1392,6 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Hvilket navn vil du bruge til at logge ind med? - diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index ea069753f..24f78addb 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -523,22 +523,22 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. ClearTempMountsJob - + Clear all temporary mounts. Alle temporären Mount-Points leeren. - + Clearing all temporary mounts. Löse alle temporär eingehängten Laufwerke. - + Cannot get list of temporary mounts. Konnte keine Liste von temporären Mount-Points einlesen. - + Cleared all temporary mounts. Alle temporären Mount-Points geleert. @@ -1392,7 +1392,6 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Welchen Namen möchten Sie zum Anmelden benutzen? - diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts index d24b67855..e813d90da 100644 --- a/lang/calamares_el.ts +++ b/lang/calamares_el.ts @@ -523,22 +523,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. Καθάρισε όλες τις προσωρινές προσαρτήσεις. - + Clearing all temporary mounts. Καθάρισμα όλων των προσωρινών προσαρτήσεων. - + Cannot get list of temporary mounts. Η λίστα των προσωρινών προσαρτήσεων δεν μπορεί να ληφθεί. - + Cleared all temporary mounts. Καθαρίστηκαν όλες οι προσωρινές προσαρτήσεις. @@ -1392,7 +1392,6 @@ The installer will quit and all changes will be lost. Ποιο όνομα θα θέλατε να χρησιμοποιείτε για σύνδεση; - diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts index 270b0a91e..c42b32856 100644 --- a/lang/calamares_en.ts +++ b/lang/calamares_en.ts @@ -523,22 +523,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. Clear all temporary mounts. - + Clearing all temporary mounts. Clearing all temporary mounts. - + Cannot get list of temporary mounts. Cannot get list of temporary mounts. - + Cleared all temporary mounts. Cleared all temporary mounts. @@ -1392,7 +1392,6 @@ The installer will quit and all changes will be lost. What name do you want to use to log in? - diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts index 3162ed1df..2f58c6872 100644 --- a/lang/calamares_en_GB.ts +++ b/lang/calamares_en_GB.ts @@ -523,22 +523,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. Cannot get list of temporary mounts. - + Cleared all temporary mounts. Cleared all temporary mounts. @@ -1392,7 +1392,6 @@ The installer will quit and all changes will be lost. What name do you want to use to log in? - diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts index 4f5e4cfb6..2fa296be0 100644 --- a/lang/calamares_es.ts +++ b/lang/calamares_es.ts @@ -524,22 +524,22 @@ Saldrá del instalador y se perderán todos los cambios. ClearTempMountsJob - + Clear all temporary mounts. Limpiar todos los puntos de montaje temporales. - + Clearing all temporary mounts. Limpiando todos los puntos de montaje temporales. - + Cannot get list of temporary mounts. No se puede obtener la lista de puntos de montaje temporales. - + Cleared all temporary mounts. Limpiado todos los puntos de montaje temporales. @@ -1393,7 +1393,6 @@ Saldrá del instalador y se perderán todos los cambios. ¿Qué nombre desea usar para ingresar? - diff --git a/lang/calamares_es_ES.ts b/lang/calamares_es_ES.ts index 1a73c1974..a3a796c36 100644 --- a/lang/calamares_es_ES.ts +++ b/lang/calamares_es_ES.ts @@ -523,22 +523,22 @@ El instalador se cerrará y se perderán todos los cambios. ClearTempMountsJob - + Clear all temporary mounts. Quitar todos los puntos de montaje temporales. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. No se puede obtener la lista de puntos de montaje temporales. - + Cleared all temporary mounts. Se han quitado todos los puntos de montaje temporales. @@ -1392,7 +1392,6 @@ El instalador se cerrará y se perderán todos los cambios. ¿Qué nombre quieres usar para acceder al sistema? - diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts index 6aa32e2ba..14f6f7a5c 100644 --- a/lang/calamares_es_MX.ts +++ b/lang/calamares_es_MX.ts @@ -525,22 +525,22 @@ El instalador terminará y se perderán todos los cambios. ClearTempMountsJob - + Clear all temporary mounts. Quitar todos los puntos de montaje temporales. - + Clearing all temporary mounts. Limpiando todos los puntos de montaje temporales. - + Cannot get list of temporary mounts. No se puede obtener la lista de puntos de montaje temporales. - + Cleared all temporary mounts. Se han quitado todos los puntos de montaje temporales. @@ -1394,7 +1394,6 @@ El instalador terminará y se perderán todos los cambios. ¿Qué nombre desea usar para acceder al sistema? - diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts index f59cb41eb..c8e9f1715 100644 --- a/lang/calamares_es_PR.ts +++ b/lang/calamares_es_PR.ts @@ -522,22 +522,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1391,7 +1391,6 @@ The installer will quit and all changes will be lost. - diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts index 4b6cc3308..b5244d131 100644 --- a/lang/calamares_et.ts +++ b/lang/calamares_et.ts @@ -516,22 +516,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1385,7 +1385,6 @@ The installer will quit and all changes will be lost. - diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts index 6aec5b80a..8e4276dd5 100644 --- a/lang/calamares_eu.ts +++ b/lang/calamares_eu.ts @@ -203,12 +203,12 @@ Output: Bad main script file - + Script fitxategi nagusi okerra Main script file %1 for python job %2 is not readable. - + %1 script fitxategi nagusia ezin da irakurri python %2 lanerako @@ -238,7 +238,7 @@ Output: Cancel installation without changing the system. - + Instalazioa bertan behera utsi da sisteman aldaketarik gabe. @@ -254,17 +254,17 @@ The installer will quit and all changes will be lost. &Yes - + &Bai &No - + &Ez &Close - + &Itxi @@ -289,12 +289,12 @@ The installer will quit and all changes will be lost. &Done - + E&ginda The installation is complete. Close the installer. - + Instalazioa burutu da. Itxi instalatzailea. @@ -394,17 +394,17 @@ The installer will quit and all changes will be lost. After: - + Ondoren: <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + <strong>Eskuz partizioak landu</strong><br/>Zure kasa sortu edo tamainaz alda dezakezu partizioak. Boot loader location: - + Abio kargatzaile kokapena: @@ -422,12 +422,12 @@ The installer will quit and all changes will be lost. Current: - + Unekoa: Reuse %1 as home partition for %2. - + Berrerabili %1 home partizio bezala %2rentzat. @@ -437,22 +437,22 @@ The installer will quit and all changes will be lost. <strong>Select a partition to install on</strong> - + <strong>aukeratu partizioa instalatzeko</strong> An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + Ezin da inon aurkitu EFI sistemako partiziorik sistema honetan. Mesedez joan atzera eta erabili eskuz partizioak lantzea %1 ezartzeko. The EFI system partition at %1 will be used for starting %2. - + %1eko EFI partizio sistema erabiliko da abiarazteko %2. EFI system partition: - + EFI sistema-partizioa: @@ -520,22 +520,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1389,7 +1389,6 @@ The installer will quit and all changes will be lost. - diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts index 7adde8c9f..043f13c11 100644 --- a/lang/calamares_fa.ts +++ b/lang/calamares_fa.ts @@ -516,22 +516,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1385,7 +1385,6 @@ The installer will quit and all changes will be lost. - diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index bd2f9d406..f94828905 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -523,22 +523,22 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. ClearTempMountsJob - + Clear all temporary mounts. Poista kaikki väliaikaiset liitokset. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. Poistettu kaikki väliaikaiset liitokset. @@ -1392,7 +1392,6 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Mitä nimeä haluat käyttää sisäänkirjautumisessa? - diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts index 1307ff1b0..3292e5afe 100644 --- a/lang/calamares_fr.ts +++ b/lang/calamares_fr.ts @@ -523,22 +523,22 @@ L'installateur se fermera et les changements seront perdus. ClearTempMountsJob - + Clear all temporary mounts. Supprimer les montages temporaires. - + Clearing all temporary mounts. Libération des montages temporaires. - + Cannot get list of temporary mounts. Impossible de récupérer la liste des montages temporaires. - + Cleared all temporary mounts. Supprimer les montages temporaires. @@ -1392,7 +1392,6 @@ L'installateur se fermera et les changements seront perdus. Quel nom souhaitez-vous utiliser pour la connexion ? - diff --git a/lang/calamares_fr_CH.ts b/lang/calamares_fr_CH.ts index ab70049ea..94de21f8a 100644 --- a/lang/calamares_fr_CH.ts +++ b/lang/calamares_fr_CH.ts @@ -516,22 +516,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1385,7 +1385,6 @@ The installer will quit and all changes will be lost. - diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts index f20b96139..98e1e6dcf 100644 --- a/lang/calamares_gl.ts +++ b/lang/calamares_gl.ts @@ -524,22 +524,22 @@ O instalador pecharase e perderanse todos os cambios. ClearTempMountsJob - + Clear all temporary mounts. Limpar todas as montaxes temporais. - + Clearing all temporary mounts. Limpando todas as montaxes temporais. - + Cannot get list of temporary mounts. Non se pode obter unha lista dos montaxes temporais. - + Cleared all temporary mounts. Desmontados todos os volumes temporais. @@ -1393,7 +1393,6 @@ O instalador pecharase e perderanse todos os cambios. - diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts index 2b63cdef8..b3ddb8367 100644 --- a/lang/calamares_gu.ts +++ b/lang/calamares_gu.ts @@ -516,22 +516,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1385,7 +1385,6 @@ The installer will quit and all changes will be lost. - diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index 372f13883..b542db48e 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -272,7 +272,7 @@ The installer will quit and all changes will be lost. Continue with setup? - המשך עם תהליך ההתקנה? + המשך עם הליך ההתקנה? @@ -435,7 +435,7 @@ The installer will quit and all changes will be lost. <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - <strong>בחר מחיצה לכיווץ, לאחר מכן גרור את הפס התחתון בכדי לשנות את גודלה</strong> + <strong>בחר מחיצה לכיווץ, לאחר מכן גרור את הסרגל התחתון בכדי לשנות את גודלה</strong> @@ -445,7 +445,7 @@ The installer will quit and all changes will be lost. An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - מחיצת מערכת EFI לא נמצאה באף מקום על המערכת. אנא חזור והשתמש ביצירת מחיצות באופן ידני בכדי להגדיר את %1. + מחיצת מערכת EFI לא נמצאה במערכת. אנא חזור והשתמש ביצירת מחיצות באופן ידני בכדי להגדיר את %1. @@ -460,7 +460,7 @@ The installer will quit and all changes will be lost. This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - לא נמצאה מערכת הפעלה על התקן האחסון הזה. מה ברצונך לעשות?<br/> תוכל לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון. + לא נמצאה מערכת הפעלה על התקן אחסון זה. מה ברצונך לעשות?<br/> תוכל לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון. @@ -473,7 +473,7 @@ The installer will quit and all changes will be lost. This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - נמצא %1 על התקן האחסון הזה. מה ברצונך לעשות?<br/> תוכל לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון. + נמצא %1 על התקן אחסון זה. מה ברצונך לעשות?<br/> תוכל לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון. @@ -523,22 +523,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. מחק את כל נקודות העיגון הזמניות. - + Clearing all temporary mounts. מבצע מחיקה של כל נקודות העיגון הזמניות. - + Cannot get list of temporary mounts. לא ניתן לשלוף רשימה של כל נקודות העיגון הזמניות. - + Cleared all temporary mounts. בוצעה מחיקה של כל נקודות העיגון הזמניות. @@ -548,17 +548,17 @@ The installer will quit and all changes will be lost. Create a Partition - ייצר מחיצה + צור מחיצה MiB - מבי - בייט + MiB Partition &Type: - מחיצה &מסוג: + &סוג מחיצה: @@ -613,7 +613,7 @@ The installer will quit and all changes will be lost. Mountpoint already in use. Please select another one. - נקודת העיגון בשימוש. אנא בחר אחרת. + נקודת העיגון בשימוש. אנא בחר נקודת עיגון אחרת. @@ -651,7 +651,7 @@ The installer will quit and all changes will be lost. The installer failed to create file system on partition %1. - אשף ההתקנה נכשל בעת יצירת מערכת הקבצים על המחיצה %1. + אשף ההתקנה נכשל בעת יצירת מערכת הקבצים על מחיצה %1. @@ -674,7 +674,7 @@ The installer will quit and all changes will be lost. What kind of partition table do you want to create? - איזה סוג של טבלת מחיצות ברצונך לייצר? + איזה סוג של טבלת מחיצות ברצונך ליצור? @@ -712,7 +712,7 @@ The installer will quit and all changes will be lost. Could not open device %1. - לא ניתן לפתוח את ההתקן %1. + לא ניתן לפתוח את התקן %1. @@ -755,7 +755,7 @@ The installer will quit and all changes will be lost. Cannot create user %1. - לא ניתן ליצור את המשתמש %1. + לא ניתן ליצור משתמש %1. @@ -813,7 +813,7 @@ The installer will quit and all changes will be lost. Could not open device %1. - לא ניתן לפתוח את ההתקן %1. + לא ניתן לפתוח את התקן %1. @@ -826,7 +826,7 @@ The installer will quit and all changes will be lost. The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred. - סוג <strong>טבלת המחיצות</strong> על התקן האחסון הנבחר.<br><br> הדרך היחידה לשנות את סוג טבלת המחיצות היא למחוק וליצור מחדש את טבלת המחיצות, אשר דורסת את כל המידע הקיים על התקן האחסון.<br> אשף ההתקנה ישמור את טבלת המחיצות הקיימת אלא אם כן תבחר אחרת במפורש.<br> במידה ואינך בטוח, על מערכות חדשות GPT הוא הסוג המועדף. + סוג <strong>טבלת המחיצות</strong> על התקן האחסון הנבחר.<br><br> הדרך היחידה לשנות את סוג טבלת המחיצות היא למחוק וליצור מחדש את טבלת המחיצות, אשר דורסת את כל המידע הקיים על התקן האחסון.<br> אשף ההתקנה ישמור את טבלת המחיצות הקיימת אלא אם כן תבחר אחרת במפורש.<br> במידה ואינך בטוח, במערכות מודרניות, GPT הוא הסוג המועדף. @@ -836,22 +836,22 @@ The installer will quit and all changes will be lost. This is a <strong>loop</strong> device.<br><br>It is a pseudo-device with no partition table that makes a file accessible as a block device. This kind of setup usually only contains a single filesystem. - זה הוא התקן מסוג <strong>loop</strong>.<br><br> זה הוא התקן מדמה ללא טבלת מחיצות אשר מאפשר גישה לקובץ כהתקן בלוק. תצורה מהסוג הזה בדרך כלל תכיל מערכת קבצים יחידה. + זהו התקן מסוג <strong>loop</strong>.<br><br> זהו התקן מדמה ללא טבלת מחיצות אשר מאפשר גישה לקובץ כהתקן בלוק. תצורה מסוג זה בדרך כלל תכיל מערכת קבצים יחידה. This installer <strong>cannot detect a partition table</strong> on the selected storage device.<br><br>The device either has no partition table, or the partition table is corrupted or of an unknown type.<br>This installer can create a new partition table for you, either automatically, or through the manual partitioning page. - אשף ההתקנה <strong>אינו יכול לזהות את טבלת המחיצות</strong> על התקן האחסון הנבחר.<br><br> ההתקן הנבחר לא מכיל טבלת מחיצות, או שטבלת המחיצות הקיימת הושחתה או שסוג הטבלה אינו מוכר.<br> אשף התקנה זה יכול ליצור טבלת מחיצות חדשה עבורך, אוטומטית, או בדף הגדרת מחיצות באופן ידני. + אשף ההתקנה <strong>אינו יכול לזהות את טבלת המחיצות</strong> על התקן האחסון הנבחר.<br><br> ההתקן הנבחר לא מכיל טבלת מחיצות, או שטבלת המחיצות הקיימת הושחתה או שסוג הטבלה אינו מוכר.<br> אשף התקנה זה יכול ליצור טבלת מחיצות חדשה עבורך אוטומטית או בדף הגדרת מחיצות באופן ידני. <br><br>This is the recommended partition table type for modern systems which start from an <strong>EFI</strong> boot environment. - <br><br> זהו סוג טבלת המחיצות המועדף על מערכות חדשות אשר מאותחלות ממחיצת טעינת סביבת <strong>EFI</strong>. + <br><br> זהו סוג טבלת מחיצות מועדף במערכות מודרניות, אשר מאותחלות ממחיצת טעינת מערכת <strong>EFI</strong>. <br><br>This partition table type is only advisable on older systems which start from a <strong>BIOS</strong> boot environment. GPT is recommended in most other cases.<br><br><strong>Warning:</strong> the MBR partition table is an obsolete MS-DOS era standard.<br>Only 4 <em>primary</em> partitions may be created, and of those 4, one can be an <em>extended</em> partition, which may in turn contain many <em>logical</em> partitions. - <br><br>הסוג הזה של טבלת המחיצות מומלץ לשימוש על מערכות ישנות אשר מאותחלות מסביבת טעינה <strong>BIOS</strong>. ברוב המקרים האחרים, GPT מומלץ לשימוש.<br><br><strong>אזהרה:</strong> תקן טבלת המחיצות של MBR מיושן מתקופת MS-DOS.<br> ניתן ליצור אך ורק 4 מחיצות <em>ראשיות</em>, מתוך ה 4 הללו, אחת יכולה להיות מוגדרת כמחיצה <em>מורחבת</em>, אשר יכולה להכיל מחיצות <em>לוגיות</em>. + <br><br>סוג זה של טבלת מחיצות מומלץ לשימוש על מערכות ישנות אשר מאותחלות מסביבת טעינה <strong>BIOS</strong>. ברוב המקרים האחרים, GPT מומלץ לשימוש.<br><br><strong>אזהרה:</strong> תקן טבלת המחיצות של MBR מיושן מתקופת MS-DOS.<br> ניתן ליצור אך ורק 4 מחיצות <em>ראשיות</em>, מתוכן, אחת יכולה להיות מוגדרת כמחיצה <em>מורחבת</em>, אשר יכולה להכיל מחיצות <em>לוגיות</em>. @@ -928,7 +928,7 @@ The installer will quit and all changes will be lost. MiB - מבי - בייט + MiB @@ -943,7 +943,7 @@ The installer will quit and all changes will be lost. Mountpoint already in use. Please select another one. - נקודת העיגון בשימוש. אנא בחר אחרת. + נקודת העיגון בשימוש. אנא בחר נקודת עיגון אחרת. @@ -971,7 +971,7 @@ The installer will quit and all changes will be lost. Please enter the same passphrase in both boxes. - אנא הכנס את אותו ביטוי אבטחה בשני התאים. + אנא הכנס ביטוי אבטחה זהה בשני התאים. @@ -1027,7 +1027,7 @@ The installer will quit and all changes will be lost. <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - <h1>תהליך ההתקנה הסתיים.</h1><br/>%1 הותקן על המחשב שלך.<br/> כעת ניתן לאתחל את המחשב אל המערכת החדשה שהותקנה, או להמשיך להשתמש בסביבה הנוכחית של %2. + <h1>תהליך ההתקנה הסתיים.</h1><br/>%1 הותקן על המחשב שלך.<br/> כעת ניתן לאתחל את המחשב אל תוך המערכת החדשה שהותקנה, או להמשיך להשתמש בסביבה הנוכחית של %2. @@ -1040,7 +1040,7 @@ The installer will quit and all changes will be lost. Finish - סיים + סיום @@ -1078,7 +1078,7 @@ The installer will quit and all changes will be lost. The installer failed to create file system on partition %1. - אשף ההתקנה נכשל בעת יצירת מערכת הקבצים על המחיצה %1. + אשף ההתקנה נכשל בעת יצירת מערכת הקבצים על מחיצה %1. @@ -1147,7 +1147,7 @@ The installer will quit and all changes will be lost. The system locale setting affects the language and character set for some command line user interface elements.<br/>The current setting is <strong>%1</strong>. - הגדרות המיקום של המערכת משפיעות על השפה וקידוד התווים של חלק מרכיבי ממשקי שורת פקודה למשתמש. <br/> ההגדרה הנוכחית היא <strong>%1</strong>. + הגדרת מיקום המערכת משפיעה על השפה וקידוד התווים של חלק מרכיבי ממשקי שורת פקודה למשתמש. <br/> ההגדרה הנוכחית היא <strong>%1</strong>. @@ -1291,7 +1291,7 @@ The installer will quit and all changes will be lost. Could not open file system on partition %1 for moving. - פתיחת מערכת הקבצים במחיצה %1 לטובת העברה נכשלה. + פתיחת מערכת הקבצים במחיצה %1 לטובת ההעברה נכשלה. @@ -1316,7 +1316,7 @@ The installer will quit and all changes will be lost. The logical sector sizes in the source and target for copying are not the same. This is currently unsupported. - הגדלים הלוגיים של מקטעי המקור והיעד להעתקה אינם זהים. לא נתמך בגרסה זו. + הגדלים הלוגיים של מקטעי המקור והיעד להעתקה אינם זהים. הנ"ל לא נתמך בגרסה זו. @@ -1392,7 +1392,6 @@ The installer will quit and all changes will be lost. באיזה שם ברצונך להשתמש בעת כניסה למחשב? - @@ -1402,7 +1401,7 @@ The installer will quit and all changes will be lost. <small>If more than one person will use this computer, you can set up multiple accounts after installation.</small> - <small>במידה ויותר מאדם אחד ישתמשו במחשב זה, תוכל להגדיר משתמשים נוספים לאחר ההתקנה.</small> + <small>במידה ויותר מאדם אחד ישתמש במחשב זה, תוכל להגדיר משתמשים נוספים לאחר ההתקנה.</small> @@ -1417,7 +1416,7 @@ The installer will quit and all changes will be lost. What is the name of this computer? - מהו שם המחשב הזה? + מהו שם מחשב זה? @@ -1568,7 +1567,7 @@ The installer will quit and all changes will be lost. Are you sure you want to create a new partition table on %1? - האם אתה בטוח שברצונך לייצר טבלת מחיצות חדשה על %1? + האם אתה בטוח שברצונך ליצור טבלת מחיצות חדשה על %1? @@ -1685,17 +1684,17 @@ The installer will quit and all changes will be lost. unknown - לא מוכרת + לא מוכר/ת extended - מורחבת + מורחב/ת unformatted - לא מאותחל + לא מאותחל/ת @@ -1705,7 +1704,7 @@ The installer will quit and all changes will be lost. Unpartitioned space or unknown partition table - הזכרון לא מחולק למחיצות או טבלת מחיצות לא מוכרת. + הזכרון לא מחולק למחיצות או טבלת מחיצות לא מוכרת @@ -1738,7 +1737,7 @@ The installer will quit and all changes will be lost. %1 cannot be installed on this partition. - לא ניתן להתקין את %1 על המחיצה הזו. + לא ניתן להתקין את %1 על מחיצה זו. @@ -1793,22 +1792,22 @@ The installer will quit and all changes will be lost. has at least %1 GB available drive space - קיים לפחות %1 גיגה - בייט של נפח אחסון + קיים לפחות %1 GB של נפח אחסון There is not enough drive space. At least %1 GB is required. - נפח האחסון לא מספק. נדרש לפחות %1 גיגה - בייט. + נפח האחסון לא מספק. נדרש לפחות %1 GB. has at least %1 GB working memory - קיים לפחות %1 גיגה - בייט של זכרון פעולה + קיים לפחות %1 GB של זכרון פעולה The system does not have enough working memory. At least %1 GB is required. - כמות הזכרון הנדרשת לפעולה לא מספיקה. נדרש לפחות %1 גיגה - בייט. + כמות הזכרון הנדרשת לפעולה, לא מספיקה. נדרש לפחות %1 GB. @@ -1928,7 +1927,7 @@ The installer will quit and all changes will be lost. Cannot write hostname to target system - נכשלה כתיבת שם העמדה למערכת המטרה. + נכשלה כתיבת שם העמדה למערכת המטרה @@ -2261,7 +2260,7 @@ The installer will quit and all changes will be lost. <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - <h1>%1</h1><br/><strong>%2<br/>עבור %3</strong><br/><br/>זכויות יוצרים 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>זכויות יוצרים 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>תודות ל: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the ול<a href="https://www.transifex.com/calamares/calamares/">צוות התרגום של Calamares</a>.<br/><br/>פיתוח <a href="http://calamares.io/">Calamares</a> בחסות <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - משחררים תוכנה. + <h1>%1</h1><br/><strong>%2<br/>עבור %3</strong><br/><br/>זכויות יוצרים 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>זכויות יוצרים 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>תודות ל: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg ול<a href="https://www.transifex.com/calamares/calamares/">צוות התרגום של Calamares</a>.<br/><br/>פיתוח <a href="http://calamares.io/">Calamares</a> בחסות <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - משחררים תוכנה. diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts index 7882b81a1..92246c548 100644 --- a/lang/calamares_hi.ts +++ b/lang/calamares_hi.ts @@ -516,22 +516,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1385,7 +1385,6 @@ The installer will quit and all changes will be lost. - diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts index ca9b203d6..bba908f49 100644 --- a/lang/calamares_hr.ts +++ b/lang/calamares_hr.ts @@ -523,22 +523,22 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. ClearTempMountsJob - + Clear all temporary mounts. Ukloni sva privremena montiranja. - + Clearing all temporary mounts. Uklanjam sva privremena montiranja. - + Cannot get list of temporary mounts. Ne mogu dohvatiti popis privremenih montiranja. - + Cleared all temporary mounts. Uklonjena sva privremena montiranja. @@ -553,7 +553,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. MiB - + MiB @@ -928,7 +928,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. MiB - + MiB @@ -1392,7 +1392,6 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Koje ime želite koristiti za prijavu? - diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts index bcd1b02e1..c8b56d845 100644 --- a/lang/calamares_hu.ts +++ b/lang/calamares_hu.ts @@ -524,22 +524,22 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l ClearTempMountsJob - + Clear all temporary mounts. Minden ideiglenes csatolás törlése - + Clearing all temporary mounts. Minden ideiglenes csatolás törlése - + Cannot get list of temporary mounts. Nem lehet lekérni az ideiglenes csatolási listát - + Cleared all temporary mounts. Minden ideiglenes csatolás törölve @@ -1393,7 +1393,6 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Milyen felhasználónévvel szeretnél bejelentkezni? - diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index 11fe4cb93..85a07975a 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -525,22 +525,22 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. ClearTempMountsJob - + Clear all temporary mounts. Lepaskan semua kaitan sementara. - + Clearing all temporary mounts. Melepaskan semua kaitan sementara. - + Cannot get list of temporary mounts. Tidak bisa mendapatkan daftar kaitan sementara. - + Cleared all temporary mounts. Semua kaitan sementara dilepas. @@ -1394,7 +1394,6 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Nama apa yang ingin Anda gunakan untuk log in? - diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts index c2a90ea8b..868913959 100644 --- a/lang/calamares_is.ts +++ b/lang/calamares_is.ts @@ -240,7 +240,7 @@ Frálag: Cancel installation without changing the system. - + Hætta við uppsetningu ánþess að breyta kerfinu. @@ -257,17 +257,17 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. &Yes - + &Já &No - + &Nei &Close - + &Loka @@ -292,12 +292,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. &Done - + &Búið The installation is complete. Close the installer. - + Uppsetning er lokið. Lokaðu uppsetningarforritinu. @@ -517,28 +517,28 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Cleared all mounts for %1 - + Hreinsaði alla tengipunkta fyrir %1 ClearTempMountsJob - + Clear all temporary mounts. Hreinsa alla bráðabirgðatengipunkta. - + Clearing all temporary mounts. Hreinsa alla bráðabirgðatengipunkta. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. Hreinsaði alla bráðabirgðatengipunkta. @@ -553,7 +553,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. MiB - + MiB @@ -928,7 +928,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. MiB - + MiB @@ -1392,7 +1392,6 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Hvaða nafn vilt þú vilt nota til að skrá þig inn? - @@ -1763,7 +1762,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. <strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + <strong>%2</strong><br/><br/>EFI kerfisdisksneið er hvergi að finna á þessu kerfi. Vinsamlegast farðu til baka og notaðu handvirka skiptingu til að setja upp %1. @@ -2184,12 +2183,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Your hostname is too short. - + Notandanafnið þitt er of stutt. Your hostname is too long. - + Notandanafnið þitt er of langt. @@ -2251,7 +2250,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. <h1>Welcome to the Calamares installer for %1.</h1> - + <h1>Velkomin(n) til Calamares uppsetningar fyrir %1</h1> diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts index 818b90da5..223e60035 100644 --- a/lang/calamares_it_IT.ts +++ b/lang/calamares_it_IT.ts @@ -523,22 +523,22 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno ClearTempMountsJob - + Clear all temporary mounts. Rimuovere tutti i punti di mount temporanei. - + Clearing all temporary mounts. Rimozione di tutti i punti di mount temporanei. - + Cannot get list of temporary mounts. Non è possibile ottenere la lista dei punti di mount temporanei. - + Cleared all temporary mounts. Rimossi tutti i punti di mount temporanei. @@ -1392,7 +1392,6 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Quale nome usare per l'autenticazione? - diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts index 47bd4626b..e2c6bb2b2 100644 --- a/lang/calamares_ja.ts +++ b/lang/calamares_ja.ts @@ -240,7 +240,7 @@ Output: Cancel installation without changing the system. - + システムを変更しないでインストールを中止します。 @@ -257,17 +257,17 @@ The installer will quit and all changes will be lost. &Yes - + はい（&Y） &No - + いいえ（&N） &Close - + 閉じる（&C） @@ -292,12 +292,12 @@ The installer will quit and all changes will be lost. &Done - + 実行（&D） The installation is complete. Close the installer. - + インストールが完了しました。インストーラーを閉じます。 @@ -523,22 +523,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. すべての一時的なマウントをクリア - + Clearing all temporary mounts. すべての一時的なマウントをクリアしています。 - + Cannot get list of temporary mounts. 一時的なマウントのリストを取得できません。 - + Cleared all temporary mounts. すべての一時的なマウントを解除しました。 @@ -553,7 +553,7 @@ The installer will quit and all changes will be lost. MiB - + MiB @@ -928,7 +928,7 @@ The installer will quit and all changes will be lost. MiB - + MiB @@ -1392,7 +1392,6 @@ The installer will quit and all changes will be lost. ログインの際、どの名前を使用しますか? - diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts index 9755fd0a8..553e8ffd2 100644 --- a/lang/calamares_kk.ts +++ b/lang/calamares_kk.ts @@ -516,22 +516,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1385,7 +1385,6 @@ The installer will quit and all changes will be lost. - diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts index 330b147ff..a315bfb1d 100644 --- a/lang/calamares_lo.ts +++ b/lang/calamares_lo.ts @@ -516,22 +516,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1385,7 +1385,6 @@ The installer will quit and all changes will be lost. - diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts index 6dfdd78ea..2a37272d7 100644 --- a/lang/calamares_lt.ts +++ b/lang/calamares_lt.ts @@ -240,7 +240,7 @@ Išvestis: Cancel installation without changing the system. - Atsisakyti diegimo, nekeičiant sistemos. + Atsisakyti diegimo, nieko nekeisti sistemoje. @@ -523,22 +523,22 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. ClearTempMountsJob - + Clear all temporary mounts. Išvalyti visus laikinuosius prijungimus. - + Clearing all temporary mounts. Išvalomi visi laikinieji prijungimai. - + Cannot get list of temporary mounts. Nepavyksta gauti laikinųjų prijungimų sąrašo. - + Cleared all temporary mounts. Visi laikinieji prijungimai išvalyti. @@ -908,12 +908,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Format - Formatuoti + Suženklinti Warning: Formatting the partition will erase all existing data. - Įspėjimas: Skaidinio formatavimas sunaikins visus esamus duomenis. + Įspėjimas: suženklinant skaidinį, sunaikinami visi jame esantys duomenys. @@ -1027,7 +1027,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - <h1>Viskas atlikta.</h1><br/>%1 yra įdiegta jūsų kompiuteryje.<br/>Galite iš naujo paleisti kompiuterį dabar ir naudotis savo naująja sistema arba tęsti naudojimąsi %2 Live aplinka. + <h1>Viskas atlikta.</h1><br/>%1 sistema jau įdiegta.<br/>Galite iš naujo paleisti kompiuterį dabar ir naudotis savo naująja sistema; arba galite tęsti naudojimąsi %2 sistema demonstracinėje aplinkoje. @@ -1048,22 +1048,22 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Format partition %1 (file system: %2, size: %3 MB) on %4. - Formatuoti skaidinį %1 (failų sistema: %2, dydis: %3 MB) diske %4. + Suženklinti skaidinį %1 (failų sistema: %2, dydis: %3 MB) diske %4. Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - Formatuoti <strong>%3MB</strong> skaidinį <strong>%1</strong> su failų sistema <strong>%2</strong>. + Suženklinti <strong>%3MB</strong> skaidinį <strong>%1</strong> su failų sistema <strong>%2</strong>. Formatting partition %1 with file system %2. - Formatuojamas skaidinys %1 su %2 failų sistema. + Suženklinamas skaidinys %1 su %2 failų sistema. The installer failed to format partition %1 on disk '%2'. - Diegimo programai nepavyko formatuoti skaidinio %1 diske '%2'. + Diegimo programai nepavyko suženklinti „%2“ disko skaidinio %1. @@ -1160,7 +1160,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. I accept the terms and conditions above. - Aš sutinku su aukščiau išdėstytomis nuostatomis ir sąlygomis. + Sutinku su aukščiau išdėstytomis nuostatomis ir sąlygomis. @@ -1217,7 +1217,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. <a href="%1">view license agreement</a> - <a href="%1">žiūrėti licencijos sutartį</a> + <a href="%1">žiūrėti licenciją</a> @@ -1392,7 +1392,6 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Kokį vardą norite naudoti prisijungimui? - @@ -1553,12 +1552,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. &Edit - &Redaguoti + &Keisti &Delete - &Trinti + Ša&linti diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts index 5a741738e..bd286376f 100644 --- a/lang/calamares_mr.ts +++ b/lang/calamares_mr.ts @@ -516,22 +516,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1385,7 +1385,6 @@ The installer will quit and all changes will be lost. - diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts index ce15cc1d3..cf00efed5 100644 --- a/lang/calamares_nb.ts +++ b/lang/calamares_nb.ts @@ -523,22 +523,22 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. Klarer ikke å få tak i listen over midlertidige monterte disker. - + Cleared all temporary mounts. @@ -1392,7 +1392,6 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts index 7696f08c3..b2146dead 100644 --- a/lang/calamares_nl.ts +++ b/lang/calamares_nl.ts @@ -267,7 +267,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. &Close - + &Sluiten @@ -523,22 +523,22 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. ClearTempMountsJob - + Clear all temporary mounts. Geef alle tijdelijke aankoppelpunten vrij. - + Clearing all temporary mounts. Alle tijdelijke aankoppelpunten vrijgeven. - + Cannot get list of temporary mounts. Kan geen lijst van tijdelijke aankoppelpunten verkrijgen. - + Cleared all temporary mounts. Alle tijdelijke aankoppelpunten zijn vrijgegeven. @@ -553,7 +553,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. MiB - + MiB @@ -928,7 +928,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. MiB - + MiB @@ -1392,7 +1392,6 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Welke naam wil je gebruiken om in te loggen? - diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts index 165c0f2a8..c97fdf5e6 100644 --- a/lang/calamares_pl.ts +++ b/lang/calamares_pl.ts @@ -523,22 +523,22 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. ClearTempMountsJob - + Clear all temporary mounts. Wyczyść wszystkie tymczasowe montowania. - + Clearing all temporary mounts. Usuwanie wszystkich tymczasowych punktów montowania. - + Cannot get list of temporary mounts. Nie można uzyskać listy tymczasowych montowań. - + Cleared all temporary mounts. Wyczyszczono wszystkie tymczasowe montowania. @@ -1392,7 +1392,6 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Jakiego imienia chcesz używać do logowania się? - diff --git a/lang/calamares_pl_PL.ts b/lang/calamares_pl_PL.ts index c4ae6ed4a..010d16dc3 100644 --- a/lang/calamares_pl_PL.ts +++ b/lang/calamares_pl_PL.ts @@ -523,22 +523,22 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1392,7 +1392,6 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone.Jakiego imienia chcesz używać do logowania się? - diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index efd56a420..7af01a10a 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -525,22 +525,22 @@ A instalação pode continuar, mas alguns recursos podem ser desativados. ClearTempMountsJob - + Clear all temporary mounts. Limpar pontos de montagens temporários. - + Clearing all temporary mounts. Limpando todos os pontos de montagem temporários. - + Cannot get list of temporary mounts. Não foi possível listar os pontos de montagens. - + Cleared all temporary mounts. Pontos de montagens temporários limpos. @@ -1394,7 +1394,6 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.Qual nome você quer usar para entrar? - diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index f49c80d24..66c142a06 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -523,22 +523,22 @@ O instalador será encerrado e todas as alterações serão perdidas. ClearTempMountsJob - + Clear all temporary mounts. Clarear todas as montagens temporárias. - + Clearing all temporary mounts. A limpar todas as montagens temporárias. - + Cannot get list of temporary mounts. Não é possível obter a lista de montagens temporárias. - + Cleared all temporary mounts. Clareadas todas as montagens temporárias. @@ -1392,7 +1392,6 @@ O instalador será encerrado e todas as alterações serão perdidas.Que nome deseja usar para iniciar a sessão? - diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts index 7ed28083a..efbad5e3a 100644 --- a/lang/calamares_ro.ts +++ b/lang/calamares_ro.ts @@ -523,22 +523,22 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. ClearTempMountsJob - + Clear all temporary mounts. Elimină toate montările temporare. - + Clearing all temporary mounts. Se elimină toate montările temporare. - + Cannot get list of temporary mounts. Nu se poate obține o listă a montărilor temporare. - + Cleared all temporary mounts. S-au eliminat toate montările temporare. @@ -1392,7 +1392,6 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Ce nume doriți să utilizați pentru logare? - diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts index 6486724fd..e45353dcd 100644 --- a/lang/calamares_ru.ts +++ b/lang/calamares_ru.ts @@ -256,17 +256,17 @@ The installer will quit and all changes will be lost. &Yes - + &Да &No - + &Нет &Close - + &Закрыть @@ -296,7 +296,7 @@ The installer will quit and all changes will be lost. The installation is complete. Close the installer. - + Установка завершена. Закройте установщик. @@ -522,22 +522,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. Освободить все временные точки монтирования. - + Clearing all temporary mounts. Освобождаются все временные точки монтирования. - + Cannot get list of temporary mounts. Не удалось получить список временных точек монтирования. - + Cleared all temporary mounts. Освобождены все временные точки монтирования. @@ -871,7 +871,7 @@ The installer will quit and all changes will be lost. Skip writing LUKS configuration for Dracut: "/" partition is not encrypted - + Пропустить сохранение LUKS настроек для Dracut: "/" раздел не зашифрован @@ -884,7 +884,7 @@ The installer will quit and all changes will be lost. Dummy C++ Job - + Dummy C++ Job @@ -1391,7 +1391,6 @@ The installer will quit and all changes will be lost. Какое имя Вы хотите использовать для входа? - diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts index 8c719499b..109e343c8 100644 --- a/lang/calamares_sk.ts +++ b/lang/calamares_sk.ts @@ -523,22 +523,22 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. ClearTempMountsJob - + Clear all temporary mounts. Vymazanie všetkých dočasných pripojení. - + Clearing all temporary mounts. Vymazávajú sa všetky dočasné pripojenia. - + Cannot get list of temporary mounts. Nedá sa získať zoznam dočasných pripojení. - + Cleared all temporary mounts. Vymazané všetky dočasné pripojenia. @@ -553,7 +553,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. MiB - + MiB @@ -928,7 +928,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. MiB - + MiB @@ -1392,7 +1392,6 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Aké meno chcete použiť na prihlásenie? - diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts index 3529c04e9..19e101ca2 100644 --- a/lang/calamares_sl.ts +++ b/lang/calamares_sl.ts @@ -523,22 +523,22 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. ClearTempMountsJob - + Clear all temporary mounts. Počisti vse začasne priklope. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. Ni možno dobiti seznama začasnih priklopov. - + Cleared all temporary mounts. Vsi začasni priklopi so bili počiščeni. @@ -1392,7 +1392,6 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. Katero ime želite uporabiti za prijavljanje? - diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts index 5ae1425ae..9f0cc2348 100644 --- a/lang/calamares_sr.ts +++ b/lang/calamares_sr.ts @@ -523,22 +523,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1392,7 +1392,6 @@ The installer will quit and all changes will be lost. - diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts index 2736f2336..e8af514de 100644 --- a/lang/calamares_sr@latin.ts +++ b/lang/calamares_sr@latin.ts @@ -523,22 +523,22 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1392,7 +1392,6 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. Koje ime želite koristiti da se prijavite? - diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index 80bfa84a5..aafaeace6 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -523,22 +523,22 @@ Alla ändringar kommer att gå förlorade. ClearTempMountsJob - + Clear all temporary mounts. Rensa alla tillfälliga monteringspunkter. - + Clearing all temporary mounts. Rensar alla tillfälliga monteringspunkter. - + Cannot get list of temporary mounts. Kunde inte hämta tillfälliga monteringspunkter. - + Cleared all temporary mounts. Rensade alla tillfälliga monteringspunkter @@ -1392,7 +1392,6 @@ Alla ändringar kommer att gå förlorade. Vilket namn vill du använda för att logga in? - diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts index 1f4b027d7..f0bb16bd3 100644 --- a/lang/calamares_th.ts +++ b/lang/calamares_th.ts @@ -523,22 +523,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. ล้างจุดเชื่อมต่อชั่วคราวทั้งหมด - + Clearing all temporary mounts. กำลังล้างจุดเชื่อมต่อชั่วคราวทุกจุด - + Cannot get list of temporary mounts. ไม่สามารถดึงรายการจุดเชื่อมต่อชั่วคราวได้ - + Cleared all temporary mounts. จุดเชื่อมต่อชั่วคราวทั้งหมดถูกล้างแล้ว @@ -1392,7 +1392,6 @@ The installer will quit and all changes will be lost. ชื่อที่คุณต้องการใช้ในการล็อกอิน? - diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts index 139c60040..9c20c21ce 100644 --- a/lang/calamares_tr_TR.ts +++ b/lang/calamares_tr_TR.ts @@ -240,7 +240,7 @@ Output: Cancel installation without changing the system. - + Sistemi değiştirmeden yüklemeyi iptal edin. @@ -257,17 +257,17 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. &Yes - + &Evet &No - + &Hayır &Close - + &Kapat @@ -292,12 +292,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. &Done - + &Tamam The installation is complete. Close the installer. - + Yükleme işi tamamlandı. Sistem yükleyiciyi kapatın. @@ -526,22 +526,22 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. ClearTempMountsJob - + Clear all temporary mounts. Tüm geçici bağları temizleyin. - + Clearing all temporary mounts. Geçici olarak bağlananlar temizleniyor. - + Cannot get list of temporary mounts. Geçici bağların listesi alınamadı. - + Cleared all temporary mounts. Tüm geçici bağlar temizlendi. @@ -556,7 +556,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. MiB - + MB @@ -931,7 +931,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. MiB - + MB @@ -1035,7 +1035,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - + <h1>Yükleme Başarısız</h1><br/>%1 bilgisayarınıza yüklenemedi.<br/>Hata mesajı çıktısı: %2. @@ -1395,7 +1395,6 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Giriş için hangi adı kullanmak istersiniz? - @@ -1843,7 +1842,7 @@ Sistem güç kaynağına bağlı değil. The screen is too small to display the installer. - + Ekran, sistem yükleyiciyi görüntülemek için çok küçük. @@ -2256,7 +2255,7 @@ Sistem güç kaynağına bağlı değil. <h1>Welcome to the Calamares installer for %1.</h1> - + <h1>%1 Calamares Sistem Yükleyici .</h1> @@ -2266,7 +2265,7 @@ Sistem güç kaynağına bağlı değil. <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/><strong>%2<br/>%3 sürüm</strong><br/><br/>Telif Hakkı 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Telif Hakkı 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Teşekkürler: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg ve<a href="https://www.transifex.com/calamares/calamares/">Calamares çeviri takımı</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> gelişim sponsoru <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Özgür Yazılım. diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts index 45369af06..b877c5c97 100644 --- a/lang/calamares_uk.ts +++ b/lang/calamares_uk.ts @@ -516,22 +516,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1385,7 +1385,6 @@ The installer will quit and all changes will be lost. - diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts index fb315889c..bbaea6219 100644 --- a/lang/calamares_ur.ts +++ b/lang/calamares_ur.ts @@ -516,22 +516,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1385,7 +1385,6 @@ The installer will quit and all changes will be lost. - diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts index d39d14fe5..c984cb6b0 100644 --- a/lang/calamares_uz.ts +++ b/lang/calamares_uz.ts @@ -516,22 +516,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. - + Clearing all temporary mounts. - + Cannot get list of temporary mounts. - + Cleared all temporary mounts. @@ -1385,7 +1385,6 @@ The installer will quit and all changes will be lost. - diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts index 24de042cd..d93d55cb4 100644 --- a/lang/calamares_zh_CN.ts +++ b/lang/calamares_zh_CN.ts @@ -524,22 +524,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. 清除所有临时挂载点。 - + Clearing all temporary mounts. 正在清除所有临时挂载点。 - + Cannot get list of temporary mounts. 无法获取临时挂载点列表。 - + Cleared all temporary mounts. 所有临时挂载点都已经清除。 @@ -554,7 +554,7 @@ The installer will quit and all changes will be lost. MiB - + MiB @@ -930,7 +930,7 @@ The installer will quit and all changes will be lost. MiB - + MiB @@ -1394,7 +1394,6 @@ The installer will quit and all changes will be lost. 您想要使用的登录用户名是？ - @@ -2263,7 +2262,7 @@ The installer will quit and all changes will be lost. <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/><strong>%2<br/>于 %3</strong><br/><br/>版权 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>版权 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>鸣谢： Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg 和 <a href="https://www.transifex.com/calamares/calamares/">Calamares 翻译团队</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> 开发赞助来自 <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts index 203244950..d1f22ee66 100644 --- a/lang/calamares_zh_TW.ts +++ b/lang/calamares_zh_TW.ts @@ -523,22 +523,22 @@ The installer will quit and all changes will be lost. ClearTempMountsJob - + Clear all temporary mounts. 清除所有暫時掛載。 - + Clearing all temporary mounts. 正在清除所有暫時掛載。 - + Cannot get list of temporary mounts. 無法取得暫時掛載的列表。 - + Cleared all temporary mounts. 已清除所有暫時掛載。 @@ -1392,7 +1392,6 @@ The installer will quit and all changes will be lost. 您想使用何種登入名稱？ - diff --git a/lang/desktop_ar.desktop b/lang/desktop_ar.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_ar.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_ast.desktop b/lang/desktop_ast.desktop new file mode 100644 index 000000000..b2ecfc1b9 --- /dev/null +++ b/lang/desktop_ast.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations +Name[ast]=Calamares +Icon[ast]=calamares +GenericName[ast]=Instalador del sistema +Comment[ast]=Calamares — Instalador del sistema diff --git a/lang/desktop_bg.desktop b/lang/desktop_bg.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_bg.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_ca.desktop b/lang/desktop_ca.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_ca.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_cs_CZ.desktop b/lang/desktop_cs_CZ.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_cs_CZ.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_da.desktop b/lang/desktop_da.desktop new file mode 100644 index 000000000..0036b0b4b --- /dev/null +++ b/lang/desktop_da.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations +Name[da]=Calamares +Icon[da]=calamares +GenericName[da]=Systeminstallationsprogram +Comment[da]=Calamares — Systeminstallationsprogram diff --git a/lang/desktop_de.desktop b/lang/desktop_de.desktop new file mode 100644 index 000000000..130cb1e00 --- /dev/null +++ b/lang/desktop_de.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations +Name[de]=Calamares +Icon[de]=calamares +GenericName[de]=Installation des Betriebssystems +Comment[de]=Calamares - Installation des Betriebssystems diff --git a/lang/desktop_el.desktop b/lang/desktop_el.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_el.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_en_GB.desktop b/lang/desktop_en_GB.desktop new file mode 100644 index 000000000..4766b57db --- /dev/null +++ b/lang/desktop_en_GB.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations +Name[en_GB]=Calamares +Icon[en_GB]=calamares +GenericName[en_GB]=System Installer +Comment[en_GB]=Calamares — System Installer diff --git a/lang/desktop_es.desktop b/lang/desktop_es.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_es.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_es_ES.desktop b/lang/desktop_es_ES.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_es_ES.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_es_MX.desktop b/lang/desktop_es_MX.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_es_MX.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_es_PR.desktop b/lang/desktop_es_PR.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_es_PR.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_et.desktop b/lang/desktop_et.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_et.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_eu.desktop b/lang/desktop_eu.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_eu.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_fa.desktop b/lang/desktop_fa.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_fa.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_fi_FI.desktop b/lang/desktop_fi_FI.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_fi_FI.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_fr.desktop b/lang/desktop_fr.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_fr.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_fr_CH.desktop b/lang/desktop_fr_CH.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_fr_CH.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_gl.desktop b/lang/desktop_gl.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_gl.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_gu.desktop b/lang/desktop_gu.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_gu.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_he.desktop b/lang/desktop_he.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_he.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_hi.desktop b/lang/desktop_hi.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_hi.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_hr.desktop b/lang/desktop_hr.desktop new file mode 100644 index 000000000..156106216 --- /dev/null +++ b/lang/desktop_hr.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations +Name[hr]=Calamares +Icon[hr]=calamares +GenericName[hr]=Instalacija sustava +Comment[hr]=Calamares — Instalacija sustava diff --git a/lang/desktop_hu.desktop b/lang/desktop_hu.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_hu.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_id.desktop b/lang/desktop_id.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_id.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_is.desktop b/lang/desktop_is.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_is.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_it_IT.desktop b/lang/desktop_it_IT.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_it_IT.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_ja.desktop b/lang/desktop_ja.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_ja.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_kk.desktop b/lang/desktop_kk.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_kk.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_lo.desktop b/lang/desktop_lo.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_lo.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_lt.desktop b/lang/desktop_lt.desktop new file mode 100644 index 000000000..77c4d28ef --- /dev/null +++ b/lang/desktop_lt.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations +Name[lt]=Calamares +Icon[lt]=calamares +GenericName[lt]=Sistemos diegimas į kompiuterį +Comment[lt]=Calamares — sistemos diegyklė diff --git a/lang/desktop_mr.desktop b/lang/desktop_mr.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_mr.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_nb.desktop b/lang/desktop_nb.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_nb.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_nl.desktop b/lang/desktop_nl.desktop new file mode 100644 index 000000000..bcd8a533d --- /dev/null +++ b/lang/desktop_nl.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations +Name[nl]=Calamares +Icon[nl]=calamares +GenericName[nl]=Installatieprogramma +Comment[nl]=Calamares — Installatieprogramma diff --git a/lang/desktop_pl.desktop b/lang/desktop_pl.desktop new file mode 100644 index 000000000..c3c26319f --- /dev/null +++ b/lang/desktop_pl.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations +Name[pl]=Calamares +Icon[pl]=calamares +GenericName[pl]=Instalator systemu +Comment[pl]=Calamares — Instalator systemu diff --git a/lang/desktop_pl_PL.desktop b/lang/desktop_pl_PL.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_pl_PL.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_pt_BR.desktop b/lang/desktop_pt_BR.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_pt_BR.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_pt_PT.desktop b/lang/desktop_pt_PT.desktop new file mode 100644 index 000000000..09c0e71f2 --- /dev/null +++ b/lang/desktop_pt_PT.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations +Name[pt_PT]=Calamares +Icon[pt_PT]=calamares +GenericName[pt_PT]=Instalador de Sistema +Comment[pt_PT]=Calamares - Instalador de Sistema diff --git a/lang/desktop_ro.desktop b/lang/desktop_ro.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_ro.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_ru.desktop b/lang/desktop_ru.desktop new file mode 100644 index 000000000..6b200a129 --- /dev/null +++ b/lang/desktop_ru.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations +Name[ru]=Calamares +Icon[ru]=calamares +GenericName[ru]=Установщик системы +Comment[ru]=Calamares - Установщик системы diff --git a/lang/desktop_sk.desktop b/lang/desktop_sk.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_sk.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_sl.desktop b/lang/desktop_sl.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_sl.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_sr.desktop b/lang/desktop_sr.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_sr.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_sr@latin.desktop b/lang/desktop_sr@latin.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_sr@latin.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_sv.desktop b/lang/desktop_sv.desktop new file mode 100644 index 000000000..4afb84fbd --- /dev/null +++ b/lang/desktop_sv.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations +Name[sv]=Calamares +Icon[sv]=calamares +GenericName[sv]=Systeminstallerare +Comment[sv]=Calamares — Systeminstallerare diff --git a/lang/desktop_th.desktop b/lang/desktop_th.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_th.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_tr_TR.desktop b/lang/desktop_tr_TR.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_tr_TR.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_uk.desktop b/lang/desktop_uk.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_uk.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_ur.desktop b/lang/desktop_ur.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_ur.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_uz.desktop b/lang/desktop_uz.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_uz.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_zh_CN.desktop b/lang/desktop_zh_CN.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_zh_CN.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/lang/desktop_zh_TW.desktop b/lang/desktop_zh_TW.desktop new file mode 100644 index 000000000..f1668741b --- /dev/null +++ b/lang/desktop_zh_TW.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Calamares +GenericName=System Installer +Keywords=calamares;system;installer +TryExec=calamares +Exec=pkexec /usr/bin/calamares +Comment=Calamares — System Installer +Icon=calamares +Terminal=false +StartupNotify=true +Categories=Qt;System; + + +# Translations diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ff08b6ae5..4ef6afcbb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,7 @@ -include( ${PROJECT_BINARY_DIR}/CalamaresUse.cmake ) +include( CalamaresAddPlugin ) +include( CalamaresAddModuleSubdirectory ) +include( CalamaresAddLibrary ) +include( CalamaresAddBrandingSubdirectory ) include_directories( ${CMAKE_CURRENT_BINARY_DIR}/libcalamares ) include_directories( ${CMAKE_CURRENT_LIST_DIR}/libcalamares ) diff --git a/src/calamares/progresstree/ProgressTreeDelegate.cpp b/src/calamares/progresstree/ProgressTreeDelegate.cpp index e8f7700c3..f6b52b978 100644 --- a/src/calamares/progresstree/ProgressTreeDelegate.cpp +++ b/src/calamares/progresstree/ProgressTreeDelegate.cpp @@ -66,7 +66,7 @@ ProgressTreeDelegate::paint( QPainter* painter, { bool isFirstLevel = !index.parent().isValid(); - QStyleOptionViewItemV4 opt = option; + QStyleOptionViewItem opt = option; painter->save(); diff --git a/src/libcalamaresui/modulesystem/Module.cpp b/src/libcalamaresui/modulesystem/Module.cpp index 09386d58c..96ec0cceb 100644 --- a/src/libcalamaresui/modulesystem/Module.cpp +++ b/src/libcalamaresui/modulesystem/Module.cpp @@ -76,7 +76,7 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor, << instanceId; return nullptr; } - if ( typeString == "view" ) + if ( ( typeString == "view" ) || ( typeString == "viewmodule" ) ) { if ( intfString == "qtplugin" ) { @@ -90,6 +90,8 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor, cLog() << "PythonQt modules are not supported in this version of Calamares."; #endif } + else + cLog() << "Bad interface" << intfString << "for module type" << typeString; } else if ( typeString == "job" ) { @@ -109,7 +111,12 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor, cLog() << "Python modules are not supported in this version of Calamares."; #endif } + else + cLog() << "Bad interface" << intfString << "for module type" << typeString; } + else + cLog() << "Bad module type" << typeString; + if ( !m ) { cLog() << "Bad module type (" << typeString diff --git a/src/libcalamaresui/viewpages/ViewStep.h b/src/libcalamaresui/viewpages/ViewStep.h index c68ae31f5..27bab23c8 100644 --- a/src/libcalamaresui/viewpages/ViewStep.h +++ b/src/libcalamaresui/viewpages/ViewStep.h @@ -34,6 +34,10 @@ namespace Calamares * As of early 2017, a view module can be implemented by deriving from ViewStep * in C++ (as a Qt Plugin) or in Python with the PythonQt interface (which also * mimics the ViewStep class). + * + * A ViewStep can describe itself in human-readable format for the SummaryPage + * (which shows all of the things which have been collected to be done in the + * next exec-step) through prettyStatus() and createSummaryWidget(). */ class UIDLLEXPORT ViewStep : public QObject { @@ -43,11 +47,20 @@ public: virtual ~ViewStep(); virtual QString prettyName() const = 0; + + /** + * Optional. May return a non-empty string describing what this + * step is going to do (should be translated). This is also used + * in the summary page to describe what is going to be done. + * Return an empty string to provide no description. + */ virtual QString prettyStatus() const; /** - * Optional. Should return a widget which will be inserted in the summary - * page. The caller takes ownership of the widget. + * Optional. May return a widget which will be inserted in the summary + * page. The caller takes ownership of the widget. Return nullptr to + * provide no widget. In general, this is only used for complicated + * steps where prettyStatus() is not sufficient. */ virtual QWidget* createSummaryWidget() const; diff --git a/src/modules/README.md b/src/modules/README.md index 386d15a48..a2ec06144 100644 --- a/src/modules/README.md +++ b/src/modules/README.md @@ -1,60 +1,127 @@ -Calamares modules -=== +# Calamares modules + +Calamares modules are plugins that provide features like installer pages, +batch jobs, etc. An installer page (visible to the user) is called a "view", +while other modules are "jobs". -Calamares modules are plugins that provide features like installer pages, batch jobs, etc. Each Calamares module lives in its own directory. All modules are installed in `$DESTDIR/lib/calamares/modules`. -### Module directory and descriptor -A Calamares module must have a *module descriptor file*, named `module.desc`, this file must be placed in the module's -directory. -The module descriptor file is a YAML 1.2 document which defines the module's name, type, interface and possibly other -properties. The name of the module as defined in `module.desc` must be the same as the name of the module's directory. +# Module types There are two types of Calamares module: -* viewmodule, -* jobmodule. +* viewmodule, for user-visible modules. These may be in C++, or PythonQt. +* jobmodule, for not-user-visible modules. These may be done in C++, + Python, or as external processes. -There are three interfaces for Calamares modules: +# Module interfaces + +There are three (four) interfaces for Calamares modules: * qtplugin, -* python, -* process. +* python (jobmodules only), +* pythonqt (optional), +* process (jobmodules only). -### Module-specific configuration -A Calamares module *may* read a module configuration file, named `.conf`. If such a file is present in the +# Module directory + +Each Calamares module lives in its own directory. The contents +of the directory depend on the interface and type of the module. + +## Module descriptor + +A Calamares module must have a *module descriptor file*, named +`module.desc`. For C++ (qtplugin) modules using CMake as a build- +system and using the calamares_add_plugin() function -- this is the +recommended way to create such modules -- the module descriptor +file is optional, since it can be generated by the build system. +For other module interfaces, the module descriptor file is required. + +The module descriptor file must be placed in the module's directory. +The module descriptor file is a YAML 1.2 document which defines the +module's name, type, interface and possibly other properties. The name +of the module as defined in `module.desc` must be the same as the name +of the module's directory. + +Module descriptors must have the following keys: +- *name* (an identifier; must be the same as the directory name) +- *type* ("job" or "view") +- *interface* (see below for the different interfaces; generally we + refer to the kinds of modules by their interface) + +## Module-specific configuration + +A Calamares module *may* read a module configuration file, +named `.conf`. If such a file is present in the module's directory, it is shipped as a *default* configuration file. -The module configuration file, if it exists, is a YAML 1.2 document which contains a YAML map of anything. -All default module configuration files are installed in `$DESTDIR/share/calamares/modules` but can be overridden by -files with the same name placed manually (or by the packager) in `/etc/calamares/modules`. +The module configuration file, if it exists, is a YAML 1.2 document +which contains a YAML map of anything. -### Qt plugin viewmodules +All default module configuration files are installed in +`$DESTDIR/share/calamares/modules` but can be overridden by +files with the same name placed manually (or by the packager) +in `/etc/calamares/modules`. -Currently the only way to write a module which exposes one or more installer pages (viewmodule) is through a Qt plugin. -Viewmodules should implement `Calamares::ViewStep`. They can also implement `Calamares::Job` to provide jobs. +## C++ modules -To add a Qt plugin module, put it in a subdirectory and make sure it has a `module.desc` and a `CMakeLists.txt` with a -`calamares_add_plugin` call. It will be picked up automatically by our CMake magic. +Currently the recommended way to write a module which exposes one or more +installer pages (viewmodule) is through a C++ and Qt plugin. Viewmodules must +implement `Calamares::ViewStep`. They can also implement `Calamares::Job` +to provide jobs. +To add a Qt plugin module, put it in a subdirectory and make sure it has +a `CMakeLists.txt` with a `calamares_add_plugin` call. It will be picked +up automatically by our CMake magic. The `module.desc` file is optional. -### Python and process jobmodules +## Python modules -Batch jobs for Calamares can be written as Python scripts or as generic commands (shell scripts, external programs, etc.). -To add a Python or process jobmodule, put it in a subdirectory and make sure it has a `module.desc`. -It will be picked up automatically by our CMake magic. +Modules may use one of the python interfaces, which may be present +in a Calamares installation (but also may not be). These modules must have +a `module.desc` file. The Python script must implement one or more of the +Python interfaces for Calamares -- either the python jobmodule interface, +or the experimental pythonqt job- and viewmodule interfaces. + +To add a Python or process jobmodule, put it in a subdirectory and make sure +it has a `module.desc`. It will be picked up automatically by our CMake magic. +For all kinds of Python jobs, the key *script* must be set to the name of +the main python file for the job. This is almost universally "main.py". `CMakeLists.txt` is *not* used for Python and process jobmodules. -A Python jobmodule is a Python program which imports libcalamares and has a function `run()` as entry point. -`run()` must return `None` if everything went well, or a tuple `(str,str)` with an error message and description if -something went wrong. +Calamares offers a Python API for module developers, the core Calamares +functionality is exposed as `libcalamares.job` for job data, +`libcalamares.globalstorage` for shared data and `libcalamares.utils` for +generic utility functions. Documentation is inline. -Calamares offers a Python API for module developers, the core Calamares functionality is exposed as `libcalamares.job` -for job data, `libcalamares.globalstorage` for shared data and `libcalamares.utils` for generic utility functions. -Documentation is inline. +All code in Python job modules must obey PEP8, the only exception are +`libcalamares.globalstorage` keys, which should always be +camelCaseWithLowerCaseInitial to match the C++ identifier convention. -All code in Python job modules must obey PEP8, the only exception are `libcalamares.globalstorage` keys, which should -always be camelCaseWithLowerCaseInitial. +For testing and debugging we provide the `testmodule.py` script which +fakes a limited Calamares Python environment for running a single jobmodule. + +### Python Jobmodule + +A Python jobmodule is a Python program which imports libcalamares and has a +function `run()` as entry point. The function `run()` must return `None` if +everything went well, or a tuple `(str,str)` with an error message and +description if something went wrong. + +### PythonQt Jobmodule + +A PythonQt jobmodule implements the experimental Job interface by defining +a subclass of something. + +### PythonQt Viewmodule + +A PythonQt viewmodule implements the experimental View interface by defining +a subclass of something. + +## Process jobmodules + +A process jobmodule runs a (single) command. The interface is "process", +while the module type must be "job" or "jobmodule". + +The key *command* should have a string as value, which is passed to the +shell -- remember to quote it properly. -For testing and debugging we provide the `testmodule.py` script which fakes a limited Calamares Python environment for -running a single jobmodule. \ No newline at end of file diff --git a/src/modules/dracutlukscfg/module.desc b/src/modules/dracutlukscfg/module.desc deleted file mode 100644 index 10d9b78a9..000000000 --- a/src/modules/dracutlukscfg/module.desc +++ /dev/null @@ -1,7 +0,0 @@ -# Module metadata file for dracutlukscfg job -# Syntax is YAML 1.2 ---- -type: "job" -name: "dracutlukscfg" -interface: "qtplugin" -load: "libcalamares_job_dracutlukscfg.so" diff --git a/src/modules/dummycpp/module.desc b/src/modules/dummycpp/module.desc index 7f29e512e..11b9c500c 100644 --- a/src/modules/dummycpp/module.desc +++ b/src/modules/dummycpp/module.desc @@ -1,5 +1,18 @@ # Module metadata file for dummycpp job +# +# The metadata for C++ (qtplugin) plugins is almost never interesting: +# the CMakeLists.txt should be using calamares_add_plugin() which will +# generate the metadata file during the build. Only C++ plugins that +# have strange settings should have a module.desc (non-C++ plugins, +# on the other hand, must have one, since they don't have CMakeLists.txt). +# # Syntax is YAML 1.2 +# +# All four keys are mandatory. For C++ (qtplugin) modules, the interface +# value must be "qtplugin"; type is one of "job" or "view"; the name +# is the machine-identifier for the module and the load value should +# be the filename of the library that contains the implementation. +# --- type: "job" name: "dummycpp" diff --git a/src/modules/dummypython/main.py b/src/modules/dummypython/main.py index 29837ba96..fd9a2abda 100644 --- a/src/modules/dummypython/main.py +++ b/src/modules/dummypython/main.py @@ -39,18 +39,27 @@ def run(): accumulator = strftime("%Y-%m-%d %H:%M:%S", gmtime()) + "\n" accumulator += "Calamares version: " + libcalamares.VERSION_SHORT + "\n" accumulator += "This job's name: " + libcalamares.job.pretty_name + "\n" - accumulator += "This job's path: " + libcalamares.job.working_path + "\n" + accumulator += "This job's path: " + libcalamares.job.working_path + libcalamares.utils.debug(accumulator) + + accumulator = "*** Job configuration " accumulator += str(libcalamares.job.configuration) - accumulator += " *** globalstorage test ***\n" + libcalamares.utils.debug(accumulator) + + accumulator = "*** globalstorage test ***" accumulator += "lala: " accumulator += str(libcalamares.globalstorage.contains("lala")) + "\n" accumulator += "foo: " accumulator += str(libcalamares.globalstorage.contains("foo")) + "\n" - accumulator += "count: " + str(libcalamares.globalstorage.count()) + "\n" + accumulator += "count: " + str(libcalamares.globalstorage.count()) + libcalamares.utils.debug(accumulator) + libcalamares.globalstorage.insert("item2", "value2") libcalamares.globalstorage.insert("item3", 3) - accumulator += "keys: {}\n".format(str(libcalamares.globalstorage.keys())) - accumulator += "remove: {}\n".format( + accumulator = "keys: {}\n".format(str(libcalamares.globalstorage.keys())) + libcalamares.utils.debug(accumulator) + + accumulator = "remove: {}\n".format( str(libcalamares.globalstorage.remove("item2"))) accumulator += "values: {} {} {}\n".format( str(libcalamares.globalstorage.value("foo")), diff --git a/src/modules/dummypython/module.desc b/src/modules/dummypython/module.desc index a952d62b4..ebe81af1a 100644 --- a/src/modules/dummypython/module.desc +++ b/src/modules/dummypython/module.desc @@ -4,4 +4,4 @@ type: "job" name: "dummypython" interface: "python" -script: "main.py" #assumed relative to the current directory +script: "main.py" diff --git a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.mo index 89103b9fc..5349b6737 100644 Binary files a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po index aa79e272b..ba0e9712c 100644 --- a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po index 8ad3fcc29..aa5a5e80d 100644 --- a/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: enolp , 2017\n" "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n" diff --git a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo index 5810b5c8b..8fc73de23 100644 Binary files a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po index aeccde868..c45ba459a 100644 --- a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po index 8b835d53e..d92c4fd07 100644 --- a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Davidmp , 2016\n" "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n" diff --git a/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po index 39315aad3..fec1f577a 100644 --- a/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: pavelrz , 2016\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n" diff --git a/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po index 2ef0c478a..581060da6 100644 --- a/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: scootergrisen , 2017\n" "Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n" diff --git a/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po index bdda5587c..9a5d0cb54 100644 --- a/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Christian Spaan , 2017\n" "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n" diff --git a/src/modules/dummypythonqt/lang/dummypythonqt.pot b/src/modules/dummypythonqt/lang/dummypythonqt.pot index e86a7cfb5..5ebacd7f4 100644 --- a/src/modules/dummypythonqt/lang/dummypythonqt.pot +++ b/src/modules/dummypythonqt/lang/dummypythonqt.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.mo index 623651b28..b4195cc68 100644 Binary files a/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.po index a0a1e39ac..5837d9ca3 100644 --- a/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.mo index 139292859..219cff20f 100644 Binary files a/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.po index fbef3574d..9e2126f56 100644 --- a/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po index c6ad9cb49..1b07cf7f5 100644 --- a/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: strel , 2016\n" "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n" diff --git a/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.mo index 2df0f5598..2115baaf1 100644 Binary files a/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.po index 0bf137e63..2bf0e2270 100644 --- a/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Spanish (Spain) (https://www.transifex.com/calamares/teams/20061/es_ES/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.mo index 7edfbd4c5..68ea8166d 100644 Binary files a/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.po index e4ddecd1f..b4209b99b 100644 --- a/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.mo index c0bdc9dd3..49729889c 100644 Binary files a/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.po index bc3f5fd7f..54d6660e2 100644 --- a/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.mo index 2fefde074..f301c86e6 100644 Binary files a/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.po index 86f8f76bb..f2fd787f4 100644 --- a/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo index 2fa4956cf..6d4c89220 100644 Binary files a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po index 0a0cb6450..8a09c004a 100644 --- a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.mo index e57f00a95..036426bb4 100644 Binary files a/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.po index 5eda8fd4b..dc63e6af4 100644 --- a/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.mo index 267f72a1d..7c09520da 100644 Binary files a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po index 039d7178a..a018918cd 100644 --- a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo index 5d9ac8564..62f41ac89 100644 Binary files a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po index c3e7786a8..0309bab25 100644 --- a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.mo index e89b41257..a554b3b01 100644 Binary files a/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.po index 811a9c599..3a02e939b 100644 --- a/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: French (Switzerland) (https://www.transifex.com/calamares/teams/20061/fr_CH/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.mo index 49667ddf3..2f21852db 100644 Binary files a/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.po index 8c696c4d9..f93de00de 100644 --- a/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Galician (https://www.transifex.com/calamares/teams/20061/gl/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.mo index 5492dc2da..43d6bb8a9 100644 Binary files a/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.po index 44de3632d..56999c0a2 100644 --- a/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Gujarati (https://www.transifex.com/calamares/teams/20061/gu/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/he/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/he/LC_MESSAGES/dummypythonqt.po index d1c2d069f..8aaffc7a3 100644 --- a/src/modules/dummypythonqt/lang/he/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/he/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-04 13:09+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Eli Shleifer , 2017\n" "Language-Team: Hebrew (https://www.transifex.com/calamares/teams/20061/he/)\n" diff --git a/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.mo index 301076475..33f5578c2 100644 Binary files a/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.po index 9bdde5464..c37918c99 100644 --- a/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po index 18b99e390..ba4fdeb3d 100644 --- a/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Lovro Kudelić , 2016\n" "Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n" diff --git a/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po index 892d5cb8c..4624e00fd 100644 --- a/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Lajos Pasztor , 2016\n" "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n" diff --git a/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.mo index 219d010fc..ee16efc69 100644 Binary files a/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.po index 0a84e5d54..3cc058033 100644 --- a/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Kukuh Syafaat , 2016\n" "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n" diff --git a/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po index ec4db184f..ad6450012 100644 --- a/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Kristján Magnússon , 2017\n" "Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n" diff --git a/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po index 80131f589..300224012 100644 --- a/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Saverio , 2016\n" "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n" diff --git a/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po index 66443d7cc..fb1184883 100644 --- a/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Takefumi Nagata , 2016\n" "Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n" diff --git a/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.mo index a3c73b128..e7ce265a2 100644 Binary files a/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.po index a663aa86d..6744ef2d0 100644 --- a/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Kazakh (https://www.transifex.com/calamares/teams/20061/kk/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.mo index 7223e9c96..5b1c5ee21 100644 Binary files a/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.po index 9c89a9037..e2faad732 100644 --- a/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Lao (https://www.transifex.com/calamares/teams/20061/lo/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po index c9ee9e6d6..0273756ba 100644 --- a/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Moo , 2016\n" "Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n" diff --git a/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.mo index 20fc45a6a..9c513e85a 100644 Binary files a/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.po index 2b7db1be2..64586c488 100644 --- a/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Marathi (https://www.transifex.com/calamares/teams/20061/mr/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.mo index 642085236..e0aa88a98 100644 Binary files a/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.po index 0179ad8a4..693324b02 100644 --- a/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/calamares/teams/20061/nb/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.mo index d1cc8b052..d883f109b 100644 Binary files a/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.po index d17eedee7..ceeae44c5 100644 --- a/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: De Zeeappel , 2016\n" "Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n" diff --git a/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po index 56775f80e..04987ff05 100644 --- a/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: m4sk1n , 2016\n" "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n" diff --git a/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.mo index fc8f6ec8e..9cc14be42 100644 Binary files a/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.po index 71804d37e..68f454a86 100644 --- a/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Polish (Poland) (https://www.transifex.com/calamares/teams/20061/pl_PL/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.po index d648d5e30..79544f46e 100644 --- a/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Rodrigo de Almeida Sottomaior Macedo , 2017\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n" diff --git a/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.po index 6462d9e0e..f1de0e800 100644 --- a/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Ricardo Simões , 2016\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n" diff --git a/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.mo index 255365834..46b7e3207 100644 Binary files a/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.po index eae72ff2b..28d7776fb 100644 --- a/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Baadur Jobava , 2016\n" "Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n" diff --git a/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.mo index 48dcf8cc1..a627ad69a 100644 Binary files a/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.po index 7601a6d5a..f6bce14ed 100644 --- a/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.po @@ -4,12 +4,13 @@ # # Translators: # Вадим Сабынич , 2017 +# Simon Schwartz , 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Вадим Сабынич , 2017\n" +"Last-Translator: Simon Schwartz , 2017\n" "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ANSI_X3.4-1968\n" @@ -36,4 +37,4 @@ msgstr "" #: src/modules/dummypythonqt/main.py:190 msgid "A status message for Dummy PythonQt Job." -msgstr "" +msgstr "Сообщение состояния для Dummy PythonQt Job." diff --git a/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po index 7c7ec4c5e..3df4cfccd 100644 --- a/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Dušan Kazik , 2016\n" "Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n" diff --git a/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.mo index 6a2fade9d..96350dfe7 100644 Binary files a/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.po index 1d035b44f..a065019ce 100644 --- a/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Slovenian (https://www.transifex.com/calamares/teams/20061/sl/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po index 54e2ab947..f131d0d6f 100644 --- a/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Slobodan Simić , 2017\n" "Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n" diff --git a/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.mo index 40465ae48..81152d66b 100644 Binary files a/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.po index df24670d8..438c52fc6 100644 --- a/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Serbian (Latin) (https://www.transifex.com/calamares/teams/20061/sr@latin/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.mo index 475f73d3b..8afae7e98 100644 Binary files a/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.po index 1c9ed9d1a..19686b07a 100644 --- a/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.mo index fdc154052..931fda431 100644 Binary files a/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.po index c6dcd438e..7fbc94ef1 100644 --- a/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Thai (https://www.transifex.com/calamares/teams/20061/th/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po index 060767588..a2eb1a9c7 100644 --- a/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Demiray Muhterem , 2016\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n" diff --git a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.mo index b401ea7b1..e5b10eaef 100644 Binary files a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po index 8e6409fb5..fb5ab3ed1 100644 --- a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.mo index 0b3ce610d..a3b855312 100644 Binary files a/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.po index 5cdd23dff..b055fb4c6 100644 --- a/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Urdu (https://www.transifex.com/calamares/teams/20061/ur/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.mo index 810a31714..ee4381410 100644 Binary files a/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.po index dea118a29..30ec8648d 100644 --- a/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: Uzbek (https://www.transifex.com/calamares/teams/20061/uz/)\n" "MIME-Version: 1.0\n" diff --git a/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po index 457a7224d..8404093d6 100644 --- a/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Mingcong Bai , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n" diff --git a/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.po index ac17673da..3239073b5 100644 --- a/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-03 01:43+0000\n" +"POT-Creation-Date: 2017-07-20 02:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Jeff Huang , 2016\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n" diff --git a/src/modules/dummypythonqt/main.py b/src/modules/dummypythonqt/main.py index 80b8fc4e9..ebe4df6d5 100644 --- a/src/modules/dummypythonqt/main.py +++ b/src/modules/dummypythonqt/main.py @@ -94,7 +94,7 @@ class DummyPythonQtViewStep: self.main_widget.layout().addWidget(QLabel(_("A new QLabel."))) def prettyName(self): - return "Dummy PythonQt ViewStep" + return _("Dummy PythonQt ViewStep") def isNextEnabled(self): return True # The "Next" button should be clickable diff --git a/src/modules/finished/module.desc b/src/modules/finished/module.desc deleted file mode 100644 index bc3e628c6..000000000 --- a/src/modules/finished/module.desc +++ /dev/null @@ -1,7 +0,0 @@ -# Module metadata file for greeting viewmodule -# Syntax is YAML 1.2 ---- -type: "view" #core or view -name: "finished" #the module name. must be unique and same as the parent directory -interface: "qtplugin" #can be: qtplugin, python, process, ... -load: "libcalamares_viewmodule_finished.so" diff --git a/src/modules/initramfs/main.py b/src/modules/initramfs/main.py index 947c034ea..ff7d41f27 100644 --- a/src/modules/initramfs/main.py +++ b/src/modules/initramfs/main.py @@ -27,7 +27,8 @@ def run(): :return: """ - return_code = target_env_call(["update-initramfs", "-k", "all", "-u"]) + return_code = target_env_call(["update-initramfs", "-k", "all", "-c", + "-t"]) if return_code != 0: return ( diff --git a/src/modules/initramfscfg/main.py b/src/modules/initramfscfg/main.py index 3f77ccd6d..d935328d6 100644 --- a/src/modules/initramfscfg/main.py +++ b/src/modules/initramfscfg/main.py @@ -8,6 +8,7 @@ # Copyright 2016, David McKinney # Copyright 2016, Kevin Kofler # Copyright 2017, Alf Gaida +# Copyright 2017, Adriaan de Groot # # Calamares is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -48,14 +49,19 @@ def copy_initramfs_hooks(partitions, root_mount_point): if encrypt_hook: target = "{!s}/usr/share/initramfs-tools/hooks/encrypt_hook".format( root_mount_point) + + # Find where this module is installed + _filename = inspect.getframeinfo(inspect.currentframe()).filename + _path = os.path.dirname(os.path.abspath(_filename)) + if unencrypted_separate_boot: shutil.copy2( - "/usr/lib/calamares/modules/initramfscfg/encrypt_hook_nokey", + os.path.join(_path, "encrypt_hook_nokey"), target ) else: shutil.copy2( - "/usr/lib/calamares/modules/initramfscfg/encrypt_hook", + os.path.join(_path, "encrypt_hook"), target ) os.chmod(target, 0o755) diff --git a/src/modules/interactiveterminal/module.desc b/src/modules/interactiveterminal/module.desc deleted file mode 100644 index a2b5087c9..000000000 --- a/src/modules/interactiveterminal/module.desc +++ /dev/null @@ -1,7 +0,0 @@ -# Module metadata file for interactiveterminal viewmodule -# Syntax is YAML 1.2 ---- -type: "view" -name: "interactiveterminal" -interface: "qtplugin" -load: "libcalamares_viewmodule_interactiveterminal.so" diff --git a/src/modules/keyboard/module.desc b/src/modules/keyboard/module.desc deleted file mode 100644 index 391db19fc..000000000 --- a/src/modules/keyboard/module.desc +++ /dev/null @@ -1,7 +0,0 @@ -# Module metadata file for keyboard viewmodule -# Syntax is YAML 1.2 ---- -type: "view" -name: "keyboard" -interface: "qtplugin" -load: "libcalamares_viewmodule_keyboard.so" diff --git a/src/modules/license/module.desc b/src/modules/license/module.desc deleted file mode 100644 index 3c30ec3da..000000000 --- a/src/modules/license/module.desc +++ /dev/null @@ -1,7 +0,0 @@ -# Module metadata file for keyboard viewmodule -# Syntax is YAML 1.2 ---- -type: "view" -name: "license" -interface: "qtplugin" -load: "libcalamares_viewmodule_license.so" diff --git a/src/modules/locale/LocaleConfiguration.cpp b/src/modules/locale/LocaleConfiguration.cpp index 3631befec..b8f5f6a9e 100644 --- a/src/modules/locale/LocaleConfiguration.cpp +++ b/src/modules/locale/LocaleConfiguration.cpp @@ -272,7 +272,7 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale, bool -LocaleConfiguration::isEmpty() +LocaleConfiguration::isEmpty() const { return lang.isEmpty() && lc_numeric.isEmpty() && diff --git a/src/modules/locale/LocaleConfiguration.h b/src/modules/locale/LocaleConfiguration.h index a93ddffac..073d19a5b 100644 --- a/src/modules/locale/LocaleConfiguration.h +++ b/src/modules/locale/LocaleConfiguration.h @@ -33,7 +33,7 @@ public: const QStringList& availableLocales, const QString& countryCode ); - bool isEmpty(); + bool isEmpty() const; // These become all uppercase in locale.conf, but we keep them lowercase here to // avoid confusion with locale.h. diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp index c950b415c..4882b1684 100644 --- a/src/modules/locale/LocalePage.cpp +++ b/src/modules/locale/LocalePage.cpp @@ -233,11 +233,9 @@ LocalePage::updateLocaleLabels() LocaleConfiguration lc = m_selectedLocaleConfiguration.isEmpty() ? guessLocaleConfiguration() : m_selectedLocaleConfiguration; - m_localeLabel->setText( tr( "The system language will be set to %1." ) - .arg( prettyLCLocale( lc.lang ) ) ); - - m_formatsLabel->setText( tr( "The numbers and dates locale will be set to %1." ) - .arg( prettyLCLocale( lc.lc_numeric ) ) ); + auto labels = prettyLocaleStatus( lc ); + m_localeLabel->setText( labels.first ); + m_formatsLabel->setText( labels.second ); } @@ -383,6 +381,15 @@ LocalePage::init( const QString& initialRegion, updateGlobalStorage(); } +std::pair< QString, QString > LocalePage::prettyLocaleStatus( const LocaleConfiguration& lc ) const +{ + return std::make_pair< QString, QString >( + tr( "The system language will be set to %1." ) + .arg( prettyLCLocale( lc.lang ) ), + tr( "The numbers and dates locale will be set to %1." ) + .arg( prettyLCLocale( lc.lc_numeric ) ) + ); +} QString LocalePage::prettyStatus() const @@ -392,6 +399,13 @@ LocalePage::prettyStatus() const .arg( m_regionCombo->currentText() ) .arg( m_zoneCombo->currentText() ); + LocaleConfiguration lc = m_selectedLocaleConfiguration.isEmpty() ? + guessLocaleConfiguration() : + m_selectedLocaleConfiguration; + auto labels = prettyLocaleStatus(lc); + status += labels.first + "
"; + status += labels.second + "
"; + return status; } @@ -433,7 +447,7 @@ LocalePage::onActivate() LocaleConfiguration -LocalePage::guessLocaleConfiguration() +LocalePage::guessLocaleConfiguration() const { QLocale myLocale; // User-selected language @@ -455,7 +469,7 @@ LocalePage::guessLocaleConfiguration() QString -LocalePage::prettyLCLocale( const QString& lcLocale ) +LocalePage::prettyLCLocale( const QString& lcLocale ) const { QString localeString = lcLocale; if ( localeString.endsWith( " UTF-8" ) ) diff --git a/src/modules/locale/LocalePage.h b/src/modules/locale/LocalePage.h index 3615016e5..27a7362e3 100644 --- a/src/modules/locale/LocalePage.h +++ b/src/modules/locale/LocalePage.h @@ -50,8 +50,13 @@ public: void onActivate(); private: - LocaleConfiguration guessLocaleConfiguration(); - QString prettyLCLocale( const QString& localesMap ); + LocaleConfiguration guessLocaleConfiguration() const; + QString prettyLCLocale( const QString& localesMap ) const; + + // For the given locale config, return two strings describing + // the settings for language and numbers. + std::pair< QString, QString > prettyLocaleStatus( const LocaleConfiguration& ) const; + void updateGlobalStorage(); void updateLocaleLabels(); diff --git a/src/modules/locale/module.desc b/src/modules/locale/module.desc deleted file mode 100644 index d69fb5a1e..000000000 --- a/src/modules/locale/module.desc +++ /dev/null @@ -1,7 +0,0 @@ -# Module metadata file for locale viewmodule -# Syntax is YAML 1.2 ---- -type: "view" -name: "locale" -interface: "qtplugin" -load: "libcalamares_viewmodule_locale.so" diff --git a/src/modules/netinstall/module.desc b/src/modules/netinstall/module.desc deleted file mode 100644 index f39082eba..000000000 --- a/src/modules/netinstall/module.desc +++ /dev/null @@ -1,7 +0,0 @@ -# Module metadata file for netinstall module -# Syntax is YAML 1.2 ---- -type: "view" -name: "netinstall" -interface: "qtplugin" -load: "libcalamares_viewmodule_netinstall.so" diff --git a/src/modules/partition/jobs/ClearTempMountsJob.cpp b/src/modules/partition/jobs/ClearTempMountsJob.cpp index 95060644a..3f82231d9 100644 --- a/src/modules/partition/jobs/ClearTempMountsJob.cpp +++ b/src/modules/partition/jobs/ClearTempMountsJob.cpp @@ -20,6 +20,8 @@ #include "utils/Logger.h" +#include + // KPMcore #include @@ -74,7 +76,7 @@ ClearTempMountsJob::exec() lineIn = in.readLine(); } - qSort( lst.begin(), lst.end(), []( const QPair< QString, QString >& a, + std::sort ( lst.begin(), lst.end(), []( const QPair< QString, QString >& a, const QPair< QString, QString >& b ) -> bool { return a.first > b.first; diff --git a/src/modules/partition/module.desc b/src/modules/partition/module.desc deleted file mode 100644 index ba459e948..000000000 --- a/src/modules/partition/module.desc +++ /dev/null @@ -1,7 +0,0 @@ -# Module metadata file for partition viewmodule -# Syntax is YAML 1.2 ---- -type: "view" #core or view -name: "partition" #the module name. must be unique and same as the parent directory -interface: "qtplugin" #can be: qtplugin, python, process, ... -load: "libcalamares_viewmodule_partition.so" diff --git a/src/modules/summary/SummaryPage.cpp b/src/modules/summary/SummaryPage.cpp index 351ef49a4..6d53ba8b6 100644 --- a/src/modules/summary/SummaryPage.cpp +++ b/src/modules/summary/SummaryPage.cpp @@ -56,6 +56,8 @@ SummaryPage::SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent ) } +// Adds a widget for those ViewSteps that want a summary; +// see SummaryPage documentation and also ViewStep docs. void SummaryPage::onActivate() { @@ -96,7 +98,6 @@ SummaryPage::onActivate() m_layout->addStretch(); } - Calamares::ViewStepList SummaryPage::stepsForSummary( const Calamares::ViewStepList& allSteps ) const { diff --git a/src/modules/summary/SummaryPage.h b/src/modules/summary/SummaryPage.h index 29ec5fcb0..05331d260 100644 --- a/src/modules/summary/SummaryPage.h +++ b/src/modules/summary/SummaryPage.h @@ -28,6 +28,25 @@ class QScrollArea; class QVBoxLayout; class SummaryViewStep; +/** @brief Provide a summary view with to-be-done action descriptions. +* +* Those steps that occur since the previous execution step (e.g. that +* are queued for execution now; in the normal case where there is +* only one execution step, this means everything that the installer +* is going to do) are added to the summary view. Each view step +* can provide one of the following things to display in the summary +* view: +* +* - A string from ViewStep::prettyStatus(), which is formatted +* and added as a QLabel to the view. Return an empty string +* from prettyStatus() to avoid this. +* - A QWidget from ViewStep::createSummaryWidget(). This is for +* complicated displays not suitable for simple text representation. +* Return a nullptr to avoid this. +* +* If neither a (non-empty) string nor a widget is returned, the +* step is not named in the summary. +*/ class SummaryPage : public QWidget { Q_OBJECT diff --git a/src/modules/summary/module.desc b/src/modules/summary/module.desc deleted file mode 100644 index 2fedbaabf..000000000 --- a/src/modules/summary/module.desc +++ /dev/null @@ -1,12 +0,0 @@ -# Module metadata file for summary viewmodule -# -# The summary module tells the user what is going to happen (next) -# during the installation. Each other step is responsible for -# creating a summary widget that this step can display. -# -# Syntax is YAML 1.2 ---- -type: "view" -name: "summary" -interface: "qtplugin" -load: "libcalamares_viewmodule_summary.so" diff --git a/src/modules/unpackfs/module.desc b/src/modules/unpackfs/module.desc index ea7e2bcad..67a56b06c 100644 --- a/src/modules/unpackfs/module.desc +++ b/src/modules/unpackfs/module.desc @@ -3,4 +3,4 @@ type: "job" name: "unpackfs" interface: "python" -script: "main.py" #assumed relative to the current directory +script: "main.py" diff --git a/src/modules/users/module.desc b/src/modules/users/module.desc deleted file mode 100644 index fd7b21b58..000000000 --- a/src/modules/users/module.desc +++ /dev/null @@ -1,7 +0,0 @@ -# Module metadata file for users viewmodule -# Syntax is YAML 1.2 ---- -type: "view" #core or view -name: "users" #the module name. must be unique and same as the parent directory -interface: "qtplugin" #can be: qtplugin, python, process, ... -load: "libcalamares_viewmodule_users.so" diff --git a/src/modules/users/users.conf b/src/modules/users/users.conf index ebc41e2c5..009c0183e 100644 --- a/src/modules/users/users.conf +++ b/src/modules/users/users.conf @@ -1,3 +1,15 @@ +# Configuration for the one-user-system user module. +# +# Besides these settings, the user module also places the following +# keys into the globalconfig area, based on user input in the view step. +# +# - hostname +# - username +# - password (obscured) +# - autologinUser (if enabled, set to username) +# +# These globalconfig keys are set when the jobs for this module +# are created. --- defaultGroups: - users diff --git a/src/modules/webview/CMakeLists.txt b/src/modules/webview/CMakeLists.txt index 4cc7278ff..01212d906 100644 --- a/src/modules/webview/CMakeLists.txt +++ b/src/modules/webview/CMakeLists.txt @@ -7,7 +7,9 @@ list( APPEND CALA_WEBVIEW_LINK_LIBRARIES option( WEBVIEW_FORCE_WEBKIT "Always build webview with WebKit instead of WebEngine regardless of Qt version." OFF) +message( STATUS "Found Qt version ${Qt5Core_VERSION}") if ( Qt5Core_VERSION VERSION_LESS 5.6 OR WEBVIEW_FORCE_WEBKIT ) + message( STATUS " .. using webkit") find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED WebKit WebKitWidgets ) list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES @@ -19,6 +21,7 @@ if ( Qt5Core_VERSION VERSION_LESS 5.6 OR WEBVIEW_FORCE_WEBKIT ) ) set( WEBVIEW_WITH_WEBKIT 1 ) else() + message( STATUS " .. using webengine") find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets ) list( APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES diff --git a/src/modules/webview/module.desc b/src/modules/webview/module.desc deleted file mode 100644 index 006198124..000000000 --- a/src/modules/webview/module.desc +++ /dev/null @@ -1,7 +0,0 @@ -# Module metadata file for welcome viewmodule -# Syntax is YAML 1.2 ---- -type: "view" #core or view -name: "webview" #the module name. must be unique and same as the parent directory -interface: "qtplugin" #can be: qtplugin, python, process, ... -load: "libcalamares_viewmodule_webview.so" diff --git a/src/modules/welcome/CMakeLists.txt b/src/modules/welcome/CMakeLists.txt index b087164fa..f901a768e 100644 --- a/src/modules/welcome/CMakeLists.txt +++ b/src/modules/welcome/CMakeLists.txt @@ -3,6 +3,8 @@ include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) find_package( LIBPARTED REQUIRED ) find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network ) +include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) + set_source_files_properties( checker/partman_devices.c PROPERTIES LANGUAGE CXX ) set( CHECKER_SOURCES diff --git a/src/modules/welcome/module.desc b/src/modules/welcome/module.desc deleted file mode 100644 index 70383a55f..000000000 --- a/src/modules/welcome/module.desc +++ /dev/null @@ -1,7 +0,0 @@ -# Module metadata file for welcome viewmodule -# Syntax is YAML 1.2 ---- -type: "view" #core or view -name: "welcome" #the module name. must be unique and same as the parent directory -interface: "qtplugin" #can be: qtplugin, python, process, ... -load: "libcalamares_viewmodule_welcome.so"