diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..1dd301d99 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,29 @@ +#### Submission type + + - [ ] Bug report + - [ ] Feature Request + + +#### Info regarding which version of Calamares is used, which Distribution + +> … + +#### Provide information on how the disks are set up, in detail, with full logs of commands issued + +> … + +#### What do you expect to have happen when Calamares installs? + +> … + +#### Describe the issue you encountered + +> … + +#### Steps to reproduce the problem + +> … + +#### Include the installation.log: + +> … diff --git a/.gitmodules b/.gitmodules index 4fc249f44..e69de29bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "thirdparty/libcrashreporter-qt"] - path = thirdparty/libcrashreporter-qt - url = https://github.com/dschmidt/libcrashreporter-qt diff --git a/.travis.yml b/.travis.yml index a488112af..0b18d927d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,7 @@ notifications: install: - docker build -t calamares . - - pip install pycodestyle script: - - docker run -v $PWD:/build calamares bash -lc "cd /build && cmake -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON . && make -j2" - - pycodestyle --exclude=thirdparty,.git $PWD + - 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" + diff --git a/.tx/config b/.tx/config index 9a9b25666..3cf9489f6 100644 --- a/.tx/config +++ b/.tx/config @@ -12,3 +12,15 @@ 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 + +[calamares.python] +file_filter = lang/python//LC_MESSAGES/python.po +source_file = lang/python.pot +source_lang = en +type = PO + diff --git a/AUTHORS b/AUTHORS index d9814373e..f39b579f4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,2 @@ Teo Mrnjavac +Adriaan de Groot diff --git a/CMakeLists.txt b/CMakeLists.txt index ed0c5aab7..80d925b15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,21 +1,77 @@ -project( calamares CXX ) +# === This file is part of Calamares - === +# +# Calamares is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Calamares is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Calamares. If not, see . +# +# SPDX-License-Identifier: GPL-3.0+ +# License-Filename: LICENSE +# +### +# +# 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" -# 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 2.8.12 ) +project( calamares C CXX ) -set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" ) +cmake_minimum_required( VERSION 3.2 ) + +set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" ) + +set( CMAKE_CXX_STANDARD 14 ) +set( CMAKE_CXX_STANDARD_REQUIRED ON ) +set( CMAKE_C_STANDARD 99 ) +set( CMAKE_C_STANDARD_REQUIRED ON ) if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) message( STATUS "Found Clang ${CMAKE_CXX_COMPILER_VERSION}, setting up Clang-specific compiler flags." ) - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=c99" ) + set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" ) set( CMAKE_C_FLAGS_DEBUG "-g" ) set( CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG" ) set( CMAKE_C_FLAGS_RELEASE "-O4 -DNDEBUG" ) set( CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g" ) - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -std=c++14" ) + # Clang warnings: doing *everything* is counter-productive, since it warns + # about things which we can't fix (e.g. C++98 incompatibilities, but + # Calaares is C++14). + foreach( CLANG_WARNINGS + -Weverything + -Wno-c++98-compat + -Wno-c++98-compat-pedantic + -Wno-padded + -Wno-undefined-reinterpret-cast + -Wno-global-constructors + -Wno-exit-time-destructors + -Wno-missing-prototypes + -Wno-documentation-unknown-command + ) + string( APPEND CMAKE_CXX_FLAGS " ${CLANG_WARNINGS}" ) + endforeach() + + # Third-party code where we don't care so much about compiler warnings + # (because it's uncomfortable to patch) get different flags; use + # mark_thirdparty_code( [...] ) + # to switch off warnings for those sources. + set( SUPPRESS_3RDPARTY_WARNINGS "-Wno-everything" ) + set( SUPPRESS_BOOST_WARNINGS " -Wno-zero-as-null-pointer-constant -Wno-disabled-macro-expansion" ) + set( CMAKE_CXX_FLAGS_DEBUG "-g" ) set( CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG" ) set( CMAKE_CXX_FLAGS_RELEASE "-O4 -DNDEBUG" ) @@ -25,11 +81,21 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" ) else() - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99" ) - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wl,--no-undefined" ) - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wl,--fatal-warnings -Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type" ) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" ) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--fatal-warnings -Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type" ) + + set( SUPPRESS_3RDPARTY_WARNINGS "" ) + set( SUPPRESS_BOOST_WARNINGS "" ) endif() +macro(mark_thirdparty_code) + set_source_files_properties( ${ARGV} + PROPERTIES + COMPILE_FLAGS "${SUPPRESS_3RDPARTY_WARNINGS}" + COMPILE_DEFINITIONS "THIRDPARTY" + ) +endmacro() + if( CMAKE_COMPILER_IS_GNUCXX ) if( CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.9 ) @@ -38,16 +104,7 @@ if( CMAKE_COMPILER_IS_GNUCXX ) endif() endif() -cmake_policy( SET CMP0023 OLD ) -cmake_policy( SET CMP0028 NEW ) # double colons in KF5::Foo and Qt5::Foo are necessarily IMPORTED or ALIAS targets, don't search further - -# Keep cmake 3.0 quiet -if( POLICY CMP0043 ) - cmake_policy( SET CMP0043 OLD ) -endif() - -include( MacroOptionalFindPackage ) -include( MacroLogFeature ) +include( FeatureSummary ) set( QT_VERSION 5.6.0 ) @@ -55,52 +112,43 @@ find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core Gui Widgets LinguistTools S find_package( YAMLCPP 0.5.1 REQUIRED ) find_package( PolkitQt5-1 REQUIRED ) +option( INSTALL_CONFIG "Install configuration files" ON ) option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) -option( WITH_CRASHREPORTER "Build with CrashReporter" ON ) -option( INSTALL_CONFIG "Install configuration files" ON) option( WITH_PYTHONQT "Enable next generation Python modules API (experimental, requires PythonQt)." OFF ) +option( BUILD_TESTING "Build the testing tree." ON ) -if( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libcrashreporter-qt/CMakeLists.txt" ) - message( STATUS "Build of crashreporter disabled." ) - set( WITH_CRASHREPORTER OFF ) -endif() +if( BUILD_TESTING ) + enable_testing() +endif () -macro_optional_find_package( PythonLibs 3.3 ) -macro_log_feature( - PYTHONLIBS_FOUND - "Python" - "C interface libraries for the Python 3 interpreter." - "http://python.org" - FALSE "3.3" - "Python 3 is used for some Calamares job modules." +find_package( PythonLibs 3.3 ) +set_package_properties( + PythonLibs PROPERTIES + DESCRIPTION "C interface libraries for the Python 3 interpreter." + URL "http://python.org" + PURPOSE "Python 3 is used for Python job modules." ) if ( PYTHONLIBS_FOUND ) include( BoostPython3 ) find_boost_python3( 1.54.0 ${PYTHONLIBS_VERSION_STRING} CALAMARES_BOOST_PYTHON3_FOUND ) - macro_log_feature( - CALAMARES_BOOST_PYTHON3_FOUND - "Boost.Python" - "A C++ library which enables seamless interoperability between C++ and Python 3." - "http://www.boost.org" - FALSE "1.54.0" - "Boost.Python is used for interfacing with Calamares job modules written in Python 3." + set_package_properties( + Boost PROPERTIES + PURPOSE "Boost.Python is used for Python job modules." ) - macro_optional_find_package( PythonQt ) - macro_log_feature( PYTHONQT_FOUND - "PythonQt" - "A Python embedding solution for Qt applications." - "http://pythonqt.sourceforge.net" - FALSE "3.1" - "PythonQt is used for the Python modules API." + find_package( PythonQt ) + set_package_properties( PythonQt PROPERTIES + DESCRIPTION "A Python embedding solution for Qt applications." + URL "http://pythonqt.sourceforge.net" + PURPOSE "PythonQt is used for Python view modules." ) endif() -if ( PYTHONLIBS_NOTFOUND OR NOT CALAMARES_BOOST_PYTHON3_FOUND ) +if( PYTHONLIBS_NOTFOUND OR NOT CALAMARES_BOOST_PYTHON3_FOUND ) set( WITH_PYTHON OFF ) endif() -if ( PYTHONLIBS_NOTFOUND OR NOT PYTHONQT_FOUND ) +if( PYTHONLIBS_NOTFOUND OR NOT PYTHONQT_FOUND ) set( WITH_PYTHONQT OFF ) endif() @@ -111,12 +159,12 @@ set( CALAMARES_ORGANIZATION_NAME "Calamares" ) set( CALAMARES_ORGANIZATION_DOMAIN "github.com/calamares" ) set( CALAMARES_APPLICATION_NAME "Calamares" ) set( CALAMARES_DESCRIPTION_SUMMARY "The distribution-independent installer framework" ) -set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en en_GB es_MX es eu fr hr hu id is it_IT ja lt nl pl pt_BR pt_PT ro ru sk sv th tr_TR zh_CN zh_TW ) +set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en en_GB es_MX es eu fr he hr hu id is it_IT ja lt nl pl pt_BR pt_PT ro ru sk sv th tr_TR zh_CN zh_TW ) ### Bump version here set( CALAMARES_VERSION_MAJOR 3 ) set( CALAMARES_VERSION_MINOR 1 ) -set( CALAMARES_VERSION_PATCH 0 ) +set( CALAMARES_VERSION_PATCH 5 ) set( CALAMARES_VERSION_RC 0 ) set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} ) @@ -165,32 +213,73 @@ 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" ) -add_subdirectory( thirdparty ) +### Example Distro +# +# For testing purposes Calamares includes a very, very, limited sample +# distro called "Generic". The root filesystem of "Generic" lives in +# data/example-root and can be squashed up as part of the build, so +# that a pure-upstream run of ./calamares -d from the build directory +# (with all the default settings and configurations) can actually +# do an complete example run. +# +# Some binaries from the build host (e.g. /bin and /lib) are also +# squashed into the example filesystem. +# +# To build the example distro (for use by the default, example, +# unsquashfs module), build the target 'example-distro', eg.: +# +# make example-distro +# +find_program( mksquashfs_PROGRAM mksquashfs ) +if( mksquashfs_PROGRAM ) + set( mksquashfs_FOUND ON ) + set( src_fs ${CMAKE_SOURCE_DIR}/data/example-root/ ) + set( dst_fs ${CMAKE_BINARY_DIR}/example.sqfs ) + if( EXISTS ${src_fs} ) + # based on the build host. If /lib64 exists, assume it is needed. + # Collect directories needed for a minimal binary distro, + # Note that the last path component is added to the root, so + # if you add /usr/sbin here, it will be put into /sbin_1. + # Add such paths to /etc/profile under ${src_fs}. + set( candidate_fs /sbin /bin /lib /lib64 ) + set( host_fs "" ) + foreach( c_fs ${candidate_fs} ) + if( EXISTS ${c_fs} ) + list( APPEND host_fs ${c_fs} ) + endif() + endforeach() + add_custom_command( + OUTPUT ${dst_fs} + COMMAND ${mksquashfs_PROGRAM} ${src_fs} ${dst_fs} -all-root + COMMAND ${mksquashfs_PROGRAM} ${host_fs} ${dst_fs} -all-root + ) + add_custom_target(example-distro DEPENDS ${dst_fs}) + endif() +else() + set( mksquashfs_FOUND OFF ) +endif() +# Doesn't list mksquashfs as an optional dep, though, because it +# hasn't been sent through the find_package() scheme. +set_package_properties( mksquashfs PROPERTIES + DESCRIPTION "Create squashed filesystems" + URL "http://tldp.org/HOWTO/SquashFS-HOWTO/creatingandusing.html" + PURPOSE "Create example distro" + TYPE OPTIONAL +) + +# add_subdirectory( thirdparty ) add_subdirectory( src ) -macro_display_feature_log() +add_feature_info(Python ${WITH_PYTHON} "Python job modules") +add_feature_info(PythonQt ${WITH_PYTHONQT} "Python view modules") +add_feature_info(Config ${INSTALL_CONFIG} "Install Calamares configuration") -if ( NOT WITH_PYTHON ) - message( "-- WARNING: Building Calamares without Python support. Legacy Python job modules will not work.\n" ) -endif() -if ( NOT WITH_PYTHONQT ) - message( "-- WARNING: Building Calamares without PythonQt support. Python modules will not work.\n" ) -endif() - - -if ( NOT INSTALL_CONFIG ) - message( "-- WARNING: Configuration files will not be installed.\n" ) -endif() +feature_summary(WHAT ALL) # Add all targets to the build-tree export set set( CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Calamares" CACHE PATH "Installation directory for CMake files" ) @@ -216,11 +305,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}" ) @@ -233,7 +321,7 @@ install( "${CMAKE_INSTALL_CMAKEDIR}" ) -if (INSTALL_CONFIG) +if( INSTALL_CONFIG ) install( FILES settings.conf diff --git a/CMakeModules/BoostPython3.cmake b/CMakeModules/BoostPython3.cmake index e708defa4..c128b58f1 100644 --- a/CMakeModules/BoostPython3.cmake +++ b/CMakeModules/BoostPython3.cmake @@ -20,38 +20,50 @@ # "python-$dotsuffix", where suffix is based on the `python_version` argument. # One can supply a custom component name by setting the # `CALAMARES_BOOST_PYTHON3_COMPONENT` variable at CMake time. - set( CALAMARES_BOOST_PYTHON3_COMPONENT python3 CACHE STRING "Name of the Boost.Python component. If Boost.Python is installed as libboost_python-foo.so then this variable should be set to 'python-foo'." ) -macro( find_boost_python3 boost_version python_version found_var ) - set( ${found_var} OFF ) +include(FindPackageHandleStandardArgs) - # turns "3.4.123abc" into "34" - string( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\..*" "\\1\\2" _fbp_python_short_version ${python_version} ) - - foreach( _fbp_name ${CALAMARES_BOOST_PYTHON3_COMPONENT} python-py${_fbp_python_short_version} ) +macro( _find_boost_python3_int boost_version componentname found_var ) + foreach( _fbp_name ${CALAMARES_BOOST_PYTHON3_COMPONENT} ${componentname} ) find_package( Boost ${boost_version} QUIET COMPONENTS ${_fbp_name} ) string( TOUPPER ${_fbp_name} _fbp_uc_name ) if( Boost_${_fbp_uc_name}_FOUND ) - set( ${found_var} ON ) + set( ${found_var} ${_fbp_uc_name} ) break() endif() endforeach() +endmacro() - if (NOT ${found_var}) +macro( find_boost_python3 boost_version python_version found_var ) + set( ${found_var} OFF ) + set( _fbp_found OFF ) + + # turns "3.4.123abc" into "34" + string( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\..*" "\\1\\2" _fbp_python_short_version ${python_version} ) + _find_boost_python3_int( ${boost_version} python-py${_fbp_python_short_version} _fbp_found ) + + if (NOT _fbp_found) # The following loop changes the searched name for Gentoo based distributions # turns "3.4.123abc" into "3.4" string( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\..*" "\\1.\\2" _fbp_python_short_version ${python_version} ) - foreach( _fbp_name ${CALAMARES_BOOST_PYTHON3_COMPONENT} python-${_fbp_python_short_version} ) - find_package( Boost ${boost_version} QUIET COMPONENTS ${_fbp_name} ) - string( TOUPPER ${_fbp_name} _fbp_uc_name ) - if( Boost_${_fbp_uc_name}_FOUND ) - set( ${found_var} ON ) - break() - endif() - endforeach() + _find_boost_python3_int( ${boost_version} python-${_fbp_python_short_version} _fbp_found ) endif() + + set( ${found_var} ${_fbp_found} ) + + # This is superfluous, but allows proper reporting in the features list + if ( _fbp_found ) + find_package( Boost ${boost_version} COMPONENTS ${_fbp_found} ) + else() + find_package( Boost ${boost_version} COMPONENTS Python ) + endif() + set_package_properties( + Boost PROPERTIES + DESCRIPTION "A C++ library which enables seamless interoperability between C++ and Python 3." + URL "http://www.boost.org" + ) endmacro() 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 94% rename from CalamaresAddLibrary.cmake rename to CMakeModules/CalamaresAddLibrary.cmake index a774b1f31..f183277c8 100644 --- a/CalamaresAddLibrary.cmake +++ b/CMakeModules/CalamaresAddLibrary.cmake @@ -45,9 +45,6 @@ function(calamares_add_library) add_library(${target} SHARED ${LIBRARY_SOURCES}) endif() - # HACK: add qt modules - every lib should define its own set of modules - qt5_use_modules(${target} Core Gui Widgets ${LIBRARY_QT5_MODULES}) - # definitions - can this be moved into set_target_properties below? add_definitions(${QT_DEFINITIONS}) set_target_properties(${target} PROPERTIES AUTOMOC TRUE) @@ -67,9 +64,15 @@ function(calamares_add_library) endif() # add link targets - target_link_libraries(${target} ${CALAMARES_LIBRARIES}) + target_link_libraries(${target} + LINK_PUBLIC ${CALAMARES_LIBRARIES} + Qt5::Core + Qt5::Gui + Qt5::Widgets + ${LIBRARY_QT5_MODULES} + ) if(LIBRARY_LINK_LIBRARIES) - target_link_libraries(${target} ${LIBRARY_LINK_LIBRARIES}) + target_link_libraries(${target} LINK_PUBLIC ${LIBRARY_LINK_LIBRARIES}) endif() if(LIBRARY_LINK_PRIVATE_LIBRARIES) target_link_libraries(${target} LINK_PRIVATE ${LIBRARY_LINK_PRIVATE_LIBRARIES}) diff --git a/CalamaresAddModuleSubdirectory.cmake b/CMakeModules/CalamaresAddModuleSubdirectory.cmake similarity index 90% rename from CalamaresAddModuleSubdirectory.cmake rename to CMakeModules/CalamaresAddModuleSubdirectory.cmake index a050f42c5..1b60c59a7 100644 --- a/CalamaresAddModuleSubdirectory.cmake +++ b/CMakeModules/CalamaresAddModuleSubdirectory.cmake @@ -1,4 +1,5 @@ include( CMakeColors ) +include( CalamaresAddTranslations ) set( MODULE_DATA_DESTINATION share/calamares/modules ) @@ -32,14 +33,6 @@ function( calamares_add_module_subdirectory ) endif() endforeach() - # We copy over the lang directory, if any - if( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/lang" ) - file( COPY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/lang" - DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}" ) - install( DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/lang" - DESTINATION ${MODULE_DESTINATION} ) - endif() - message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} module: ${BoldRed}${SUBDIRECTORY}${ColorReset}" ) if( NOT CMAKE_BUILD_TYPE STREQUAL "Release" ) message( " ${Green}TYPE:${ColorReset} jobmodule" ) @@ -54,6 +47,16 @@ function( calamares_add_module_subdirectory ) endif() message( "" ) endif() + # We copy over the lang directory, if any + if( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/lang" ) + install_calamares_gettext_translations( + ${SUBDIRECTORY} + SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/lang" + FILENAME ${SUBDIRECTORY}.mo + RENAME calamares-${SUBDIRECTORY}.mo + ) + endif() + else() message( "-- ${BoldYellow}Warning:${ColorReset} tried to add module subdirectory ${BoldRed}${SUBDIRECTORY}${ColorReset} which has no CMakeLists.txt or module.desc." ) message( "" ) 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/CMakeModules/CalamaresAddTranslations.cmake b/CMakeModules/CalamaresAddTranslations.cmake new file mode 100644 index 000000000..b0a623908 --- /dev/null +++ b/CMakeModules/CalamaresAddTranslations.cmake @@ -0,0 +1,121 @@ +include( CMakeParseArguments ) + +# Internal macro for adding the C++ / Qt translations to the +# build and install tree. Should be called only once, from +# src/calamares/CMakeLists.txt. +macro(add_calamares_translations language) + list( APPEND CALAMARES_LANGUAGES ${ARGV} ) + + set( calamares_i18n_qrc_content "\n" ) + + # calamares and qt language files + set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}\n" ) + foreach( lang ${CALAMARES_LANGUAGES} ) + set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}calamares_${lang}.qm\n" ) + list( APPEND TS_FILES "${CMAKE_SOURCE_DIR}/lang/calamares_${lang}.ts" ) + endforeach() + + set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}\n" ) + set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}\n" ) + + file( WRITE ${CMAKE_BINARY_DIR}/lang/calamares_i18n.qrc "${calamares_i18n_qrc_content}" ) + + qt5_add_translation(QM_FILES ${TS_FILES}) + + ## HACK HACK HACK - around rcc limitations to allow out of source-tree building + set( trans_file calamares_i18n ) + set( trans_srcfile ${CMAKE_BINARY_DIR}/lang/${trans_file}.qrc ) + set( trans_infile ${CMAKE_CURRENT_BINARY_DIR}/${trans_file}.qrc ) + set( trans_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${trans_file}.cxx ) + + # Copy the QRC file to the output directory + add_custom_command( + OUTPUT ${trans_infile} + COMMAND ${CMAKE_COMMAND} -E copy ${trans_srcfile} ${trans_infile} + MAIN_DEPENDENCY ${trans_srcfile} + ) + + # Run the resource compiler (rcc_options should already be set) + add_custom_command( + OUTPUT ${trans_outfile} + COMMAND "${Qt5Core_RCC_EXECUTABLE}" + ARGS ${rcc_options} -name ${trans_file} -o ${trans_outfile} ${trans_infile} + MAIN_DEPENDENCY ${trans_infile} + DEPENDS ${QM_FILES} + ) +endmacro() + +# Internal macro for Python translations +# +# Translations of the Python modules that don't have their own +# lang/ subdirectories -- these are collected in top-level +# lang/python//LC_MESSAGES/python.mo +macro(add_calamares_python_translations language) + set( CALAMARES_LANGUAGES "" ) + list( APPEND CALAMARES_LANGUAGES ${ARGV} ) + + install_calamares_gettext_translations( python + SOURCE_DIR ${CMAKE_SOURCE_DIR}/lang/python + FILENAME python.mo + RENAME calamares-python.mo + ) +endmacro() + +# Installs a directory containing language-code-labeled subdirectories with +# gettext data into the appropriate system directory. Allows renaming the +# .mo files during install to avoid namespace clashes. +# +# install_calamares_gettext_translations( +# NAME +# SOURCE_DIR path/to/lang +# FILENAME +# [RENAME ] +# ) +# +# For all of the (global) translation languages enabled for Calamares, +# try installing $SOURCE_DIR/$lang/LC_MESSAGES/.mo into the +# system gettext data directory (e.g. share/locale/), possibly renaming +# filename.mo to renamed.mo in the process. +function( install_calamares_gettext_translations ) + # parse arguments ( name needs to be saved before passing ARGN into the macro ) + set( NAME ${ARGV0} ) + set( oneValueArgs NAME SOURCE_DIR FILENAME RENAME ) + cmake_parse_arguments( TRANSLATION "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) + + if( NOT TRANSLATION_NAME ) + set( TRANSLATION_NAME ${NAME} ) + endif() + if( NOT TRANSLATION_FILENAME ) + set( TRANSLATION_FILENAME "${TRANSLATION_NAME}.mo" ) + endif() + if( NOT TRANSLATION_RENAME ) + set( TRANSLATION_RENAME "${TRANSLATION_FILENAME}" ) + endif() + + message(STATUS "Installing gettext translations for ${TRANSLATION_NAME}") + message(STATUS " Installing ${TRANSLATION_FILENAME} from ${TRANSLATION_SOURCE_DIR}") + + set( TRANSLATION_NAME "${NAME}" ) + set( INSTALLED_TRANSLATIONS "" ) + foreach( lang ${CALAMARES_TRANSLATION_LANGUAGES} ) # Global + set( lang_mo "${TRANSLATION_SOURCE_DIR}/${lang}/LC_MESSAGES/${TRANSLATION_FILENAME}" ) + if( lang STREQUAL "en" ) + message( STATUS " Skipping ${TRANSLATION_NAME} translations for en_US" ) + else( EXISTS ${lang_mo} ) + list( APPEND INSTALLED_LANGUAGES "${lang}" ) + install( + FILES ${lang_mo} + DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/${lang}/LC_MESSAGES/ + RENAME ${TRANSLATION_RENAME} + ) + # TODO: make translations available in build dir too, for + # translation when running calamares -d from builddir. + set(_build_lc ${CMAKE_BINARY_DIR}/lang/${lang}/LC_MESSAGES/) + file(COPY ${lang_mo} DESTINATION ${_build_lc}) + if (NOT TRANSLATION_FILENAME STREQUAL TRANSLATION_RENAME) + file(RENAME ${_build_lc}${TRANSLATION_FILENAME} ${_build_lc}${TRANSLATION_RENAME}) + endif() + + endif() + endforeach() +endfunction() diff --git a/CMakeModules/FindCrypt.cmake b/CMakeModules/FindCrypt.cmake new file mode 100644 index 000000000..d17d70178 --- /dev/null +++ b/CMakeModules/FindCrypt.cmake @@ -0,0 +1,34 @@ +# - Find libcrypt +# Find the libcrypt includes and the libcrypt libraries +# This module defines +# LIBCRYPT_INCLUDE_DIR, root crypt include dir. Include crypt with crypt.h +# LIBCRYPT_LIBRARY, the path to libcrypt +# LIBCRYPT_FOUND, whether libcrypt was found + +if( CMAKE_SYSTEM MATCHES "FreeBSD" ) + # FreeBSD has crypt(3) declared in unistd.h, which lives in + # libc; the libcrypt found here is not used. + find_path( CRYPT_INCLUDE_DIR NAMES unistd.h ) + add_definitions( -DNO_CRYPT_H ) +else() + find_path( CRYPT_INCLUDE_DIR + NAMES crypt.h + HINTS + ${CMAKE_INSTALL_INCLUDEDIR} + NO_CACHE + ) +endif() + +find_library( CRYPT_LIBRARIES + NAMES crypt + HINTS + ${CMAKE_INSTALL_LIBDIR} +) + +include( FindPackageHandleStandardArgs ) +find_package_handle_standard_args( + Crypt + REQUIRED_VARS CRYPT_LIBRARIES CRYPT_INCLUDE_DIR +) + +mark_as_advanced( CRYPT_INCLUDE_DIR CRYPT_LIBRARIES ) diff --git a/src/modules/welcome/CMakeModules/FindLIBPARTED.cmake b/CMakeModules/FindLIBPARTED.cmake similarity index 100% rename from src/modules/welcome/CMakeModules/FindLIBPARTED.cmake rename to CMakeModules/FindLIBPARTED.cmake diff --git a/CMakeModules/FindPythonQt.cmake b/CMakeModules/FindPythonQt.cmake index c01d68be1..d016b57b1 100644 --- a/CMakeModules/FindPythonQt.cmake +++ b/CMakeModules/FindPythonQt.cmake @@ -21,13 +21,20 @@ find_path(PYTHONQT_INCLUDE_DIR PythonQt.h PATHS "${PYTHONQT_INSTALL_DIR}/include/PythonQt" "${PYTHONQT_INSTALL_DIR}/src" DOC "Path to the PythonQt include directory") + +# Minimum v3.1 is needed find_library(PYTHONQT_LIBRARY_RELEASE PythonQt PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.") find_library(PYTHONQT_LIBRARY_DEBUG NAMES PythonQt${CTK_CMAKE_DEBUG_POSTFIX} PythonQt${CMAKE_DEBUG_POSTFIX} PythonQt PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.") find_library(PYTHONQT_QTALL_LIBRARY_RELEASE PythonQt_QtAll PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.") find_library(PYTHONQT_QTALL_LIBRARY_DEBUG NAMES PythonQt_QtAll${CTK_CMAKE_DEBUG_POSTFIX} PythonQt_QtAll${CMAKE_DEBUG_POSTFIX} PythonQt_QtAll PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.") -set(PYTHONQT_LIBRARY) +# Also check for v3.2+ +find_library(PYTHONQT_LIBRARY_RELEASE PythonQt-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.") +find_library(PYTHONQT_LIBRARY_DEBUG NAMES PythonQt-Qt5-Python3${CTK_CMAKE_DEBUG_POSTFIX} PythonQt-Qt5-Python3${CMAKE_DEBUG_POSTFIX} PythonQt-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.") +find_library(PYTHONQT_QTALL_LIBRARY_RELEASE PythonQt_QtAll-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.") +find_library(PYTHONQT_QTALL_LIBRARY_DEBUG NAMES PythonQt_QtAll-Qt5-Python3${CTK_CMAKE_DEBUG_POSTFIX} PythonQt_QtAll-Qt5-Python3${CMAKE_DEBUG_POSTFIX} PythonQt_QtAll-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.") +set(PYTHONQT_LIBRARY) if(PYTHONQT_LIBRARY_RELEASE) list(APPEND PYTHONQT_LIBRARY optimized ${PYTHONQT_LIBRARY_RELEASE}) endif() @@ -59,6 +66,7 @@ endif() # All upper case _FOUND variable is maintained for backwards compatibility. set(PYTHONQT_FOUND 0) set(PythonQt_FOUND 0) + if(PYTHONQT_INCLUDE_DIR AND PYTHONQT_LIBRARY AND PYTHONQT_QTALL_LIBRARY) # Currently CMake'ified PythonQt only supports building against a python Release build. # This applies independently of CTK build type (Release, Debug, ...) diff --git a/CMakeModules/IncludeKPMCore.cmake b/CMakeModules/IncludeKPMCore.cmake new file mode 100644 index 000000000..b06299d91 --- /dev/null +++ b/CMakeModules/IncludeKPMCore.cmake @@ -0,0 +1,17 @@ +# Shared CMake core for finding KPMCore +# +# This is wrapped into a CMake include file because there's a bunch of +# pre-requisites that need searching for before looking for KPMCore. +# If you just do find_package( KPMCore ) without finding the things +# it links against first, you get CMake errors. +# +# +find_package(ECM 5.10.0 REQUIRED NO_MODULE) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) + +include(KDEInstallDirs) +include(GenerateExportHeader) +find_package( KF5 REQUIRED CoreAddons ) +find_package( KF5 REQUIRED Config I18n IconThemes KIO Service ) + +find_package( KPMcore 3.0.3 REQUIRED ) diff --git a/CMakeModules/MacroLogFeature.cmake b/CMakeModules/MacroLogFeature.cmake deleted file mode 100644 index 45e27b6df..000000000 --- a/CMakeModules/MacroLogFeature.cmake +++ /dev/null @@ -1,157 +0,0 @@ -# This file defines the Feature Logging macros. -# -# MACRO_LOG_FEATURE(VAR FEATURE DESCRIPTION URL [REQUIRED [MIN_VERSION [COMMENTS]]]) -# Logs the information so that it can be displayed at the end -# of the configure run -# VAR : TRUE or FALSE, indicating whether the feature is supported -# FEATURE: name of the feature, e.g. "libjpeg" -# DESCRIPTION: description what this feature provides -# URL: home page -# REQUIRED: TRUE or FALSE, indicating whether the featue is required -# MIN_VERSION: minimum version number. empty string if unneeded -# COMMENTS: More info you may want to provide. empty string if unnecessary -# -# MACRO_DISPLAY_FEATURE_LOG() -# Call this to display the collected results. -# Exits CMake with a FATAL error message if a required feature is missing -# -# Example: -# -# INCLUDE(MacroLogFeature) -# -# FIND_PACKAGE(JPEG) -# MACRO_LOG_FEATURE(JPEG_FOUND "libjpeg" "Support JPEG images" "http://www.ijg.org" TRUE "3.2a" "") -# ... -# MACRO_DISPLAY_FEATURE_LOG() - -# Copyright (c) 2006, Alexander Neundorf, -# Copyright (c) 2006, Allen Winter, -# Copyright (c) 2009, Sebastian Trueg, -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -IF (NOT _macroLogFeatureAlreadyIncluded) - SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt) - IF (EXISTS ${_file}) - FILE(REMOVE ${_file}) - ENDIF (EXISTS ${_file}) - - SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) - IF (EXISTS ${_file}) - FILE(REMOVE ${_file}) - ENDIF (EXISTS ${_file}) - - SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) - IF (EXISTS ${_file}) - FILE(REMOVE ${_file}) - ENDIF (EXISTS ${_file}) - - SET(_macroLogFeatureAlreadyIncluded TRUE) - - INCLUDE(FeatureSummary) - -ENDIF (NOT _macroLogFeatureAlreadyIncluded) - - -MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _comments) - - STRING(TOUPPER "${ARGV4}" _required) - SET(_minvers "${ARGV5}") - SET(_comments "${ARGV6}") - - IF (${_var}) - SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) - ELSE (${_var}) - IF ("${_required}" STREQUAL "TRUE") - SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/MissingRequirements.txt) - ELSE ("${_required}" STREQUAL "TRUE") - SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) - ENDIF ("${_required}" STREQUAL "TRUE") - ENDIF (${_var}) - - SET(_logtext " * ${_package}") - - IF (NOT ${_var}) - IF (${_minvers} MATCHES ".*") - SET(_logtext "${_logtext} (${_minvers} or higher)") - ENDIF (${_minvers} MATCHES ".*") - SET(_logtext "${_logtext} <${_url}>\n ") - ELSE (NOT ${_var}) - SET(_logtext "${_logtext} - ") - ENDIF (NOT ${_var}) - - SET(_logtext "${_logtext}${_description}") - - IF (NOT ${_var}) - IF (${_comments} MATCHES ".*") - SET(_logtext "${_logtext}\n ${_comments}") - ENDIF (${_comments} MATCHES ".*") -# SET(_logtext "${_logtext}\n") #double-space missing features? - ENDIF (NOT ${_var}) - - FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n") - - IF(COMMAND SET_PACKAGE_INFO) # in FeatureSummary.cmake since CMake 2.8.3 - SET_PACKAGE_INFO("${_package}" "\"${_description}\"" "${_url}" "\"${_comments}\"") - ENDIF(COMMAND SET_PACKAGE_INFO) - -ENDMACRO(MACRO_LOG_FEATURE) - - -MACRO(MACRO_DISPLAY_FEATURE_LOG) - IF(COMMAND FEATURE_SUMMARY) # in FeatureSummary.cmake since CMake 2.8.3 - FEATURE_SUMMARY(FILENAME ${CMAKE_CURRENT_BINARY_DIR}/FindPackageLog.txt - WHAT ALL) - ENDIF(COMMAND FEATURE_SUMMARY) - - SET(_missingFile ${CMAKE_BINARY_DIR}/MissingRequirements.txt) - SET(_enabledFile ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) - SET(_disabledFile ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) - - IF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile}) - SET(_printSummary TRUE) - ENDIF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile}) - - IF(_printSummary) - SET(_missingDeps 0) - IF (EXISTS ${_enabledFile}) - FILE(READ ${_enabledFile} _enabled) - FILE(REMOVE ${_enabledFile}) - SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following external packages were located on your system.\n-- This installation will have the extra features provided by these packages.\n-----------------------------------------------------------------------------\n${_enabled}") - ENDIF (EXISTS ${_enabledFile}) - - - IF (EXISTS ${_disabledFile}) - SET(_missingDeps 1) - FILE(READ ${_disabledFile} _disabled) - FILE(REMOVE ${_disabledFile}) - SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n-----------------------------------------------------------------------------\n${_disabled}") - ENDIF (EXISTS ${_disabledFile}) - - - IF (EXISTS ${_missingFile}) - SET(_missingDeps 1) - FILE(READ ${_missingFile} _requirements) - SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- You must install these packages before continuing.\n-----------------------------------------------------------------------------\n${_requirements}") - FILE(REMOVE ${_missingFile}) - SET(_haveMissingReq 1) - ENDIF (EXISTS ${_missingFile}) - - - IF (NOT ${_missingDeps}) - SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- Congratulations! All external packages have been found.") - ENDIF (NOT ${_missingDeps}) - - - MESSAGE(${_summary}) - MESSAGE("-----------------------------------------------------------------------------\n") - - - IF(_haveMissingReq) - MESSAGE(FATAL_ERROR "Exiting: Missing Requirements") - ENDIF(_haveMissingReq) - - ENDIF(_printSummary) - -ENDMACRO(MACRO_DISPLAY_FEATURE_LOG) diff --git a/CMakeModules/MacroOptionalFindPackage.cmake b/CMakeModules/MacroOptionalFindPackage.cmake deleted file mode 100644 index d4ed48e33..000000000 --- a/CMakeModules/MacroOptionalFindPackage.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION() -# MACRO_OPTIONAL_FIND_PACKAGE( [QUIT] ) -# This macro is a combination of OPTION() and FIND_PACKAGE(), it -# works like FIND_PACKAGE(), but additionally it automatically creates -# an option name WITH_, which can be disabled via the cmake GUI. -# or via -DWITH_=OFF -# The standard _FOUND variables can be used in the same way -# as when using the normal FIND_PACKAGE() - -# Copyright (c) 2006-2010 Alexander Neundorf, -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -# This is just a helper macro to set a bunch of variables empty. -# We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try both: -macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var) - if(DEFINED ${_name}_${_var}) - set(${_name}_${_var} "") - endif(DEFINED ${_name}_${_var}) - - string(TOUPPER ${_name} _nameUpper) - if(DEFINED ${_nameUpper}_${_var}) - set(${_nameUpper}_${_var} "") - endif(DEFINED ${_nameUpper}_${_var}) -endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var) - - -macro (MACRO_OPTIONAL_FIND_PACKAGE _name ) - option(WITH_${_name} "Search for ${_name} package" ON) - if (WITH_${_name}) - find_package(${_name} ${ARGN}) - else (WITH_${_name}) - string(TOUPPER ${_name} _nameUpper) - set(${_name}_FOUND FALSE) - set(${_nameUpper}_FOUND FALSE) - - _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS) - _mofp_set_empty_if_defined(${_name} INCLUDE_DIR) - _mofp_set_empty_if_defined(${_name} INCLUDES) - _mofp_set_empty_if_defined(${_name} LIBRARY) - _mofp_set_empty_if_defined(${_name} LIBRARIES) - _mofp_set_empty_if_defined(${_name} LIBS) - _mofp_set_empty_if_defined(${_name} FLAGS) - _mofp_set_empty_if_defined(${_name} DEFINITIONS) - endif (WITH_${_name}) -endmacro (MACRO_OPTIONAL_FIND_PACKAGE) - 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/Dockerfile b/Dockerfile index 1acdd1e20..cd0e4f365 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,2 @@ -FROM debian:testing -RUN sed -i 's,deb.debian.org,ftp.debian.org,g' /etc/apt/sources.list -RUN apt-get update && apt-get -y install build-essential cmake extra-cmake-modules gettext kio-dev libatasmart-dev libboost-python-dev libkf5config-dev libkf5coreaddons-dev libkf5i18n-dev libkf5iconthemes-dev libkf5parts-dev libkf5service-dev libkf5solid-dev libkpmcore4-dev libparted-dev libpolkit-qt5-1-dev libqt5svg5-dev libqt5webkit5-dev libyaml-cpp-dev os-prober pkg-config python3-dev qtbase5-dev qtdeclarative5-dev qttools5-dev qttools5-dev-tools +FROM kdeneon/all +RUN sudo apt-get update && sudo apt-get -y install build-essential cmake extra-cmake-modules gettext kio-dev libatasmart-dev libboost-python-dev libkf5config-dev libkf5coreaddons-dev libkf5i18n-dev libkf5iconthemes-dev libkf5parts-dev libkf5service-dev libkf5solid-dev libkpmcore-dev libparted-dev libpolkit-qt5-1-dev libqt5svg5-dev libqt5webkit5-dev libyaml-cpp-dev os-prober pkg-config python3-dev qtbase5-dev qtdeclarative5-dev qttools5-dev qttools5-dev-tools diff --git a/LICENSES/GPLv3+-ImageRegistry b/LICENSES/GPLv3+-ImageRegistry new file mode 100644 index 000000000..362e89766 --- /dev/null +++ b/LICENSES/GPLv3+-ImageRegistry @@ -0,0 +1,16 @@ +/* + * Copyright 2012, Christian Muehlhaeuser + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ diff --git a/LICENSES/GPLv3+-QJsonModel b/LICENSES/GPLv3+-QJsonModel new file mode 100644 index 000000000..8a8e272c0 --- /dev/null +++ b/LICENSES/GPLv3+-QJsonModel @@ -0,0 +1,18 @@ +/*********************************************** + Copyright (C) 2014 Schutz Sacha + This file is part of QJsonModel (https://github.com/dridk/QJsonmodel). + + QJsonModel is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QJsonModel is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QJsonModel. If not, see . + +**********************************************/ diff --git a/LICENSES/LGPLv2.1-Presentation b/LICENSES/LGPLv2.1-Presentation new file mode 100644 index 000000000..1bb6461eb --- /dev/null +++ b/LICENSES/LGPLv2.1-Presentation @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QML Presentation System. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QML Presentation System. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + diff --git a/LICENSES/LGPLv2.1-Presentation-Exception b/LICENSES/LGPLv2.1-Presentation-Exception new file mode 100644 index 000000000..7e2e30ff9 --- /dev/null +++ b/LICENSES/LGPLv2.1-Presentation-Exception @@ -0,0 +1,22 @@ +Digia Qt LGPL Exception version 1.1 + +As an additional permission to the GNU Lesser General Public License version +2.1, the object code form of a "work that uses the Library" may incorporate +material from a header file that is part of the Library. You may distribute +such object code under terms of your choice, provided that: + (i) the header files of the Library have not been modified; and + (ii) the incorporated material is limited to numerical parameters, data + structure layouts, accessors, macros, inline functions and + templates; and + (iii) you comply with the terms of Section 6 of the GNU Lesser General + Public License version 2.1. + +Moreover, you may apply this exception to a modified version of the Library, +provided that such modification does not involve copying material from the +Library into the modified Library's header files unless such material is +limited to (i) numerical parameters; (ii) data structure layouts; +(iii) accessors; and (iv) small macros, templates and inline functions of +five lines or less in length. + +Furthermore, you are not required to apply this additional permission to a +modified version of the Library. diff --git a/LICENSES/MIT-QtWaitingSpinner b/LICENSES/MIT-QtWaitingSpinner new file mode 100644 index 000000000..c85c97aeb --- /dev/null +++ b/LICENSES/MIT-QtWaitingSpinner @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Original Work Copyright (c) 2012-2015 Alexander Turkin +Modified 2014 by William Hallatt + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index a188d9d72..dcb5e3b67 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,14 @@ [![Coverity Scan Build Status](https://scan.coverity.com/projects/5389/badge.svg)](https://scan.coverity.com/projects/5389) [![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/master/LICENSE) -| [Report a Bug](https://calamares.io/bugs/) | [Contribute](https://github.com/calamares/calamares/blob/master/HACKING.md) | [Translate](https://www.transifex.com/projects/p/calamares/) | Freenode (IRC): #calamares | [Wiki](https://github.com/calamares/calamares/wiki) | +| [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Contribute](https://github.com/calamares/calamares/blob/master/ci/HACKING.md) | [Translate](https://www.transifex.com/projects/p/calamares/) | Freenode (IRC): #calamares | [Wiki](https://github.com/calamares/calamares/wiki) | |:-----------------------------------------:|:----------------------:|:-----------------------:|:--------------------------:|:--------------------------:| ### Dependencies Main: * Compiler with C++11 support: GCC >= 4.9.0 or Clang >= 3.5.1 -* CMake >= 2.8.12 +* CMake >= 3.2 * Qt >= 5.6 * yaml-cpp >= 0.5.1 * Python >= 3.3 @@ -28,7 +28,7 @@ Modules: * partition: * extra-cmake-modules * KF5: KCoreAddons, KConfig, KI18n, KIconThemes, KIO, KService - * KPMcore >= 3.0 + * KPMcore >= 3.0.3 * bootloader: * systemd-boot or GRUB * unpackfs: diff --git a/calamares.desktop b/calamares.desktop index 88cb71e20..2dcc78fd2 100644 --- a/calamares.desktop +++ b/calamares.desktop @@ -11,3 +11,105 @@ Icon=calamares Terminal=false StartupNotify=true Categories=Qt;System; + + +Name[ca]=Calamares +Icon[ca]=calamares +GenericName[ca]=Instal·lador de sistema +Comment[ca]=Calamares — Instal·lador de sistema +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[en_GB]=Calamares +Icon[en_GB]=calamares +GenericName[en_GB]=System Installer +Comment[en_GB]=Calamares — System Installer +Name[es]=Calamares +Icon[es]=calamares +GenericName[es]=Instalador del Sistema +Comment[es]=Calamares — Instalador del Sistema +Name[fr]=Calamares +Icon[fr]=calamares +GenericName[fr]=Installateur système +Comment[fr]=Calamares - Installateur système +Name[he]=קלמארס +Icon[he]=קלמארס +GenericName[he]=אשף התקנה +Comment[he]=קלמארס - אשף התקנה +Name[hr]=Calamares +Icon[hr]=calamares +GenericName[hr]=Instalacija sustava +Comment[hr]=Calamares — Instalacija sustava +Name[hu]=Calamares +Icon[hu]=calamares +GenericName[hu]=Rendszer Telepítő +Comment[hu]=Calamares — Rendszer Telepítő +Name[id]=Calamares +Icon[id]=calamares +GenericName[id]=Pemasang +Comment[id]=Calamares — Pemasang Sistem +Name[is]=Calamares +Icon[is]=calamares +GenericName[is]=Kerfis uppsetning +Comment[is]=Calamares — Kerfis uppsetning +Name[ja]=Calamares +Icon[ja]=calamares +GenericName[ja]=システムインストーラー +Comment[ja]=Calamares — システムインストーラー +Name[lt]=Calamares +Icon[lt]=calamares +GenericName[lt]=Sistemos diegimas į kompiuterį +Comment[lt]=Calamares — sistemos diegyklė +Name[nl]=Calamares +Icon[nl]=calamares +GenericName[nl]=Installatieprogramma +Comment[nl]=Calamares — Installatieprogramma +Name[pl]=Calamares +Icon[pl]=calamares +GenericName[pl]=Instalator systemu +Comment[pl]=Calamares — Instalator systemu +Name[pt_BR]=Calamares +Icon[pt_BR]=calamares +GenericName[pt_BR]=Instalador de Sistema +Comment[pt_BR]=Calamares — Instalador de Sistema +Name[cs_CZ]=Calamares +Icon[cs_CZ]=calamares +GenericName[cs_CZ]=Instalační program systému +Comment[cs_CZ]=Calamares - instalační program systému +Name[ru]=Calamares +Icon[ru]=calamares +GenericName[ru]=Установщик системы +Comment[ru]=Calamares - Установщик системы +Name[sk]=Calamares +Icon[sk]=calamares +GenericName[sk]=Inštalátor systému +Comment[sk]=Calamares — Inštalátor systému +Name[sv]=Calamares +Icon[sv]=calamares +GenericName[sv]=Systeminstallerare +Comment[sv]=Calamares — Systeminstallerare +Name[zh_CN]=Calamares +Icon[zh_CN]=calamares +GenericName[zh_CN]=系统安装程序 +Comment[zh_CN]=Calamares — 系统安装程序 +Name[zh_TW]=Calamares +Icon[zh_TW]=calamares +GenericName[zh_TW]=系統安裝程式 +Comment[zh_TW]=Calamares ── 系統安裝程式 +Name[ast]=Calamares +Icon[ast]=calamares +GenericName[ast]=Instalador del sistema +Comment[ast]=Calamares — Instalador del sistema +Name[pt_PT]=Calamares +Icon[pt_PT]=calamares +GenericName[pt_PT]=Instalador de Sistema +Comment[pt_PT]=Calamares - Instalador de Sistema +Name[tr_TR]=Calamares +Icon[tr_TR]=calamares +GenericName[tr_TR]=Sistem Yükleyici +Comment[tr_TR]=Calamares — Sistem Yükleyici diff --git a/HACKING.md b/ci/HACKING.md similarity index 100% rename from HACKING.md rename to ci/HACKING.md diff --git a/ci/RELEASE.md b/ci/RELEASE.md new file mode 100644 index 000000000..640a91156 --- /dev/null +++ b/ci/RELEASE.md @@ -0,0 +1,65 @@ +The Calamares release process +============================= + +#### (0) A week in advance +* Run [Coverity scan][coverity], fix what's relevant. The Coverity scan runs + automatically once a week on master. +* Build with clang -Weverything, fix what's relevant. + ``` + rm -rf build ; mkdir build ; cd build + CC=clang CXX=clang++ cmake .. && make + ``` +* Make sure all tests pass. + ``` + make + make test + ``` + Note that *all* means all-that-make-sense. The partition-manager tests need + an additional environment variable to be set for some tests, which will + destroy an attached disk. This is not always desirable. +* Notify [translators][transifex]. In the dashboard there is an *Announcements* + link that you can use to send a translation announcement. + +[coverity]: https://scan.coverity.com/projects/calamares-calamares?tab=overview +[transifex]: https://www.transifex.com/calamares/calamares/dashboard/ + +#### (1) Preparation + +* Bump version in `CMakeLists.txt`, *CALAMARES_VERSION* variables, and set + RC to a non-zero value (e.g. doing -rc1, -rc2, ...). Push that. +* Check `README.md` and everything in `hacking`, make sure it's all still + relevant. Run `hacking/calamaresstyle` to check the C++ code style. + Python code is checked as part of the Travis CI builds. +* Check defaults in `settings.conf` and other configuration files. +* Pull latest translations from Transifex. This is done nightly on Jenkins, + so a manual pull is rarely necessary. +* Update the list of enabled translation languages in `CMakeLists.txt`. + Check the [translation site][transifex] for the list of languages with + fairly complete translations. + +#### (2) Tarball +* Create tarball: `git-archive-all -v calamares-1.1-rc1.tar.gz` or without + the helper script, + ``` + V=calamares-3.1.5 + git archive -o $V.tar.gz --prefix $V/ master + ``` + Double check that the tarball matches the version number. +* Test tarball. + +#### (3) Tag +* Set RC to zero in `CMakeLists.txt` if this is the actual release. +* `git tag -s v1.1.0` Make sure the signing key is known in GitHub, so that the + tag is shown as a verified tag. Do not sign -rc tags. +* Generate MD5 and SHA256 checksums. +* Upload tarball. +* Announce on mailing list, notify packagers. +* Write release article. + +#### (4) Release day +* Publish tarball. +* Update download page. +* Publish release article on `calamares.io`. +* Publicize on social networks. +* Close associated milestone on GitHub if this is the actual release. +* Publish blog post. diff --git a/hacking/astylerc b/ci/astylerc similarity index 100% rename from hacking/astylerc rename to ci/astylerc diff --git a/hacking/calamaresstyle b/ci/calamaresstyle similarity index 100% rename from hacking/calamaresstyle rename to ci/calamaresstyle diff --git a/ci/coverity-model.c b/ci/coverity-model.c new file mode 100644 index 000000000..b4282397c --- /dev/null +++ b/ci/coverity-model.c @@ -0,0 +1,6 @@ +/* Model file for Coverity checker. + See https://scan.coverity.com/tune + + Calamares doesn't seem to geenerate any false positives, + so the model-file is empty. +*/ diff --git a/ci/txpull.sh b/ci/txpull.sh index cddc543ef..53a0deaa4 100755 --- a/ci/txpull.sh +++ b/ci/txpull.sh @@ -1,31 +1,87 @@ -#!/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 -git add --verbose lang/calamares*.ts -git commit --author='Calamares CI ' --message='[core] Automatic merge of Transifex translations' | true -for MODULE_DIR in `find src/modules -maxdepth 1 -mindepth 1 -type d`; do - FILES=(${MODULE_DIR}/*.py) - if [ ${#FILES[@]} -gt 0 ]; then +### 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" --message="[core] $BOILERPLATE" | true + +rm -f lang/desktop*.desktop +awk ' + BEGIN {skip=0;} + /^# Translations/ {skip=1;} + {if (!skip || (length($0)>1 && $0 != "# Translations")) { + skip=0; print $0; + }}' < calamares.desktop > calamares.desktop.new +mv calamares.desktop.new calamares.desktop +git add --verbose 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 -- + +# 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 . -name "*.po"` ; do - msgfmt -o ${POFILE/.po/.mo} $POFILE + for POFILE in $(find ${MODULE_DIR} -name "*.po") ; do + sed -i'' '/^"Content-Type/s/CHARSET/UTF-8/' $POFILE + 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 +for POFILE in $(find lang -name "python.po") ; do + sed -i'' '/^"Content-Type/s/CHARSET/UTF-8/' $POFILE + msgfmt -o ${POFILE%.po}.mo $POFILE +done +git add --verbose lang/python* +git commit "$AUTHOR" --message="[python] $BOILERPLATE" | true + +# git push --set-upstream origin master diff --git a/ci/txpush.sh b/ci/txpush.sh index d1a2d82be..fe6d7170f 100755 --- a/ci/txpush.sh +++ b/ci/txpush.sh @@ -1,34 +1,77 @@ -#!/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 ; } + +if test "x$1" = "x--no-tx" ; then + tx() { + echo "Skipped tx $*" + } +fi + +### 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 -# Arch -# PYGETTEXT=/usr/lib/python3.5/Tools/i18n/pygettext.py +tx push --source --no-interactive -r calamares.calamares-master +tx push --source --no-interactive -r calamares.fdo -# Ubuntu -PYGETTEXT=pygettext3 +### 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 +# -for MODULE_DIR in `find src/modules -maxdepth 1 -mindepth 1 -type d`; do - FILES=(${MODULE_DIR}/*.py) - if [ ${#FILES[@]} -gt 0 ]; then +PYGETTEXT="xgettext --keyword=_n:1,2 -L python" + +SHARED_PYTHON="" +for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do + FILES=$(find "$MODULE_DIR" -name "*.py" -a -type f) + 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} + ${PYGETTEXT} -p ${MODULE_DIR}/lang -d ${MODULE_NAME} -o ${MODULE_NAME}.pot ${MODULE_DIR}/*.py + POTFILE="${MODULE_DIR}/lang/${MODULE_NAME}.pot" + if [ -f "$POTFILE" ]; then + sed -i'' '/^"Content-Type/s/CHARSET/UTF-8/' "$POTFILE" + tx set -r calamares.${MODULE_NAME} --source -l en "$POTFILE" + tx push --source --no-interactive -r calamares.${MODULE_NAME} fi + else + SHARED_PYTHON="$SHARED_PYTHON $FILES" fi fi done -tx push --force --source --no-interactive -r calamares.calamares-master +if test -n "$SHARED_PYTHON" ; then + ${PYGETTEXT} -p lang -d python -o python.pot $SHARED_PYTHON + POTFILE="lang/python.pot" + sed -i'' '/^"Content-Type/s/CHARSET/UTF-8/' "$POTFILE" + tx set -r calamares.python --source -l en "$POTFILE" + tx push --source --no-interactive -r calamares.python +fi diff --git a/data/example-root/README.md b/data/example-root/README.md new file mode 100644 index 000000000..7173b3eaf --- /dev/null +++ b/data/example-root/README.md @@ -0,0 +1,11 @@ +# Example Filesystem + +This is a filesystem that will be used as / in an example distro, +*if* you build the `example-distro` target and use the default +unpackfs configuration. It should hold files and configuration +bits that need to be on the target system for example purposes. + +It should *not* have a bin/, lib/, sbin/ or lib64/ directory, +since those are copied into the example-distro filesystem +from the build host. + diff --git a/data/example-root/etc/bash.bashrc b/data/example-root/etc/bash.bashrc new file mode 100644 index 000000000..42bd3d007 --- /dev/null +++ b/data/example-root/etc/bash.bashrc @@ -0,0 +1,2 @@ +# Global .profile -- add /sbin_1 +PATH=$PATH:/sbin_1:/xbin diff --git a/data/example-root/etc/group b/data/example-root/etc/group new file mode 100644 index 000000000..1dbf9013e --- /dev/null +++ b/data/example-root/etc/group @@ -0,0 +1 @@ +root:x:0: diff --git a/data/example-root/etc/issue b/data/example-root/etc/issue new file mode 100644 index 000000000..ce0ac58e3 --- /dev/null +++ b/data/example-root/etc/issue @@ -0,0 +1 @@ +This is an example /etc/issue file. diff --git a/data/example-root/etc/locale.gen b/data/example-root/etc/locale.gen new file mode 100644 index 000000000..5e729a18d --- /dev/null +++ b/data/example-root/etc/locale.gen @@ -0,0 +1,486 @@ +# This file lists locales that you wish to have built. You can find a list +# of valid supported locales at /usr/share/i18n/SUPPORTED, and you can add +# user defined locales to /usr/local/share/i18n/SUPPORTED. If you change +# this file, you need to rerun locale-gen. + + +# aa_DJ ISO-8859-1 +# aa_DJ.UTF-8 UTF-8 +# aa_ER UTF-8 +# aa_ER@saaho UTF-8 +# aa_ET UTF-8 +# af_ZA ISO-8859-1 +# af_ZA.UTF-8 UTF-8 +# ak_GH UTF-8 +# am_ET UTF-8 +# an_ES ISO-8859-15 +# an_ES.UTF-8 UTF-8 +# anp_IN UTF-8 +# ar_AE ISO-8859-6 +# ar_AE.UTF-8 UTF-8 +# ar_BH ISO-8859-6 +# ar_BH.UTF-8 UTF-8 +# ar_DZ ISO-8859-6 +# ar_DZ.UTF-8 UTF-8 +# ar_EG ISO-8859-6 +# ar_EG.UTF-8 UTF-8 +# ar_IN UTF-8 +# ar_IQ ISO-8859-6 +# ar_IQ.UTF-8 UTF-8 +# ar_JO ISO-8859-6 +# ar_JO.UTF-8 UTF-8 +# ar_KW ISO-8859-6 +# ar_KW.UTF-8 UTF-8 +# ar_LB ISO-8859-6 +# ar_LB.UTF-8 UTF-8 +# ar_LY ISO-8859-6 +# ar_LY.UTF-8 UTF-8 +# ar_MA ISO-8859-6 +# ar_MA.UTF-8 UTF-8 +# ar_OM ISO-8859-6 +# ar_OM.UTF-8 UTF-8 +# ar_QA ISO-8859-6 +# ar_QA.UTF-8 UTF-8 +# ar_SA ISO-8859-6 +# ar_SA.UTF-8 UTF-8 +# ar_SD ISO-8859-6 +# ar_SD.UTF-8 UTF-8 +# ar_SS UTF-8 +# ar_SY ISO-8859-6 +# ar_SY.UTF-8 UTF-8 +# ar_TN ISO-8859-6 +# ar_TN.UTF-8 UTF-8 +# ar_YE ISO-8859-6 +# ar_YE.UTF-8 UTF-8 +# as_IN UTF-8 +# ast_ES ISO-8859-15 +# ast_ES.UTF-8 UTF-8 +# ayc_PE UTF-8 +# az_AZ UTF-8 +# be_BY CP1251 +# be_BY.UTF-8 UTF-8 +# be_BY@latin UTF-8 +# bem_ZM UTF-8 +# ber_DZ UTF-8 +# ber_MA UTF-8 +# bg_BG CP1251 +# bg_BG.UTF-8 UTF-8 +# bhb_IN.UTF-8 UTF-8 +# bho_IN UTF-8 +# bn_BD UTF-8 +# bn_IN UTF-8 +# bo_CN UTF-8 +# bo_IN UTF-8 +# br_FR ISO-8859-1 +# br_FR.UTF-8 UTF-8 +# br_FR@euro ISO-8859-15 +# brx_IN UTF-8 +# bs_BA ISO-8859-2 +# bs_BA.UTF-8 UTF-8 +# byn_ER UTF-8 +# ca_AD ISO-8859-15 +# ca_AD.UTF-8 UTF-8 +# ca_ES ISO-8859-1 +# ca_ES.UTF-8 UTF-8 +# ca_ES.UTF-8@valencia UTF-8 +# ca_ES@euro ISO-8859-15 +# ca_ES@valencia ISO-8859-15 +# ca_FR ISO-8859-15 +# ca_FR.UTF-8 UTF-8 +# ca_IT ISO-8859-15 +# ca_IT.UTF-8 UTF-8 +# ce_RU UTF-8 +# ckb_IQ UTF-8 +# cmn_TW UTF-8 +# crh_UA UTF-8 +# cs_CZ ISO-8859-2 +# cs_CZ.UTF-8 UTF-8 +# csb_PL UTF-8 +# cv_RU UTF-8 +# cy_GB ISO-8859-14 +# cy_GB.UTF-8 UTF-8 +# da_DK ISO-8859-1 +# da_DK.UTF-8 UTF-8 +# de_AT ISO-8859-1 +# de_AT.UTF-8 UTF-8 +# de_AT@euro ISO-8859-15 +# de_BE ISO-8859-1 +# de_BE.UTF-8 UTF-8 +# de_BE@euro ISO-8859-15 +# de_CH ISO-8859-1 +# de_CH.UTF-8 UTF-8 +# de_DE ISO-8859-1 +# de_DE.UTF-8 UTF-8 +# de_DE@euro ISO-8859-15 +# de_LI.UTF-8 UTF-8 +# de_LU ISO-8859-1 +# de_LU.UTF-8 UTF-8 +# de_LU@euro ISO-8859-15 +# doi_IN UTF-8 +# dv_MV UTF-8 +# dz_BT UTF-8 +# el_CY ISO-8859-7 +# el_CY.UTF-8 UTF-8 +# el_GR ISO-8859-7 +# el_GR.UTF-8 UTF-8 +# en_AG UTF-8 +# en_AU ISO-8859-1 +# en_AU.UTF-8 UTF-8 +# en_BW ISO-8859-1 +# en_BW.UTF-8 UTF-8 +# en_CA ISO-8859-1 +en_CA.UTF-8 UTF-8 +# en_DK ISO-8859-1 +# en_DK.ISO-8859-15 ISO-8859-15 +# en_DK.UTF-8 UTF-8 +# en_GB ISO-8859-1 +# en_GB.ISO-8859-15 ISO-8859-15 +# en_GB.UTF-8 UTF-8 +# en_HK ISO-8859-1 +# en_HK.UTF-8 UTF-8 +# en_IE ISO-8859-1 +# en_IE.UTF-8 UTF-8 +# en_IE@euro ISO-8859-15 +# en_IN UTF-8 +# en_NG UTF-8 +# en_NZ ISO-8859-1 +# en_NZ.UTF-8 UTF-8 +# en_PH ISO-8859-1 +# en_PH.UTF-8 UTF-8 +# en_SG ISO-8859-1 +# en_SG.UTF-8 UTF-8 +# en_US ISO-8859-1 +# en_US.ISO-8859-15 ISO-8859-15 +en_US.UTF-8 UTF-8 +# en_ZA ISO-8859-1 +# en_ZA.UTF-8 UTF-8 +# en_ZM UTF-8 +# en_ZW ISO-8859-1 +# en_ZW.UTF-8 UTF-8 +# eo ISO-8859-3 +# eo.UTF-8 UTF-8 +# eo_US.UTF-8 UTF-8 +# es_AR ISO-8859-1 +# es_AR.UTF-8 UTF-8 +# es_BO ISO-8859-1 +# es_BO.UTF-8 UTF-8 +# es_CL ISO-8859-1 +# es_CL.UTF-8 UTF-8 +# es_CO ISO-8859-1 +# es_CO.UTF-8 UTF-8 +# es_CR ISO-8859-1 +# es_CR.UTF-8 UTF-8 +# es_CU UTF-8 +# es_DO ISO-8859-1 +# es_DO.UTF-8 UTF-8 +# es_EC ISO-8859-1 +# es_EC.UTF-8 UTF-8 +# es_ES ISO-8859-1 +# es_ES.UTF-8 UTF-8 +# es_ES@euro ISO-8859-15 +# es_GT ISO-8859-1 +# es_GT.UTF-8 UTF-8 +# es_HN ISO-8859-1 +# es_HN.UTF-8 UTF-8 +# es_MX ISO-8859-1 +# es_MX.UTF-8 UTF-8 +# es_NI ISO-8859-1 +# es_NI.UTF-8 UTF-8 +# es_PA ISO-8859-1 +# es_PA.UTF-8 UTF-8 +# es_PE ISO-8859-1 +# es_PE.UTF-8 UTF-8 +# es_PR ISO-8859-1 +# es_PR.UTF-8 UTF-8 +# es_PY ISO-8859-1 +# es_PY.UTF-8 UTF-8 +# es_SV ISO-8859-1 +# es_SV.UTF-8 UTF-8 +# es_US ISO-8859-1 +# es_US.UTF-8 UTF-8 +# es_UY ISO-8859-1 +# es_UY.UTF-8 UTF-8 +# es_VE ISO-8859-1 +# es_VE.UTF-8 UTF-8 +# et_EE ISO-8859-1 +# et_EE.ISO-8859-15 ISO-8859-15 +# et_EE.UTF-8 UTF-8 +# eu_ES ISO-8859-1 +# eu_ES.UTF-8 UTF-8 +# eu_ES@euro ISO-8859-15 +# eu_FR ISO-8859-1 +# eu_FR.UTF-8 UTF-8 +# eu_FR@euro ISO-8859-15 +# fa_IR UTF-8 +# ff_SN UTF-8 +# fi_FI ISO-8859-1 +# fi_FI.UTF-8 UTF-8 +# fi_FI@euro ISO-8859-15 +# fil_PH UTF-8 +# fo_FO ISO-8859-1 +# fo_FO.UTF-8 UTF-8 +# fr_BE ISO-8859-1 +# fr_BE.UTF-8 UTF-8 +# fr_BE@euro ISO-8859-15 +# fr_CA ISO-8859-1 +# fr_CA.UTF-8 UTF-8 +# fr_CH ISO-8859-1 +# fr_CH.UTF-8 UTF-8 +# fr_FR ISO-8859-1 +# fr_FR.UTF-8 UTF-8 +# fr_FR@euro ISO-8859-15 +# fr_LU ISO-8859-1 +# fr_LU.UTF-8 UTF-8 +# fr_LU@euro ISO-8859-15 +# fur_IT UTF-8 +# fy_DE UTF-8 +# fy_NL UTF-8 +# ga_IE ISO-8859-1 +# ga_IE.UTF-8 UTF-8 +# ga_IE@euro ISO-8859-15 +# gd_GB ISO-8859-15 +# gd_GB.UTF-8 UTF-8 +# gez_ER UTF-8 +# gez_ER@abegede UTF-8 +# gez_ET UTF-8 +# gez_ET@abegede UTF-8 +# gl_ES ISO-8859-1 +# gl_ES.UTF-8 UTF-8 +# gl_ES@euro ISO-8859-15 +# gu_IN UTF-8 +# gv_GB ISO-8859-1 +# gv_GB.UTF-8 UTF-8 +# ha_NG UTF-8 +# hak_TW UTF-8 +# he_IL ISO-8859-8 +# he_IL.UTF-8 UTF-8 +# hi_IN UTF-8 +# hne_IN UTF-8 +# hr_HR ISO-8859-2 +# hr_HR.UTF-8 UTF-8 +# hsb_DE ISO-8859-2 +# hsb_DE.UTF-8 UTF-8 +# ht_HT UTF-8 +# hu_HU ISO-8859-2 +# hu_HU.UTF-8 UTF-8 +# hy_AM UTF-8 +# hy_AM.ARMSCII-8 ARMSCII-8 +# ia_FR UTF-8 +# id_ID ISO-8859-1 +# id_ID.UTF-8 UTF-8 +# ig_NG UTF-8 +# ik_CA UTF-8 +# is_IS ISO-8859-1 +# is_IS.UTF-8 UTF-8 +# it_CH ISO-8859-1 +# it_CH.UTF-8 UTF-8 +# it_IT ISO-8859-1 +# it_IT.UTF-8 UTF-8 +# it_IT@euro ISO-8859-15 +# iu_CA UTF-8 +# iw_IL ISO-8859-8 +# iw_IL.UTF-8 UTF-8 +# ja_JP.EUC-JP EUC-JP +# ja_JP.UTF-8 UTF-8 +# ka_GE GEORGIAN-PS +# ka_GE.UTF-8 UTF-8 +# kk_KZ PT154 +# kk_KZ RK1048 +# kk_KZ.UTF-8 UTF-8 +# kl_GL ISO-8859-1 +# kl_GL.UTF-8 UTF-8 +# km_KH UTF-8 +# kn_IN UTF-8 +# ko_KR.EUC-KR EUC-KR +# ko_KR.UTF-8 UTF-8 +# kok_IN UTF-8 +# ks_IN UTF-8 +# ks_IN@devanagari UTF-8 +# ku_TR ISO-8859-9 +# ku_TR.UTF-8 UTF-8 +# kw_GB ISO-8859-1 +# kw_GB.UTF-8 UTF-8 +# ky_KG UTF-8 +# lb_LU UTF-8 +# lg_UG ISO-8859-10 +# lg_UG.UTF-8 UTF-8 +# li_BE UTF-8 +# li_NL UTF-8 +# lij_IT UTF-8 +# ln_CD UTF-8 +# lo_LA UTF-8 +# lt_LT ISO-8859-13 +# lt_LT.UTF-8 UTF-8 +# lv_LV ISO-8859-13 +# lv_LV.UTF-8 UTF-8 +# lzh_TW UTF-8 +# mag_IN UTF-8 +# mai_IN UTF-8 +# mg_MG ISO-8859-15 +# mg_MG.UTF-8 UTF-8 +# mhr_RU UTF-8 +# mi_NZ ISO-8859-13 +# mi_NZ.UTF-8 UTF-8 +# mk_MK ISO-8859-5 +# mk_MK.UTF-8 UTF-8 +# ml_IN UTF-8 +# mn_MN UTF-8 +# mni_IN UTF-8 +# mr_IN UTF-8 +# ms_MY ISO-8859-1 +# ms_MY.UTF-8 UTF-8 +# mt_MT ISO-8859-3 +# mt_MT.UTF-8 UTF-8 +# my_MM UTF-8 +# nan_TW UTF-8 +# nan_TW@latin UTF-8 +# nb_NO ISO-8859-1 +# nb_NO.UTF-8 UTF-8 +# nds_DE UTF-8 +# nds_NL UTF-8 +# ne_NP UTF-8 +# nhn_MX UTF-8 +# niu_NU UTF-8 +# niu_NZ UTF-8 +# nl_AW UTF-8 +# nl_BE ISO-8859-1 +# nl_BE.UTF-8 UTF-8 +# nl_BE@euro ISO-8859-15 +# nl_NL ISO-8859-1 +# nl_NL.UTF-8 UTF-8 +# nl_NL@euro ISO-8859-15 +# nn_NO ISO-8859-1 +# nn_NO.UTF-8 UTF-8 +# nr_ZA UTF-8 +# nso_ZA UTF-8 +# oc_FR ISO-8859-1 +# oc_FR.UTF-8 UTF-8 +# om_ET UTF-8 +# om_KE ISO-8859-1 +# om_KE.UTF-8 UTF-8 +# or_IN UTF-8 +# os_RU UTF-8 +# pa_IN UTF-8 +# pa_PK UTF-8 +# pap_AN UTF-8 +# pap_AW UTF-8 +# pap_CW UTF-8 +# pl_PL ISO-8859-2 +# pl_PL.UTF-8 UTF-8 +# ps_AF UTF-8 +# pt_BR ISO-8859-1 +# pt_BR.UTF-8 UTF-8 +# pt_PT ISO-8859-1 +# pt_PT.UTF-8 UTF-8 +# pt_PT@euro ISO-8859-15 +# quz_PE UTF-8 +# raj_IN UTF-8 +# ro_RO ISO-8859-2 +# ro_RO.UTF-8 UTF-8 +# ru_RU ISO-8859-5 +# ru_RU.CP1251 CP1251 +# ru_RU.KOI8-R KOI8-R +# ru_RU.UTF-8 UTF-8 +# ru_UA KOI8-U +# ru_UA.UTF-8 UTF-8 +# rw_RW UTF-8 +# sa_IN UTF-8 +# sat_IN UTF-8 +# sc_IT UTF-8 +# sd_IN UTF-8 +# sd_IN@devanagari UTF-8 +# sd_PK UTF-8 +# se_NO UTF-8 +# shs_CA UTF-8 +# si_LK UTF-8 +# sid_ET UTF-8 +# sk_SK ISO-8859-2 +# sk_SK.UTF-8 UTF-8 +# sl_SI ISO-8859-2 +# sl_SI.UTF-8 UTF-8 +# so_DJ ISO-8859-1 +# so_DJ.UTF-8 UTF-8 +# so_ET UTF-8 +# so_KE ISO-8859-1 +# so_KE.UTF-8 UTF-8 +# so_SO ISO-8859-1 +# so_SO.UTF-8 UTF-8 +# sq_AL ISO-8859-1 +# sq_AL.UTF-8 UTF-8 +# sq_MK UTF-8 +# sr_ME UTF-8 +# sr_RS UTF-8 +# sr_RS@latin UTF-8 +# ss_ZA UTF-8 +# st_ZA ISO-8859-1 +# st_ZA.UTF-8 UTF-8 +# sv_FI ISO-8859-1 +# sv_FI.UTF-8 UTF-8 +# sv_FI@euro ISO-8859-15 +# sv_SE ISO-8859-1 +# sv_SE.ISO-8859-15 ISO-8859-15 +# sv_SE.UTF-8 UTF-8 +# sw_KE UTF-8 +# sw_TZ UTF-8 +# szl_PL UTF-8 +# ta_IN UTF-8 +# ta_LK UTF-8 +# tcy_IN.UTF-8 UTF-8 +# te_IN UTF-8 +# tg_TJ KOI8-T +# tg_TJ.UTF-8 UTF-8 +# th_TH TIS-620 +# th_TH.UTF-8 UTF-8 +# the_NP UTF-8 +# ti_ER UTF-8 +# ti_ET UTF-8 +# tig_ER UTF-8 +# tk_TM UTF-8 +# tl_PH ISO-8859-1 +# tl_PH.UTF-8 UTF-8 +# tn_ZA UTF-8 +# tr_CY ISO-8859-9 +# tr_CY.UTF-8 UTF-8 +# tr_TR ISO-8859-9 +# tr_TR.UTF-8 UTF-8 +# ts_ZA UTF-8 +# tt_RU UTF-8 +# tt_RU@iqtelif UTF-8 +# ug_CN UTF-8 +# ug_CN@latin UTF-8 +# uk_UA KOI8-U +# uk_UA.UTF-8 UTF-8 +# unm_US UTF-8 +# ur_IN UTF-8 +# ur_PK UTF-8 +# uz_UZ ISO-8859-1 +# uz_UZ.UTF-8 UTF-8 +# uz_UZ@cyrillic UTF-8 +# ve_ZA UTF-8 +# vi_VN UTF-8 +# wa_BE ISO-8859-1 +# wa_BE.UTF-8 UTF-8 +# wa_BE@euro ISO-8859-15 +# wae_CH UTF-8 +# wal_ET UTF-8 +# wo_SN UTF-8 +# xh_ZA ISO-8859-1 +# xh_ZA.UTF-8 UTF-8 +# yi_US CP1255 +# yi_US.UTF-8 UTF-8 +# yo_NG UTF-8 +# yue_HK UTF-8 +# zh_CN GB2312 +# zh_CN.GB18030 GB18030 +# zh_CN.GBK GBK +# zh_CN.UTF-8 UTF-8 +# zh_HK BIG5-HKSCS +# zh_HK.UTF-8 UTF-8 +# zh_SG GB2312 +# zh_SG.GBK GBK +# zh_SG.UTF-8 UTF-8 +# zh_TW BIG5 +# zh_TW.EUC-TW EUC-TW +# zh_TW.UTF-8 UTF-8 +# zu_ZA ISO-8859-1 +# zu_ZA.UTF-8 UTF-8 diff --git a/data/example-root/etc/profile b/data/example-root/etc/profile new file mode 100644 index 000000000..42bd3d007 --- /dev/null +++ b/data/example-root/etc/profile @@ -0,0 +1,2 @@ +# Global .profile -- add /sbin_1 +PATH=$PATH:/sbin_1:/xbin diff --git a/data/example-root/etc/sudoers.d/10-installer b/data/example-root/etc/sudoers.d/10-installer new file mode 100644 index 000000000..e69de29bb diff --git a/data/example-root/usr/share/zoneinfo/.dummy b/data/example-root/usr/share/zoneinfo/.dummy new file mode 100644 index 000000000..e69de29bb diff --git a/data/example-root/usr/share/zoneinfo/America/New_York b/data/example-root/usr/share/zoneinfo/America/New_York new file mode 100644 index 000000000..7553fee37 Binary files /dev/null and b/data/example-root/usr/share/zoneinfo/America/New_York differ diff --git a/data/example-root/usr/share/zoneinfo/UTC b/data/example-root/usr/share/zoneinfo/UTC new file mode 100644 index 000000000..c3b97f1a1 Binary files /dev/null and b/data/example-root/usr/share/zoneinfo/UTC differ diff --git a/data/example-root/usr/share/zoneinfo/Zulu b/data/example-root/usr/share/zoneinfo/Zulu new file mode 100644 index 000000000..c3b97f1a1 Binary files /dev/null and b/data/example-root/usr/share/zoneinfo/Zulu differ diff --git a/data/example-root/var/lib/dbus/.dummy b/data/example-root/var/lib/dbus/.dummy new file mode 100644 index 000000000..e69de29bb diff --git a/data/example-root/var/lib/initramfs-tools b/data/example-root/var/lib/initramfs-tools new file mode 100644 index 000000000..e69de29bb diff --git a/data/example-root/xbin/linux-version b/data/example-root/xbin/linux-version new file mode 100755 index 000000000..3e91d5333 --- /dev/null +++ b/data/example-root/xbin/linux-version @@ -0,0 +1 @@ +#! /bin/true diff --git a/data/example-root/xbin/useradd b/data/example-root/xbin/useradd new file mode 100755 index 000000000..3e91d5333 --- /dev/null +++ b/data/example-root/xbin/useradd @@ -0,0 +1 @@ +#! /bin/true diff --git a/hacking/RELEASE.md b/hacking/RELEASE.md deleted file mode 100644 index b0d0e1f5e..000000000 --- a/hacking/RELEASE.md +++ /dev/null @@ -1,35 +0,0 @@ -The Calamares release process -============================= - -#### (0) A week in advance -* Run Coverity scan, fix what's relevant. -* Build with clang -Weverything, fix what's relevant. -* Make sure all tests pass. -* Notify translators. - -#### (1) Preparation -* Check `README.md` and everything in `hacking`, make sure it's all still relevant. -* Update submodules. -* Check defaults in `settings.conf` and other configuration files. -* Pull latest translations from Transifex. -* Update the list of enabled translation languages in `CMakeLists.txt`. -* Bump version in `CMakeLists.txt`, commit. - -#### (2) Tarball -* Create tarball: `../git-archive-all/git-archive-all -v calamares-1.1-rc1.tar.gz` -* Test tarball. - -#### (3) Tag -* `git tag -s v1.1.0` -* Generate MD5 and SHA1 checksums. -* Upload tarball. -* Announce on mailing list, notify packagers. -* Write release article. - -#### (4) Release day -* Publish tarball. -* Update download page. -* Publish release article on `calamares.io`. -* Publicize on social networks. -* Update release date on JIRA. -* Publish blog post. diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts index 1f8f323f2..e9d4a7a12 100644 --- a/lang/calamares_ar.ts +++ b/lang/calamares_ar.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - اختر قسما لتقليصه: - - - - Allocate drive space by dragging the divider below: - قم بتخصيص مساحة القرص بسحب الفاصل في الأسفل: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - في هذه العمليّة، سيتقلّص القسم <strong>%1</strong> والذي فيه %4 إلى %2م.بايت وقسم %3م.بايت آخر جديد سيُنشأ ل‍%5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - تعذّر إيجاد قسم النّظام EFI في أيّ مكان. فضلًا ارجع واستخدم التّقسيم اليدويّ لإعداد %1. - - - - The EFI system partition at %1 will be used for starting %2. - سيُستخدم قسم النّظام EFI عند %1 لبدء %2. - - - - EFI system partition: - قسم نظام EFI: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. <strong>بيئة الإقلاع</strong> لهذا النّظام.<br><br>أنظمة x86 القديمة تدعم <strong>BIOS</strong> فقط.<br>غالبًا ما تستخدم الأنظمة الجديدة <strong>EFI</strong>، ولكن ما زال بإمكانك إظهاره ك‍ BIOS إن بدأته بوضع التّوافقيّة. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. بدأ هذا النّظام ببيئة إقلاع <strong>EFI</strong>.<br><br>لضبط البدء من بيئة EFI، يجب على المثبّت وضع تطبيق محمّل إقلاع، مثل <strong>GRUB</strong> أو <strong>systemd-boot</strong> على <strong>قسم نظام EFI</strong>. هذا الأمر آليّ، إلّا إن اخترت التّقسيم يدويًّا، حيث عليك اخيتاره أو إنشاؤه بنفسك. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. بدأ هذا النّظام ببيئة إقلاع <strong>BIOS</strong>.<br><br>لضبط البدء من بيئة BIOS، يجب على المثبّت وضع تطبيق محمّل إقلاع، مثل <strong>GRUB</strong>، إمّا في بداية قسم أو في <strong>قطاع الإقلاع الرّئيس</strong> قرب بداية جدول التّقسيم (محبّذ). هذا الأمر آليّ، إلّا إن اخترت التّقسيم يدويًّا، حيث عليك اخيتاره أو إنشاؤه بنفسك. @@ -221,32 +188,32 @@ Output: Calamares::PythonJob - + Running %1 operation. يشغّل عمليّة %1. - + Bad working directory path مسار سيء لمجلد العمل - + Working directory %1 for python job %2 is not readable. لا يمكن القراءة من مجلد العمل %1 الخاص بعملية بايثون %2. - + Bad main script file ملفّ السّكربت الرّئيس سيّء. - + Main script file %1 for python job %2 is not readable. ملفّ السّكربت الرّئيس %1 لمهمّة بايثون %2 لا يمكن قراءته. - + Boost.Python error in job "%1". خطأ Boost.Python في العمل "%1". @@ -254,65 +221,91 @@ Output: Calamares::ViewManager - + &Back &رجوع - + &Next &التالي - - + + &Cancel &إلغاء - + + + Cancel installation without changing the system. + الغاء الـ تثبيت من دون احداث تغيير في النظام + + + Cancel installation? إلغاء التثبيت؟ - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. أتريد إلغاء عمليّة التّثبيت الحاليّة؟ سيخرج المثبّت وتضيع كلّ التّغييرات. - + + &Yes + &نعم + + + + &No + &لا + + + + &Close + &اغلاق + + + Continue with setup? الإستمرار في التثبيت؟ - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> مثبّت %1 على وشك بإجراء تعديلات على قرصك لتثبيت %2.<br/><strong>لن تستطيع التّراجع عن هذا.</strong> - + &Install now &ثبت الأن - + Go &back &إرجع - - &Quit - &خروج + + &Done + - + + The installation is complete. Close the installer. + + + + Error خطأ - + Installation Failed فشل التثبيت @@ -343,12 +336,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer %1 المثبت - + Show debug information أظهر معلومات التّنقيح @@ -369,7 +362,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> لا يستوفِ هذا الحاسوب أدنى متطلّبات تثبيت %1.<br/>لا يمكن متابعة التّثبيت. <a href="#details">التّفاصيل...</a> @@ -379,17 +372,17 @@ The installer will quit and all changes will be lost. لا يستوفِ هذا الحاسوب بعض المتطلّبات المستحسنة لتثبيت %1.<br/>يمكن للمثبّت المتابعة، ولكن قد تكون بعض الميزات معطّلة. - + This program will ask you some questions and set up %2 on your computer. سيطرح البرنامج بعض الأسئلة عليك ويعدّ %2 على حاسوبك. - + For best results, please ensure that this computer: لأفضل النّتائج، تحقّق من أن الحاسوب: - + System requirements متطلّبات النّظام @@ -402,35 +395,35 @@ The installer will quit and all changes will be lost. نموذج - + After: بعد: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>تقسيم يدويّ</strong><br/>يمكنك إنشاء أو تغيير حجم الأقسام بنفسك. - + Boot loader location: مكان محمّل الإقلاع: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. سيتقلّص %1 إلى %2م.بايت وقسم %3م.بايت آخر جديد سيُنشأ ل‍%4. - + Select storage de&vice: اختر &جهاز التّخزين: - - - - + + + + Current: الحاليّ: @@ -440,71 +433,71 @@ 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>Select a partition to install on</strong> <strong>اختر القسم حيث سيكون التّثبيت عليه</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. تعذّر إيجاد قسم النّظام EFI في أيّ مكان. فضلًا ارجع واستخدم التّقسيم اليدويّ لإعداد %1. - + The EFI system partition at %1 will be used for starting %2. قسم النّظام EFI على %1 سيُستخدم لبدء %2. - + EFI system partition: قسم نظام EFI: - + 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/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>مسح القرص</strong><br/>هذا س<font color="red">يمسح</font> كلّ البيانات الموجودة في جهاز التّخزين المحدّد. - + 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/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>ثبّت جنبًا إلى جنب</strong><br/>سيقلّص المثبّت قسمًا لتفريغ مساحة لِ‍ %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>استبدل قسمًا</strong><br/>يستبدل قسمًا مع %1 . - + This storage device already has 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/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين. - + This storage device has multiple operating systems 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/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين. @@ -530,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. @@ -557,6 +550,11 @@ The installer will quit and all changes will be lost. Create a Partition أنشئ قسمًا + + + MiB + + Partition &Type: @@ -593,32 +591,27 @@ The installer will quit and all changes will be lost. الح&جم: - - MB - م.بايت - - - + En&crypt تشفير - + Logical منطقيّ - + Primary أساسيّ - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -831,7 +824,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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 مستحسن للأنظمة الحديثة. @@ -933,17 +926,22 @@ The installer will quit and all changes will be lost. الح&جم: - + + MiB + + + + Fi&le System: نظام المل&فّات: - + Flags: الشّارات: - + Mountpoint already in use. Please select another one. @@ -971,7 +969,7 @@ The installer will quit and all changes will be lost. أكّد عبارة المرور - + Please enter the same passphrase in both boxes. @@ -989,27 +987,27 @@ The installer will quit and all changes will be lost. ثبّت %1 على قسم نظام %2 <strong>جديد</strong>. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. اضطب قسم %2 <strong>جديد</strong> بنقطة الضّمّ <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. ثبّت %2 على قسم النّظام %3 ‏<strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. اضبط القسم %3 <strong>%1</strong> بنقطة الضّمّ <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. ثبّت محمّل الإقلاع على <strong>%1</strong>. - + Setting up mount points. يضبط نقاط الضّمّ. @@ -1027,18 +1025,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish أنهِ + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1116,12 +1129,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> اضبط طراز لوحة المفتاتيح ليكون %1.<br/> - + Set keyboard layout to %1/%2. اضبط تخطيط لوحة المفاتيح إلى %1/%2. @@ -1137,15 +1150,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting إعداد محليّة النّظام - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1254,12 +1277,12 @@ The installer will quit and all changes will be lost. &غيّر... - + Set timezone to %1/%2.<br/> اضبط المنطقة الزّمنيّة إلى %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1330,17 +1353,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name الاسم - + Description الوصف - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1389,7 +1412,6 @@ The installer will quit and all changes will be lost. ما الاسم الذي تريده لتلج به؟ - @@ -1563,7 +1585,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؟ @@ -1586,82 +1608,82 @@ The installer will quit and all changes will be lost. ثبّت %1 <strong>جنبًا إلى جنب</strong> مع نظام تشغيل آخر. - + <strong>Erase</strong> disk and install %1. <strong>امسح</strong> القرص وثبّت %1. - + <strong>Replace</strong> a partition with %1. <strong>استبدل</strong> قسمًا ب‍ %1. - + <strong>Manual</strong> partitioning. تقسيم <strong>يدويّ</strong>. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>امسح</strong> القرص <strong>%2</strong> (%3) وثبّت %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>استبدل</strong> قسمًا على القرص <strong>%2</strong> (%3) ب‍ %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: الحاليّ: - + After: بعد: - + No EFI system partition configured لم يُضبط أيّ قسم نظام EFI - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set راية قسم نظام EFI غير مضبوطة - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1680,22 +1702,22 @@ The installer will quit and all changes will be lost. الافتراضي - + unknown مجهول - + extended ممتدّ - + unformatted غير مهيّأ - + swap @@ -1718,64 +1740,64 @@ The installer will quit and all changes will be lost. اختر مكان تثبيت %1.<br/><font color="red">تحذير: </font>سيحذف هذا كلّ الملفّات في القسم المحدّد. - + The selected item does not appear to be a valid partition. لا يبدو العنصر المحدّد قسمًا صالحًا. - + %1 cannot be installed on empty space. Please select an existing partition. لا يمكن تثبيت %1 في مساحة فارغة. فضلًا اختر قسمًا موجودًا. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. لا يمكن تثبيت %1 على قسم ممتدّ. فضلًا اختر قسمًا أساسيًّا أو ثانويًّا. - + %1 cannot be installed on this partition. لا يمكن تثبيت %1 على هذا القسم. - + Data partition (%1) قسم البيانات (%1) - + Unknown system partition (%1) قسم نظام مجهول (%1) - + %1 system partition (%2) قسم نظام %1 ‏(%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>القسم %1 صغير جدًّا ل‍ %2. فضلًا اختر قسمًا بحجم %3 غ.بايت على الأقلّ. - + <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 في أيّ مكان. فضلًا ارجع واستخدم التّقسيم اليدويّ لإعداد %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>سيُثبّت %1 على %2.<br/><font color="red">تحذير: </font>ستفقد كلّ البيانات على القسم %2. - + The EFI system partition at %1 will be used for starting %2. سيُستخدم قسم نظام EFI على %1 لبدء %2. - + EFI system partition: قسم نظام EFI: @@ -1783,55 +1805,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... يجمع معلومات النّظام... - + has at least %1 GB available drive space فيه على الأقل مساحة بحجم %1 غ.بايت حرّة - + There is not enough drive space. At least %1 GB is required. ليست في القرص مساحة كافية. المطلوب هو %1 غ.بايت على الأقلّ. - + has at least %1 GB working memory فيه ذاكرة شاغرة بحجم %1 غ.بايت على الأقلّ - + The system does not have enough working memory. At least %1 GB is required. ليس في النّظام ذاكرة شاغرة كافية. المطلوب هو %1 غ.بايت على الأقلّ. - + is plugged in to a power source موصول بمصدر للطّاقة - + The system is not plugged in to a power source. النّظام ليس متّصلًا بمصدر للطّاقة. - + is connected to the Internet موصول بالإنترنت - + The system is not connected to the Internet. النّظام ليس موصولًا بالإنترنت - + The installer is not running with administrator rights. المثبّت لا يعمل بصلاحيّات المدير. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 اضبط كلمة مرور للمستخدم %1 - + Setting password for user %1. يضبط كلمة مرور للمستخدم %1. - + Bad destination system path. مسار النّظام المقصد سيّء. - + rootMountPoint is %1 rootMountPoint هو %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. تعذّر ضبط كلمة مرور للمستخدم %1. - + usermod terminated with error code %1. أُنهي usermod برمز الخطأ %1. @@ -2236,24 +2263,29 @@ The installer will quit and all changes will be lost. &حول - + <h1>Welcome to the %1 installer.</h1> <h1>مرحبًا بك في مثبّت %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer حول 1% المثبت - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support - 1%الدعم + 1% الدعم diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts index 974ad053b..be9f765a0 100644 --- a/lang/calamares_ast.ts +++ b/lang/calamares_ast.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Escueyi la partición pa redimensionar: - - - - Allocate drive space by dragging the divider below: - Alluga l'espaciu d'unidá arrastrando'l divisor d'embaxo: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Con esta operación, redimensionaráse a %2MB la partición <strong>%1</strong> que contién %4 y crearáse una partición nueva de %3MB pa %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Nun pue alcontrase per nenyures una partición del sistema EFI nesti ordenador. Vuelvi atrás y usa'l particionáu manual pa configurar %1, por favor. - - - - The EFI system partition at %1 will be used for starting %2. - La partición del sistema EFI en %1 usaráse p'aniciar %2. - - - - EFI system partition: - Partición del sistema EFI: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. L'<strong>entornu d'arranque</strong> d'esti sistema.<br><br>Sistemes x86 más vieyos namái sofiten <strong>BIOS</strong>.<br>Los sistemes modernos usen davezu <strong>EFI</strong>, pero quiciabes d'amuesen como BIOS si s'anicien nel mou compatibilidá. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Esti sistema anicióse con un entornu d'arranque <strong>EFI</strong>.<br><br>Pa configurar l'aniciu d'un entornu EFI, esti instalador ha instalar una aplicación de xestión d'arranque, como <strong>GRUB</strong> o <strong>systemd-boot</strong> nuna <strong>partición del sistema EFI</strong>. Esto ye automático, a nun ser qu'escueyas el particionáu manual, que nesi casu has escoyer creala tu mesmu. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -221,32 +188,32 @@ Salida: Calamares::PythonJob - + Running %1 operation. Executando operación %1. - + Bad working directory path Camín incorreutu del direutoriu de trabayu - + Working directory %1 for python job %2 is not readable. El direutoriu de trabayu %1 pal trabayu python %2 nun ye lleible. - + Bad main script file Ficheru incorreutu del script principal - + Main script file %1 for python job %2 is not readable. El ficheru de script principal %1 pal trabayu python %2 nun ye lleible. - + Boost.Python error in job "%1". Fallu Boost.Python nel trabayu «%1». @@ -254,65 +221,91 @@ Salida: Calamares::ViewManager - + &Back &Atrás - + &Next &Siguiente - - + + &Cancel &Encaboxar - + + + Cancel installation without changing the system. + + + + Cancel installation? ¿Encaboxar instalación? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. ¿De xuru que quies encaboxar el procesu actual d'instalación? L'instalador colará y perderánse toles camudancies. - + + &Yes + &Sí + + + + &No + &Non + + + + &Close + &Zarrar + + + Continue with setup? ¿Siguir cola configuración? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> L'instalador %1 ta a piques de facer camudancies al to discu pa instalar %2.<br/><strong>Nun sedrás capaz a desfacer estes camudancies.</strong> - + &Install now &Instalar agora - + Go &back &Dir p'atrás - - &Quit - &Colar + + &Done + &Fecho - + + The installation is complete. Close the installer. + Completóse la operación. Zarra l'instalador. + + + Error Fallu - + Installation Failed Instalación fallida @@ -343,12 +336,12 @@ L'instalador colará y perderánse toles camudancies. CalamaresWindow - + %1 Installer Instalador %1 - + Show debug information Amosar información de depuración @@ -369,7 +362,7 @@ L'instalador colará y perderánse toles camudancies. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Esti ordenador nun satifaz los requirimientos mínimos pa la instalación de %1.<br/>La instalación nun pue siguir. <a href="#details">Detalles...</a> @@ -379,17 +372,17 @@ L'instalador colará y perderánse toles camudancies. Esti ordenador nun satifaz dellos requirimientos aconseyaos pa la instalación de %1.<br/>La instalación pue siguir pero podríen deshabilitase delles carauterístiques. - + This program will ask you some questions and set up %2 on your computer. Esti programa fadráte delles entrugues y configurará %2 nel to ordenador. - + For best results, please ensure that this computer: Pa los meyores resultaos, por favor asegúrate qu'esti ordenador: - + System requirements Requirimientos del sistema @@ -402,35 +395,35 @@ L'instalador colará y perderánse toles camudancies. - + After: Dempués: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Particionáu manual</strong><br/>Pues crear o redimensionar particiones tu mesmu. - + Boot loader location: Allugamientu del xestor d'arranque: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 redimensionaráse a %2MB y crearáse la partición nueva de %3MB pa %4. - + Select storage de&vice: Esbillar preséu d'almacenamientu: - - - - + + + + Current: Anguaño: @@ -440,71 +433,71 @@ L'instalador colará y perderánse toles camudancies. Reusar %1 como partición home pa %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Nun pue alcontrase una partición EFI nesti sistema. Torna y usa'l particionáu a mano pa configurar %1, por favor. - + The EFI system partition at %1 will be used for starting %2. La partición del sistema EFI en %1 usaráse p'aniciar %2. - + EFI system partition: Partición EFI del sistema: - + 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. Esti preséu d'almacenamientu nun paez tener un sistema operativu nelli. ¿Qué te prestaría facer?<br/>Sedrás capaz a revisar y confirmar les tos escoyetes enantes de facer cualesquier camudancia al preséu d'almacenamientu. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Desaniciar discu</strong><br/>Esto <font color="red">desaniciará</font> tolos datos anguaño presentes nel preséu d'almacenamientu esbilláu. - + 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. Esti preséu d'almacenamientu tien %1 nelli. ¿Qué te prestaría facer?<br/>Sedrás capaz a revisar y confirmar les tos escoyetes enantes de facer cualesquier camudancia al preséu d'almacenamientu. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Tocar una partición</strong><br/>Troca una partición con %1. - + This storage device already has 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. Esti preséu d'almacenamientu yá tien un sistema operativu nelli. ¿Qué te prestaría facer?<br/>Sedrás capaz a revisar y confirmar les tos escoyetes enantes de facer cualesquier camudancia al preséu d'almacenamientu. - + This storage device has multiple operating systems 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. Esti preséu d'almacenamientu tien múltiples sistemes operativos nelli. ¿Qué te prestaría facer?<br/>Sedrás capaz a revisar y confirmar les tos escoyetes enantes de facer cualesquier camudancia al preséu d'almacenamientu. @@ -530,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. @@ -557,6 +550,11 @@ L'instalador colará y perderánse toles camudancies. Create a Partition Crear una partición + + + MiB + + Partition &Type: @@ -593,32 +591,27 @@ L'instalador colará y perderánse toles camudancies. Tama&ñu: - - MB - MB - - - + En&crypt &Cifrar - + Logical Llóxica - + Primary Primaria - + GPT GPT - + Mountpoint already in use. Please select another one. Puntu de montaxe yá n'usu. Esbilla otru, por favor. @@ -831,7 +824,7 @@ L'instalador colará y perderánse toles camudancies. DeviceInfoWidget - + 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. @@ -933,17 +926,22 @@ L'instalador colará y perderánse toles camudancies. Tama&ñu: - + + MiB + MiB + + + Fi&le System: Sistema de fic&heros: - + Flags: Banderes: - + Mountpoint already in use. Please select another one. Puntu de montaxe yá n'usu. Esbilla otru, por favor. @@ -971,7 +969,7 @@ L'instalador colará y perderánse toles camudancies. Confirmar fras de pasu - + Please enter the same passphrase in both boxes. Introduz la mesma fras de pasu n'entrabes caxes, por favor. @@ -989,27 +987,27 @@ L'instalador colará y perderánse toles camudancies. Instalaráse %1 na <strong>nueva</strong> partición del sistema %2. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Configuraráse la partición <strong>nueva</strong> %2 col puntu montaxe <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Instalaráse %2 na partición del sistema %3 <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Configuraráse la partición %3 de <strong>%1</strong> col puntu montaxe <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Instalaráse'l cargador d'arranque en <strong>%1</strong>. - + Setting up mount points. Configurando puntos de montaxe. @@ -1027,18 +1025,33 @@ L'instalador colará y perderánse toles camudancies. &Reaniciar agora - + <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>Too fecho.</h1><br/>%1 instalóse nel to ordenador.<br/>Quiciabes quieras reaniciar agora al to sistema nuevu, o siguir usando l'entornu live %2. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish Finar + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1116,12 +1129,12 @@ L'instalador colará y perderánse toles camudancies. KeyboardPage - + Set keyboard model to %1.<br/> Afitóse'l modelu de tecláu a %1.<br/> - + Set keyboard layout to %1/%2. Afitóse la distribución de tecláu a %1/%2. @@ -1137,15 +1150,25 @@ L'instalador colará y perderánse toles camudancies. LCLocaleDialog - + System locale setting Axuste de locale del sistema - + 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>. L'axustes de locale del sistema afeuta a la llingua y al conxuntu de caráuteres afitáu pa dellos elementos de la interfaz d'usuaru de llinia comandos.<br/>L'axuste actual ye <strong>%1</strong>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ L'instalador colará y perderánse toles camudancies. LocalePage - + The system language will be set to %1. Afitaráse la llingua'l sistema a %1. - + The numbers and dates locale will be set to %1. Los númberos y dates afitaránse a %1. @@ -1254,12 +1277,12 @@ L'instalador colará y perderánse toles camudancies. &Cambiar... - + Set timezone to %1/%2.<br/> Afitóse'l fusu horariu a %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ L'instalador colará y perderánse toles camudancies. NetInstallPage - + Name Nome - + Description Descripción - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalación de rede. (Deshabilitáu: Nun pue dise en cata del llistáu de paquetes, comprueba la conexón de rede) @@ -1389,7 +1412,6 @@ L'instalador colará y perderánse toles camudancies. ¿Qué nome quies usar p'aniciar sesión? - @@ -1563,7 +1585,7 @@ L'instalador colará y perderánse toles camudancies. &Instalar xestor d'arranque en: - + Are you sure you want to create a new partition table on %1? ¿De xuru que quies crear una tabla particiones nueva en %1? @@ -1586,82 +1608,82 @@ L'instalador colará y perderánse toles camudancies. Instalaráse %1 <strong>cabo</strong> otru sistema operativu. - + <strong>Erase</strong> disk and install %1. <strong>Desaniciaráse</strong>'l discu ya instalaráse %1. - + <strong>Replace</strong> a partition with %1. <strong>Trocaráse</strong> una partición con %1. - + <strong>Manual</strong> partitioning. Particionáu <strong>Manual</strong>. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Instalaráse %1 <strong>cabo</strong> otru sistema operativu nel discu <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Desaniciaráse</strong>'l discu <strong>%2</strong> (%3) ya instalaráse %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Trocaráse</strong> una partición nel discu <strong>%2</strong> (%3) con %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). Particionáu <strong>manual</strong> nel discu <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Discu <strong>%1</strong> (%2) - + Current: Anguaño: - + After: Dempués: - + No EFI system partition configured Nun hai dengún sistema EFI configuráu - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set Nun s'afitó la bandera del sistema EFI - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. Precísase una partición del sistema EFI p'aniciar %1.<br/><br/>Configuróse una partición col puntu montaxe <strong>%2</strong> pero nun s'afitó la so bandera <strong>esp</strong>.<br/>P'afitar la bandera, volvi y edita la partición.<br/><br/>Pues siguir ensin afitar la bandera pero'l to sistema pue fallar al aniciase. - + Boot partition not encrypted /boot non cifráu - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1680,22 +1702,22 @@ L'instalador colará y perderánse toles camudancies. Por defeutu - + unknown - + extended - + unformatted ensin formatiar - + swap intercambéu @@ -1718,64 +1740,64 @@ L'instalador colará y perderánse toles camudancies. Esbilla u instalar %1.<br/><font color="red">Alvertencia: </font> esto desaniciará tolos ficheros na partición esbillada. - + The selected item does not appear to be a valid partition. L'ementu esbilláu nun paez ser una partición válida. - + %1 cannot be installed on empty space. Please select an existing partition. %1 nun pue instalase nel espaciu baleru. Esbilla una partición esistente, por favor. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 nun pue instalase nuna partición estendida. Esbilla una partición llóxica o primaria esistente, por favor. - + %1 cannot be installed on this partition. %1 nun pue instalase nesta partición. - + Data partition (%1) Partición de datos (%1) - + Unknown system partition (%1) Partición del sistema desconocida (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/> La partición %1 ye perpequeña pa %2. Esbilla una cola capacidá de polo menos %3 GiB. - + <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/>Nun pue alcontrase una partición EFI nesti sistema. Volvi atrás y usa'l particionáu manual pa configurar %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>Instalaráse %1 en %2.<br/><font color="red">Alvertencia: </font>perderánse tolos datos na partición %2. - + The EFI system partition at %1 will be used for starting %2. La partición del sistema EFI en %1 usaráse p'aniciar %2. - + EFI system partition: Partición del sistema EFI: @@ -1783,55 +1805,60 @@ L'instalador colará y perderánse toles camudancies. RequirementsChecker - + Gathering system information... Axuntando información del sistema... - + has at least %1 GB available drive space tien polo menos %1 GB disponibles d'espaciu en discu - + There is not enough drive space. At least %1 GB is required. Nun hai espaciu abondu na unidá. Ríquense polo menos %1 GB. - + has at least %1 GB working memory polo menos %1 GB de memoria de trabayu - + The system does not have enough working memory. At least %1 GB is required. El sistema nun tien abonda memoria de trabayu. Ríquense polo menos %1 GB. - + is plugged in to a power source ta enchufáu a una fonte d'enerxía - + The system is not plugged in to a power source. El sistema nun ta enchufáu a una fonte d'enerxía. - + is connected to the Internet ta coneutáu a internet - + The system is not connected to the Internet. El sistema nun ta coneutáu a internet. - + The installer is not running with administrator rights. L'instalador nun ta executándose con drechos alministrativos. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ L'instalador colará y perderánse toles camudancies. SetPasswordJob - + Set password for user %1 Afitar la contraseña pal usuariu %1 - + Setting password for user %1. Afitando la contraseña pal usuariu %1. - + Bad destination system path. Camín incorreutu del destín del sistema. - + rootMountPoint is %1 rootMountPoint ye %1 - + Cannot disable root account. Nun pue deshabilitase la cuenta root. - + passwd terminated with error code %1. passwd finó col códigu de fallu %1. - + Cannot set password for user %1. Nun pue afitase la contraseña pal usuariu %1. - + usermod terminated with error code %1. usermod finó col códigu de fallu %1. @@ -2236,22 +2263,27 @@ L'instalador colará y perderánse toles camudancies. &Tocante a - + <h1>Welcome to the %1 installer.</h1> <h1>Bienllegáu al instalador %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Afáyate nel instalador Calamares pa %1.</h1> + + + About %1 installer Tocante al instaldor %1 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>por %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Gracies a: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan y los <a href="https://www.transifex.com/calamares/calamares/">equipos de traducción de Calamares</a>.<br/><br/>El desendolcu de <a href="http://calamares.io/">Calamares</a> ta sofitáu por <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + <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. + - + %1 support Sofitu %1 diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts index ad13940c1..388bb98a8 100644 --- a/lang/calamares_bg.ts +++ b/lang/calamares_bg.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Избери дял, който да смалиш: - - - - Allocate drive space by dragging the divider below: - Разпредели дисковото пространство, като влачиш разделителя по-долу: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - С това действие, дялът <strong>%1</strong>, който съдържа %4, ще бъде смален до %2МБ и нов %3МБ дял ще бъде създаден за %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - EFI системен дял не е намерен. Моля, опитайте пак като използвате ръчно поделяне за %1. - - - - The EFI system partition at %1 will be used for starting %2. - EFI системен дял в %1 ще бъде използван за стартиране на %2. - - - - EFI system partition: - EFI системен дял: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. <strong>Среда за начално зареждане</strong> на тази система.<br><br>Старите x86 системи поддържат само <strong>BIOS</strong>.<br>Модерните системи обикновено използват <strong>EFI</strong>, но може също така да използват BIOS, ако са стартирани в режим на съвместимост. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Тази система беше стартирана с <strong>EFI</strong> среда за начално зареждане.<br><br>За да се настрои стартирането от EFI, инсталаторът трябва да разположи програма за начално зареждане като <strong>GRUB</strong> или <strong>systemd-boot</strong> на <strong>EFI Системен Дял</strong>. Това се прави автоматично, освен ако не се избере ръчно поделяне, в такъв случай вие трябва да свършите тази работа. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Тази система беше стартирана с <strong>BIOS</strong> среда за начално зареждане.<br><br>За да се настрои стартирането от BIOS, инсталаторът трябва да разположи програма за начално зареждане като <strong>GRUB</strong> в началото на дяла или на <strong>Сектора за Начално Зареждане</strong> близо до началото на таблицата на дяловете (предпочитано). Това се прави автоматично, освен ако не се избере ръчно поделяне, в такъв случай вие трябва да свършите тази работа. @@ -103,7 +70,7 @@ Type: - + Вид: @@ -114,7 +81,7 @@ Interface: - + Интерфейс: @@ -221,32 +188,32 @@ Output: Calamares::PythonJob - + Running %1 operation. Изпълнение на %1 операция. - + Bad working directory path Невалиден път на работната директория - + Working directory %1 for python job %2 is not readable. Работна директория %1 за python задача %2 не се чете. - + Bad main script file Невалиден файл на главен скрипт - + Main script file %1 for python job %2 is not readable. Файлът на главен скрипт %1 за python задача %2 не се чете. - + Boost.Python error in job "%1". Boost.Python грешка в задача "%1". @@ -254,65 +221,91 @@ Output: Calamares::ViewManager - + &Back &Назад - + &Next &Напред - - + + &Cancel &Отказ - + + + Cancel installation without changing the system. + + + + Cancel installation? Отмяна на инсталацията? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Наистина ли искате да отмените текущият процес на инсталиране? Инсталатора ще прекъсне и всичките промени ще бъдат загубени. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? Продължаване? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Инсталатора на %1 ще направи промени по вашия диск за да инсталира %2. <br><strong>Промените ще бъдат окончателни.</strong> - + &Install now &Инсталирай сега - + Go &back В&ръщане - - &Quit - &Изход + + &Done + - + + The installation is complete. Close the installer. + + + + Error Грешка - + Installation Failed Неуспешна инсталация @@ -343,12 +336,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer %1 Инсталатор - + Show debug information Покажи информация за отстраняване на грешки @@ -369,7 +362,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Този компютър не отговаря на минималните изисквания за инсталиране %1.<br/>Инсталацията не може да продължи. <a href="#details">Детайли...</a> @@ -380,17 +373,17 @@ The installer will quit and all changes will be lost. Този компютър не отговаря на някои от препоръчителните изисквания за инсталиране %1.<br/>Инсталацията може да продължи, но някои свойства могат да бъдат недостъпни. - + This program will ask you some questions and set up %2 on your computer. Тази програма ще ви зададе няколко въпроса и ще конфигурира %2 на вашия компютър. - + For best results, please ensure that this computer: За най-добри резултати, моля бъдете сигурни че този компютър: - + System requirements Системни изисквания @@ -403,35 +396,35 @@ The installer will quit and all changes will be lost. Форма - + After: След: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Самостоятелно поделяне</strong><br/>Можете да създадете или преоразмерите дяловете сами. - + Boot loader location: Локация на програмата за начално зареждане: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 ще се смали до %2МБ и нов %3МБ дял ще бъде създаден за %4. - + Select storage de&vice: Изберете ус&тройство за съхранение: - - - - + + + + Current: Сегашен: @@ -441,71 +434,71 @@ 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>Select a partition to install on</strong> <strong>Изберете дял за инсталацията</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. EFI системен дял не е намерен. Моля, опитайте пак като използвате ръчно поделяне за %1. - + The EFI system partition at %1 will be used for starting %2. EFI системен дял в %1 ще бъде използван за стартиране на %2. - + EFI system partition: EFI системен дял: - + 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/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Изтриване на диска</strong><br/>Това ще <font color="red">изтрие</font> всички данни върху устройството за съхранение. - + 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/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Инсталирайте покрай</strong><br/>Инсталатора ще раздроби дяла за да направи място за %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Замени дял</strong><br/>Заменя този дял с %1. - + This storage device already has 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/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение. - + This storage device has multiple operating systems 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/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение. @@ -531,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. Разчистени всички временни монтирания. @@ -558,6 +551,11 @@ The installer will quit and all changes will be lost. Create a Partition Създай дял + + + MiB + + Partition &Type: @@ -594,32 +592,27 @@ The installer will quit and all changes will be lost. Раз&мер: - - MB - МБ - - - + En&crypt - + Logical Логическа - + Primary Главна - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -832,7 +825,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -934,17 +927,22 @@ The installer will quit and all changes will be lost. Раз&мер: - + + MiB + + + + Fi&le System: Фа&йлова система: - + Flags: Флагове: - + Mountpoint already in use. Please select another one. @@ -972,7 +970,7 @@ The installer will quit and all changes will be lost. Потвърди паролата - + Please enter the same passphrase in both boxes. @@ -990,27 +988,27 @@ The installer will quit and all changes will be lost. Инсталирай %1 на <strong>нов</strong> %2 системен дял. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Създай <strong>нов</strong> %2 дял със точка на монтиране <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Инсталирай %2 на %3 системен дял <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Създай %3 дял <strong>%1</strong> с точка на монтиране <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Инсталиране на зареждач върху <strong>%1</strong>. - + Setting up mount points. Настройка на точките за монтиране. @@ -1028,18 +1026,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish Завърши + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1117,12 +1130,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> Постави модел на клавиатурата на %1.<br/> - + Set keyboard layout to %1/%2. Постави оформлението на клавиатурата на %1/%2. @@ -1138,15 +1151,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting Настройка на локацията на системата - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1229,12 +1252,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1255,12 +1278,12 @@ The installer will quit and all changes will be lost. &Промени... - + Set timezone to %1/%2.<br/> Постави часовата зона на %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1331,17 +1354,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1390,7 +1413,6 @@ The installer will quit and all changes will be lost. Какво име искате да използвате за влизане? - @@ -1564,7 +1586,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? @@ -1587,82 +1609,82 @@ The installer will quit and all changes will be lost. Инсталирай %1 <strong>заедно</strong> с друга операционна система. - + <strong>Erase</strong> disk and install %1. <strong>Изтрий</strong> диска и инсталирай %1. - + <strong>Replace</strong> a partition with %1. <strong>Замени</strong> дял с %1. - + <strong>Manual</strong> partitioning. <strong>Ръчно</strong> поделяне. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Инсталирай %1 <strong>заедно</strong> с друга операционна система на диск <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Изтрий</strong> диск <strong>%2</strong> (%3) и инсталирай %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Замени</strong> дял на диск <strong>%2</strong> (%3) с %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Ръчно</strong> поделяне на диск <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Диск <strong>%1</strong> (%2) - + Current: Сегашен: - + After: След: - + No EFI system partition configured Няма конфигуриран EFI системен дял - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. EFI системен дял е нужен за стартиране на %1.<br/><br/>За настройка на EFI системен дял се върнете назад и изберете или създайте FAT32 файлова система с включен <strong>esp</strong> флаг и точка на монтиране <strong>%2</strong>.<br/><br/>Може да продължите без EFI системен дял, но системата може да не успее да стартира. - + EFI system partition flag not set Не е зададен флаг на EFI системен дял - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. EFI системен дял е нужен за стартиране на %1.<br/><br/>Дялът беше конфигуриран с точка на монтиране <strong>%2</strong>, но неговия <strong>esp</strong> флаг не е включен.<br/>За да включите флага се върнете назад и редактирайте дяла.<br/><br/>Може да продължите без флага, но системата може да не успее да стартира. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1681,22 +1703,22 @@ The installer will quit and all changes will be lost. По подразбиране - + unknown неизвестна - + extended разширена - + unformatted неформатирана - + swap swap @@ -1719,64 +1741,64 @@ The installer will quit and all changes will be lost. Изберете къде да инсталирате %1.<br/><font color="red">Предупреждение: </font>това ще изтрие всички файлове върху избраният дял. - + The selected item does not appear to be a valid partition. Избраният предмет не изглежда да е валиден дял. - + %1 cannot be installed on empty space. Please select an existing partition. %1 не може да бъде инсталиран на празно пространство. Моля изберете съществуващ дял. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 не може да бъде инсталиран върху разширен дял. Моля изберете съществуващ основен или логически дял. - + %1 cannot be installed on this partition. %1 не може да бъде инсталиран върху този дял. - + Data partition (%1) Дял на данните (%1) - + Unknown system partition (%1) Непознат системен дял (%1) - + %1 system partition (%2) %1 системен дял (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>Дялът %1 е твърде малък за %2. Моля изберете дял с капацитет поне %3 ГБ. - + <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 системен дял не е намерен. Моля, опитайте пак като използвате ръчно поделяне за %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 ще бъде инсталиран върху %2.<br/><font color="red">Предупреждение: </font>всички данни на дял %2 ще бъдат изгубени. - + The EFI system partition at %1 will be used for starting %2. EFI системен дял в %1 ще бъде използван за стартиране на %2. - + EFI system partition: EFI системен дял: @@ -1784,55 +1806,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... Събиране на системна информация... - + has at least %1 GB available drive space има поне %1 ГБ свободено дисково пространство - + There is not enough drive space. At least %1 GB is required. Няма достатъчно дисково пространство. Необходимо е поне %1 ГБ. - + has at least %1 GB working memory има поне %1 ГБ работна памет - + The system does not have enough working memory. At least %1 GB is required. Системата не разполага с достатъчно работна памет. Необходима е поне %1 ГБ. - + is plugged in to a power source е включен към източник на захранване - + The system is not plugged in to a power source. Системата не е включена към източник на захранване. - + is connected to the Internet е свързан към интернет - + The system is not connected to the Internet. Системата не е свързана с интернет. - + The installer is not running with administrator rights. Инсталаторът не е стартиран с права на администратор. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2068,42 +2095,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 Задай парола за потребител %1 - + Setting password for user %1. Задаване на парола за потребител %1 - + Bad destination system path. Лоша дестинация за системен път. - + rootMountPoint is %1 root точка на монтиране е %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. Не може да се постави парола за потребител %1. - + usermod terminated with error code %1. usermod е прекратен с грешка %1. @@ -2237,22 +2264,27 @@ The installer will quit and all changes will be lost. &Относно - + <h1>Welcome to the %1 installer.</h1> <h1>Добре дошли при инсталатора на %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer Относно инсталатор %1 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support %1 поддръжка diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts index 79238b638..cae1c9e09 100644 --- a/lang/calamares_ca.ts +++ b/lang/calamares_ca.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Trieu la partició per reduir: - - - - Allocate drive space by dragging the divider below: - Assigneu l'espai del disc arrossegant el separador inferior: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Amb aquesta operació la partició <strong>%1</strong>, la qual conté %4, s'encongirà a %2MB i es crearà una nova partició de %3MB per a %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - No s'ha pogut trobar enlloc una partició EFI en aquest sistema. Si us plau torneu enrere i useu el particionament manual per a instal·lar %1. - - - - The EFI system partition at %1 will be used for starting %2. - S'utilitzarà la partició del sistema EFI a %1 per a iniciar %2. - - - - EFI system partition: - Partició EFI de sistema: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. L'<strong>entorn d'arrencada</strong> d'aquest sistema.<br><br>Els sistemes antics x86 només tenen suport per a <strong>BIOS</strong>.<br>Els moderns normalment usen <strong>EFI</strong>, però també poden mostrar-se com a BIOS si l'entorn d'arrencada s'executa en mode de compatibilitat. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Aquest sistema s'ha iniciat amb un entorn d'arrencada <strong>EFI</strong>. <br><br> Per configurar una arrencada des d'un entorn EFI, aquest instal·lador ha de desplegar una aplicació de càrrega d'arrencada, com ara el <strong>GRUB</strong> o el <strong>systemd-boot</strong> en una <strong>partició EFI del sistema</strong>. Això és automàtic, llevat que trieu un partiment manual, en què caldrà que ho configureu vosaltres mateixos. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Aquest sistema s'ha iniciat amb un entorn d'arrencada <strong>BIOS </strong>. Per configurar una arrencada des d'un entorn BIOS, aquest instal·lador ha d'instal·lar un carregador d'arrencada, com ara el <strong>GRUB</strong>, ja sigui al començament d'una partició o al <strong>Registre d'Arrencada Mestre</strong>, a prop del començament de la taula de particions (millor). Això és automàtic, llevat que trieu un partiment manual, en què caldrà que ho configureu pel vostre compte. @@ -221,32 +188,32 @@ Sortida: Calamares::PythonJob - + Running %1 operation. Executant l'operació %1. - + Bad working directory path Ruta errònia del directori de treball - + Working directory %1 for python job %2 is not readable. El directori de treball %1 per a la tasca python %2 no és llegible. - + Bad main script file Fitxer erroni d'script principal - + Main script file %1 for python job %2 is not readable. El fitxer de script principal %1 per a la tasca de python %2 no és llegible. - + Boost.Python error in job "%1". Error de Boost.Python a la tasca "%1". @@ -254,65 +221,91 @@ Sortida: Calamares::ViewManager - + &Back &Enrere - + &Next &Següent - - + + &Cancel &Cancel·la - + + + Cancel installation without changing the system. + Cancel·leu la instal·lació sense canviar el sistema. + + + Cancel installation? Cancel·lar la instal·lació? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Voleu cancel·lar el procés d'instal·lació actual? L'instal·lador es tancarà i tots els canvis es perdran. - + + &Yes + &Sí + + + + &No + &No + + + + &Close + Tan&ca + + + Continue with setup? Voleu continuar la configuració? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> L'instal·lador de %1 està a punt de fer canvis al disc per tal d'instal·lar-hi %2.<br/><strong>No podreu desfer aquests canvis.</strong> - + &Install now &Instal·la ara - + Go &back Vés &enrere - - &Quit - &Tanca + + &Done + &Fet - + + The installation is complete. Close the installer. + La instal·lació s'ha acabat. Tanqueu l'instal·lador. + + + Error Error - + Installation Failed La instal·lació ha fallat @@ -343,12 +336,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. CalamaresWindow - + %1 Installer Instal·lador de %1 - + Show debug information Mostra la informació de depuració @@ -369,7 +362,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Aquest ordinador no satisfà els requisits mínims per instal·lar-hi %1.<br/> La instal·lació no pot continuar. <a href="#details">Detalls...</a> @@ -379,17 +372,17 @@ L'instal·lador es tancarà i tots els canvis es perdran. Aquest ordinador no satisfà alguns dels requisits recomanats per instal·lar-hi %1.<br/>La instal·lació pot continuar, però algunes característiques podrien estar desactivades. - + This program will ask you some questions and set up %2 on your computer. Aquest programa us farà unes quantes preguntes i instal·larà %2 al vostre ordinador. - + For best results, please ensure that this computer: Per obtenir els millors resultats, assegureu-vos, si us plau, que aquest ordinador: - + System requirements Requisits del sistema @@ -402,35 +395,35 @@ L'instal·lador es tancarà i tots els canvis es perdran. Formulari - + After: Després: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Partiment manual</strong><br/>Podeu crear o redimensionar les particions vosaltres mateixos. - + Boot loader location: Ubicació del carregador d'arrencada: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 s'encongirà a %2MB i es crearà una partició nova de %3MB per a %4. - + Select storage de&vice: Seleccioneu un dispositiu d'e&mmagatzematge: - - - - + + + + Current: Actual: @@ -440,71 +433,71 @@ L'instal·lador es tancarà i tots els canvis es perdran. Reutilitza %1 com a partició de l'usuari per a %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Seleccioneu una partició per encongir i arrossegueu-la per redimensinar-la</strong> - + <strong>Select a partition to install on</strong> <strong>Seleccioneu una partició per fer-hi la instal·lació</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. No s'ha pogut trobar enlloc una partició EFI en aquest sistema. Si us plau, torneu enrere i useu el partiment manual per configurar %1. - + The EFI system partition at %1 will be used for starting %2. La partició EFI de sistema a %1 s'usarà per iniciar %2. - + EFI system partition: Partició EFI del sistema: - + 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. Aquest dispositiu d'emmagatzematge no sembla que tingui un sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Esborra el disc</strong><br/>Això <font color="red">esborrarà</font> totes les dades del dispositiu seleccionat. - + 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. Aquest dispositiu d'emmagatzematge té %1. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instal·la al costat</strong><br/>L'instal·lador reduirà una partició per fer espai per a %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Reemplaça una partició</strong><br/>Reemplaça una partició per %1. - + This storage device already has 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. Aquest dispositiu d'emmagatzematge ja té un sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. - + This storage device has multiple operating systems 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. Aquest dispositiu d'emmagatzematge ja múltiples sistemes operatius. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. @@ -530,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. @@ -557,6 +550,11 @@ L'instal·lador es tancarà i tots els canvis es perdran. Create a Partition Crea una partició + + + MiB + MB + Partition &Type: @@ -593,32 +591,27 @@ L'instal·lador es tancarà i tots els canvis es perdran. Mi&da: - - MB - MB - - - + En&crypt En&cripta - + Logical Lògica - + Primary Primària - + GPT GPT - + Mountpoint already in use. Please select another one. El punt de muntatge ja s'usa. Si us plau, seleccioneu-ne un altre. @@ -831,7 +824,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. DeviceInfoWidget - + 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. El tipus de <strong>taula de particions</strong> actualment present al dispositiu d'emmagatzematge seleccionat. L'única manera de canviar el tipus de taula de particions és esborrar i tornar a crear la taula de particions des de zero, fet que destrueix totes les dades del dispositiu d'emmagatzematge. <br> Aquest instal·lador mantindrà la taula de particions actual llevat que decidiu expressament el contrari. <br>Si no n'esteu segur, als sistemes moderns es prefereix GPT. @@ -933,17 +926,22 @@ L'instal·lador es tancarà i tots els canvis es perdran. Mi&da: - + + MiB + MB + + + Fi&le System: S&istema de fitxers: - + Flags: Banderes: - + Mountpoint already in use. Please select another one. El punt de muntatge ja s'usa. Si us plau, seleccioneu-ne un altre. @@ -971,7 +969,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. Confirmeu la contrasenya - + Please enter the same passphrase in both boxes. Si us plau, escriviu la mateixa constrasenya a les dues caselles. @@ -989,27 +987,27 @@ L'instal·lador es tancarà i tots els canvis es perdran. Instal·la %1 a la partició de sistema <strong>nova</strong> %2. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Estableix la partició <strong>nova</strong> %2 amb el punt de muntatge <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Instal·la %2 a la partició de sistema %3 <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Estableix la partició %3 <strong>%1</strong> amb el punt de muntatge <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Instal·la el carregador d'arrencada a <strong>%1</strong>. - + Setting up mount points. Establint els punts de muntatge. @@ -1027,18 +1025,33 @@ L'instal·lador es tancarà i tots els canvis es perdran. &Reinicia ara - + <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>Tot fet.</h1><br/>%1 s'ha instal·lat al vostre ordinador.<br/>Ara podeu reiniciar-lo per tal d'accedir al sistema operatiu nou o bé continuar utilitzant l'entorn Live de %2. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>La instal·lació ha fallat</h1><br/>No s'ha instal·lat %1 a l'ordinador.<br/>El missatge d'error ha estat el següent: %2. + FinishedViewStep - + Finish Acaba + + + Installation Complete + Instal·lació acabada + + + + The installation of %1 is complete. + La instal·lació de %1 ha acabat. + FormatPartitionJob @@ -1116,12 +1129,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. KeyboardPage - + Set keyboard model to %1.<br/> Assigna el model del teclat a %1.<br/> - + Set keyboard layout to %1/%2. Assigna la distribució del teclat a %1/%2. @@ -1137,15 +1150,25 @@ L'instal·lador es tancarà i tots els canvis es perdran. LCLocaleDialog - + System locale setting Configuració de la llengua del sistema - + 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>. La configuració local del sistema afecta la llengua i el joc de caràcters d'alguns elements de la interície de línia d'ordres. <br/>La configuració actual és <strong>%1</strong>. + + + &Cancel + &Cancel·la + + + + &OK + D'ac&ord + LicensePage @@ -1228,12 +1251,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. LocalePage - + The system language will be set to %1. La llengua del sistema s'establirà a %1. - + The numbers and dates locale will be set to %1. Els números i les dates de la configuració local s'establiran a %1. @@ -1254,12 +1277,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. &Canvi... - + Set timezone to %1/%2.<br/> Estableix la zona horària a %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ L'instal·lador es tancarà i tots els canvis es perdran. NetInstallPage - + Name Nom - + Description Descripció - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instal·lació per xarxa. (Inhabilitada: no es poden obtenir les llistes de paquets, comproveu la connexió.) @@ -1389,7 +1412,6 @@ L'instal·lador es tancarà i tots els canvis es perdran. Quin nom voleu utilitzar per iniciar la sessió d'usuari? - @@ -1563,7 +1585,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. &Instal·la el carregador d'arrencada a: - + Are you sure you want to create a new partition table on %1? Esteu segurs que voleu crear una nova taula de particions a %1? @@ -1586,82 +1608,82 @@ L'instal·lador es tancarà i tots els canvis es perdran. Instal·la %1 <strong>al costat</strong> d'un altre sistema operatiu. - + <strong>Erase</strong> disk and install %1. <strong>Esborra</strong> el disc i instal·la-hi %1. - + <strong>Replace</strong> a partition with %1. <strong>Reemplaça</strong> una partició amb %1. - + <strong>Manual</strong> partitioning. Partiment <strong>manual</strong>. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Instal·la %1 <strong>al costat</strong> d'un altre sistema operatiu al disc <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Esborra</strong> el disc <strong>%2</strong> (%3) i instal·la-hi %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Reemplaça</strong> una partició del disc <strong>%2</strong> (%3) amb %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). Partiment <strong>manual</strong> del disc <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disc <strong>%1</strong> (%2) - + Current: Actual: - + After: Després: - + No EFI system partition configured No hi ha cap partició EFI de sistema configurada - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. Cal una partició EFI de sistema per iniciar %1. <br/><br/>Per configurar una partició EFI de sistema, torneu enrere i seleccioneu o creeu un sistema de fitxers FAT32 amb la bandera <strong>esp</strong> habilitada i el punt de muntatge <strong>%2</strong>. <br/><br/>Podeu continuar sense la creació d'una partició EFI de sistema, però el sistema podria no iniciar-se. - + EFI system partition flag not set No s'ha establert la bandera de la partició EFI del sistema - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. Cal una partició EFI de sistema per iniciar %1. <br/><br/> Ja s'ha configurat una partició amb el punt de muntatge <strong>%2</strong> però no se n'ha establert la bandera <strong>esp</strong>. Per establir-la-hi, torneu enrere i editeu la partició. <br/><br/>Podeu continuar sense establir la bandera, però el sistema podria no iniciar-se. - + Boot partition not encrypted Partició d'arrel no encriptada - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. S'ha establert una partició d'arrencada separada conjuntament amb una partició d'arrel encriptada, però la partició d'arrencada no està encriptada.<br/><br/>Hi ha aspectes de seguretat amb aquest tipus de configuració, perquè hi ha fitxers del sistema importants en una partició no encriptada.<br/>Podeu continuar, si així ho desitgeu, però el desbloqueig del sistema de fitxers succeirà després, durant l'inici del sistema.<br/>Per encriptar la partició d'arrencada, torneu enrere i torneu-la a crear seleccionant <strong>Encripta</strong> a la finestra de creació de la partició. @@ -1680,22 +1702,22 @@ L'instal·lador es tancarà i tots els canvis es perdran. Per defecte - + unknown desconeguda - + extended ampliada - + unformatted sense format - + swap Intercanvi @@ -1718,64 +1740,64 @@ L'instal·lador es tancarà i tots els canvis es perdran. Seleccioneu on instal·lar %1.<br/><font color="red">Atenció: </font>això esborrarà tots els fitxers de la partició seleccionada. - + The selected item does not appear to be a valid partition. L'element seleccionat no sembla que sigui una partició vàlida. - + %1 cannot be installed on empty space. Please select an existing partition. %1 no es pot instal·lar en un espai buit. Si us plau, seleccioneu una partició existent. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 no es pot instal·lar en un partició ampliada. Si us plau, seleccioneu una partició existent primària o lògica. - + %1 cannot be installed on this partition. %1 no es pot instal·lar en aquesta partició. - + Data partition (%1) Partició de dades (%1) - + Unknown system partition (%1) Partició de sistema desconeguda (%1) - + %1 system partition (%2) %1 partició de sistema (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>La partició %1 és massa petita per a %2. Si us plau, seleccioneu una partició amb capacitat d'almenys %3 GB. - + <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/>No es pot trobar cap partició EFI enlloc del sistema. Si us plau, torneu enrere i useu el partiment manual per establir %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 s'instal·larà a %2.<br/><font color="red">Atenció: </font>totes les dades de la partició %2 es perdran. - + The EFI system partition at %1 will be used for starting %2. La partició EFI de sistema a %1 s'usarà per iniciar %2. - + EFI system partition: Partició EFI del sistema: @@ -1783,55 +1805,60 @@ L'instal·lador es tancarà i tots els canvis es perdran. RequirementsChecker - + Gathering system information... Recopilant informació del sistema... - + has at least %1 GB available drive space té com a mínim %1 GB d'espai de disc disponible. - + There is not enough drive space. At least %1 GB is required. No hi ha prou espai de disc disponible. Com a mínim hi ha d'haver %1 GB. - + has at least %1 GB working memory té com a mínim %1 GB de memòria de treball - + The system does not have enough working memory. At least %1 GB is required. El sistema no té prou memòria de treball. Com a mínim es necessita %1 GB. - + is plugged in to a power source està connectat a una font de corrent - + The system is not plugged in to a power source. El sistema no està connectat a una font de corrent. - + is connected to the Internet està connectat a Internet - + The system is not connected to the Internet. El sistema no està connectat a Internet. - + The installer is not running with administrator rights. L'instal·lador no s'ha executat amb privilegis d'administrador. + + + The screen is too small to display the installer. + La pantalla és massa petita per mostrar l'instal·lador. + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ L'instal·lador es tancarà i tots els canvis es perdran. SetPasswordJob - + Set password for user %1 Assigneu una contrasenya per a l'usuari %1 - + Setting password for user %1. Establint la contrasenya de l'usuari %1. - + Bad destination system path. Destinació errònia de la ruta del sistema. - + rootMountPoint is %1 El punt de muntatge rootMountPoint és %1 - + Cannot disable root account. No es pot inhabilitar el compte d'arrel. - + passwd terminated with error code %1. El procés passwd ha acabat amb el codi d'error %1. - + Cannot set password for user %1. No s'ha pogut assignar la contrasenya de l'usuari %1. - + usermod terminated with error code %1. usermod ha terminat amb el codi d'error %1. @@ -2236,22 +2263,27 @@ L'instal·lador es tancarà i tots els canvis es perdran. &Quant a - + <h1>Welcome to the %1 installer.</h1> <h1>Benvinguts a l'instal·lador %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Us donem la benvinguda a l'instal·lador Calamares per a %1.</h1> + + + About %1 installer Quant a l'instal·lador %1 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Agraïments a Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg i a <a href="https://www.transifex.com/calamares/calamares/">l'equip de traducció del Calamares</a>.<br/><br/><a href="http://calamares.io/">El desenvolupament del Calamares</a> està patrocinat per <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + <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/>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/>Agraïments: 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/">Equip de traducció del Calamares</a>.<br/><br/><a href="http://calamares.io/">El desenvolupament </a> del Calamares està patrocinat per <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + %1 support %1 suport diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts index 4111ed3d3..1bf3c9ae0 100644 --- a/lang/calamares_cs_CZ.ts +++ b/lang/calamares_cs_CZ.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Zvolte oddíl, který si přejete zmenšit: - - - - Allocate drive space by dragging the divider below: - Přidělte místo na disku pomocí rozdělovače níže: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Oddíl <strong>%1</strong> obsahující %4 bude zmenšen na %2MB a nový oddíl o velikosti %3MB bude vytvořen pro %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Nebyl nalezen žádný systémový EFI oddíl. Prosím, vraťte se zpět a zkuste pro nastavení %1 použít ruční rozdělení disku. - - - - The EFI system partition at %1 will be used for starting %2. - Pro zavedení %2 se využije systémový oddíl EFI %1. - - - - EFI system partition: - Systémový oddíl EFI: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. <strong>Zaváděcí prostředí</strong> tohoto systému.<br><br>Starší x86 systémy podporují pouze <strong>BIOS</strong>.<br>Moderní systémy většinou využívají <strong>EFI</strong>, někdy lze toto prostředí přepnout do módu kompatibility a může se jevit jako BIOS. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Systém byl spuštěn se zaváděcím prostředím <strong>EFI</strong>.<br><br>Abyste zaváděli systém prostředím EFI, instalátor musí zavést aplikaci pro zavádění systému, jako <strong>GRUB</strong> nebo <strong>systemd-boot</strong> na <strong>systémovém oddílu EFI</strong>. Proběhne to automaticky, pokud si nezvolíte ruční dělení disku, v tom případě si aplikaci pro zavádění musíte sami zvolit. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Systém byl spuštěn se zaváděcím prostředím <strong>BIOS</strong>.<br><br>Abyste zaváděli systém prostředím BIOS, instalátor musí umístit zavaděč systému, jako <strong>GRUB</strong>, buď na začátek oddílu nebo (lépe) do <strong>Master Boot Record</strong> na začátku tabulky oddílů. Proběhne to automaticky, pokud si nezvolíte ruční dělení disku, v tom případě si zavádění musíte nastavit sami. @@ -221,32 +188,32 @@ Výstup: Calamares::PythonJob - + Running %1 operation. Spouštím %1 operaci. - + Bad working directory path Špatná cesta k pracovnímu adresáři. - + Working directory %1 for python job %2 is not readable. Pracovní adresář %1 pro Python skript %2 není čitelný. - + Bad main script file Špatný hlavní soubor skriptu. - + Main script file %1 for python job %2 is not readable. Hlavní soubor %1 pro Python skript %2 není čitelný. - + Boost.Python error in job "%1". Boost.Python chyba ve skriptu "%1". @@ -254,65 +221,91 @@ Výstup: Calamares::ViewManager - + &Back &Zpět - + &Next &Další - - + + &Cancel &Zrušit - + + + Cancel installation without changing the system. + Zrušení instalace bez změny systému. + + + Cancel installation? Přerušit instalaci? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Opravdu chcete přerušit instalaci? Instalační program bude ukončen a všechny změny ztraceny. - + + &Yes + &Ano + + + + &No + &Ne + + + + &Close + &Zavřít + + + Continue with setup? Pokračovat s instalací? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Instalační program %1 provede změny na disku, aby se nainstaloval %2.<br/><strong>Změny nebude možné vrátit zpět.</strong> - + &Install now &Spustit instalaci - + Go &back Jít &zpět - - &Quit - &Ukončit + + &Done + &Hotovo - + + The installation is complete. Close the installer. + Instalace dokončena. Zavřete instalátor. + + + Error Chyba - + Installation Failed Instalace selhala @@ -343,12 +336,12 @@ Instalační program bude ukončen a všechny změny ztraceny. CalamaresWindow - + %1 Installer %1 Instalátor - + Show debug information Ukázat ladící informace @@ -369,7 +362,7 @@ Instalační program bude ukončen a všechny změny ztraceny. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Počítač nesplňuje minimální požadavky pro instalaci %1.<br/>Instalace nemůže pokračovat <a href="#details">Detaily...</a> @@ -379,17 +372,17 @@ Instalační program bude ukončen a všechny změny ztraceny. Počítač nesplňuje některé doporučené požadavky pro instalaci %1.<br/>Instalace může pokračovat, ale některé funkce mohou být vypnuty. - + This program will ask you some questions and set up %2 on your computer. Tento program Vám bude pokládat otázky a pomůže nainstalovat %2 na Váš počítač. - + For best results, please ensure that this computer: Proces proběhne nejlépe, když tento počítač: - + System requirements Požadavky na systém @@ -402,35 +395,35 @@ Instalační program bude ukončen a všechny změny ztraceny. Formulář - + After: Po: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Ruční rozdělení disku</strong><br/>Můžete si vytvořit a upravit oddíly sami. - + Boot loader location: Umístění zaváděcího oddílu: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 bude zmenšen na %2MB a nový %3MB oddíl pro %4 bude vytvořen. - + Select storage de&vice: Zvolte paměťové zařízení: - - - - + + + + Current: Aktuální: @@ -440,71 +433,71 @@ Instalační program bude ukončen a všechny změny ztraceny. Opakované použití %1 jako domovský oddíl pro %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Vyberte, který oddíl chcete zmenšit, poté tažením spodní lišty můžete změnit jeho velikost.</strong> - + <strong>Select a partition to install on</strong> <strong>Vyberte oddíl pro provedení instalace</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Nebyl nalezen žádný systémový EFI oddíl. Prosím, vraťte se zpět a zkuste pro nastavení %1 použít ruční rozdělení disku. - + The EFI system partition at %1 will be used for starting %2. Pro zavedení %2 se využije systémový oddíl EFI %1. - + EFI system partition: Systémový oddíl EFI: - + 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. Zdá se, že na tomto úložném zařízení není žádný operační systém. Jak chcete postupovat?<br/>Než se provedou jakékoliv změny nastavení Vašich úložných zařízení, ukáže se Vám přehled změn a budete požádáni o jejich potvrzení. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Vymazat disk</strong><br/>Touto volbou <font color="red">smažete</font> všechna data, která se nyní nachází na vybraném úložišti. - + 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. Na tomto úložném zařízení jsem našel %1. Jak chcete postupovat?<br/>Než se provedou jakékoliv změny nastavení Vašich úložných zařízení, ukáže se Vám přehled změn a budete požádáni o jejich potvrzení. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instalovat vedle</strong><br/>Instalační program zmenší oddíl a vytvoří místo pro %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Nahradit oddíl</strong><br/>Původní oddíl nahradí %1. - + This storage device already has 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. Na tomto úložném zařízení již je operační systém. Jak chcete postupovat?<br/>Než se provedou jakékoliv změny nastavení Vašich úložných zařízení, ukáže se Vám přehled změn a budete požádáni o jejich potvrzení. - + This storage device has multiple operating systems 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. Na tomto úložném zařízení již je několik operačních systémů. Jak chcete postupovat?<br/>Než se provedou jakékoliv změny nastavení Vašich úložných zařízení, ukáže se Vám přehled změn a budete požádáni o jejich potvrzení. @@ -530,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ů. @@ -557,6 +550,11 @@ Instalační program bude ukončen a všechny změny ztraceny. Create a Partition Vytvořit oddíl + + + MiB + MiB + Partition &Type: @@ -593,34 +591,29 @@ Instalační program bude ukončen a všechny změny ztraceny. &Velikost: - - MB - MB - - - + En&crypt Š&ifrovat - + Logical Logický - + Primary Primární - + GPT GPT - + Mountpoint already in use. Please select another one. - + Bod připojení je už používán. Prosím vyberte jiný. @@ -831,7 +824,7 @@ Instalační program bude ukončen a všechny změny ztraceny. DeviceInfoWidget - + 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. Typ <strong>tabulky oddílů</strong>, který je na vybraném úložném zařízení.<br><br>Jedinou možností změnit typ tabulky oddílů je smazání a znovu vytvoření nové tabulky oddílů, tím se smažou všechna data na daném úložném zařízení.<br>Instalační program zanechá stávající typ tabulky oddílů, pokud si sami nenavolíte jeho změnu.<br>Pokud si nejste jisti, na moderních systémech se upřednostňuje GPT. @@ -933,19 +926,24 @@ Instalační program bude ukončen a všechny změny ztraceny. &Velikost: - + + MiB + MiB + + + Fi&le System: &Souborový systém: - + Flags: Příznaky: - + Mountpoint already in use. Please select another one. - + Bod připojení je už používán. Prosím vyberte jiný. @@ -971,7 +969,7 @@ Instalační program bude ukončen a všechny změny ztraceny. Potvrď heslo - + Please enter the same passphrase in both boxes. Zadejte prosím stejné heslo do obou polí. @@ -989,27 +987,27 @@ Instalační program bude ukončen a všechny změny ztraceny. Instalovat %1 na <strong>nový</strong> %2 systémový oddíl. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Nastavit <strong>nový</strong> %2 oddíl s přípojným bodem <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Instalovat %2 na %3 systémový oddíl <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Nastavit %3 oddíl <strong>%1</strong> s přípojným bodem <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Instalovat zavaděč na <strong>%1</strong>. - + Setting up mount points. Nastavuji přípojné body. @@ -1027,18 +1025,33 @@ Instalační program bude ukončen a všechny změny ztraceny. &Restartovat nyní - + <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>Instalace je u konce.</h1><br/>%1 byl nainstalován na Váš počítač.<br/>Teď můžete počítač restartovat a přejít do čerstvě naistalovaného systému, nebo můžete pokračovat v práci s živým prostředím %2. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>Instalace selhala</h1><br/>%1 nebyl instalován na váš počítač.<br/>Hlášení o chybě: %2. + FinishedViewStep - + Finish Dokončit + + + Installation Complete + Instalace dokončena + + + + The installation of %1 is complete. + Instalace %1 je dokončena. + FormatPartitionJob @@ -1116,12 +1129,12 @@ Instalační program bude ukončen a všechny změny ztraceny. KeyboardPage - + Set keyboard model to %1.<br/> Nastavit model klávesnice na %1.<br/> - + Set keyboard layout to %1/%2. Nastavit rozložení klávesnice na %1/%2. @@ -1137,15 +1150,25 @@ Instalační program bude ukončen a všechny změny ztraceny. LCLocaleDialog - + System locale setting Nastavení locale systému - + 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>. Nastavené locale systému ovlivňuje jazyk a znakovou sadu pro UI příkazové řádky.<br/>Současné nastavení je <strong>%1</strong>. + + + &Cancel + &Zrušit + + + + &OK + &OK + LicensePage @@ -1228,12 +1251,12 @@ Instalační program bude ukončen a všechny změny ztraceny. LocalePage - + The system language will be set to %1. Jazyk systému bude nastaven na 1%. - + The numbers and dates locale will be set to %1. Čísla a data národního prostředí budou nastavena na %1. @@ -1254,12 +1277,12 @@ Instalační program bude ukončen a všechny změny ztraceny. &Změnit... - + Set timezone to %1/%2.<br/> Nastavit časové pásmo na %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ Instalační program bude ukončen a všechny změny ztraceny. NetInstallPage - + Name Jméno - + Description Popis - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Síťová instalace. (Zakázáno: Nelze načíst seznamy balíků, zkontrolujte připojení k síti) @@ -1389,7 +1412,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? - @@ -1563,7 +1585,7 @@ Instalační program bude ukončen a všechny změny ztraceny. Nainstalovat &zavaděč na: - + Are you sure you want to create a new partition table on %1? Opravdu si přejete vytvořit novou tabulku oddílů na %1? @@ -1586,84 +1608,84 @@ Instalační program bude ukončen a všechny změny ztraceny. Instalovat %1 <strong>vedle</strong> dalšího operačního systému. - + <strong>Erase</strong> disk and install %1. <strong>Smazat</strong> disk a nainstalovat %1. - + <strong>Replace</strong> a partition with %1. <strong>Nahradit</strong> oddíl %1. - + <strong>Manual</strong> partitioning. <strong>Ruční</strong> dělení disku. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Instalovat %1 <strong>vedle</strong> dalšího operačního systému na disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Smazat</strong> disk <strong>%2</strong> (%3) a instalovat %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Nahradit</strong> oddíl na disku <strong>%2</strong> (%3) %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Ruční</strong> dělení disku <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disk <strong>%1</strong> (%2) - + Current: Současný: - + After: Potom: - + No EFI system partition configured Není nakonfigurován žádný EFI systémový oddíl - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. Pro spuštění %1 je potřeba systémový oddíl.<br/><br/>Pro nastavení EFI systémového oddílu se vraťte zpět a vyberte nebo vytvořte oddíl typu FAT32 s příznakem <strong>esp</strong> a přípojným bodem <strong>%2</strong>.<br/><br/>Je možné pokračovat bez nastavení systémového oddílu EFI, ale váš systém nemusí jít spustit. - + EFI system partition flag not set Příznak EFI systémového oddílu není nastaven - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. Pro spuštění %1 je potřeba systémový oddíl.<br/><br/>Byl nakonfigurován oddíl s přípojným bodem <strong>%2</strong> ale nemá nastaven příznak <strong>esp</strong>.<br/>Pro nastavení příznaku se vraťte zpět a upravte oddíl.<br/><br/>Je možné pokračovat bez nastavení příznaku, ale váš systém nemusí jít spustit. - + Boot partition not encrypted Zaváděcí oddíl není šifrován - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + Kromě šifrovaného kořenového oddílu byl vytvořen i nešifrovaný oddíl zavaděče.<br/><br/>To by mohl být bezpečnostní problém, protože na nešifrovaném oddílu jsou důležité soubory systému.<br/>Pokud chcete, můžete pokračovat, ale odemykání souborového systému bude probíhat později při startu systému.<br/>Pro zašifrování oddílu zavaděče se vraťte a vytvořte ho vybráním možnosti <strong>Šifrovat</strong> v okně při vytváření oddílu. @@ -1680,22 +1702,22 @@ Instalační program bude ukončen a všechny změny ztraceny. Výchozí - + unknown neznámý - + extended rozšířený - + unformatted nenaformátovaný - + swap odkládací oddíl @@ -1718,64 +1740,64 @@ Instalační program bude ukončen a všechny změny ztraceny. Vyberte, kam nainstalovat %1.<br/><font color="red">Upozornění: </font>tímto smažete všechny soubory ve vybraném oddílu. - + The selected item does not appear to be a valid partition. Vybraná položka není platným oddílem. - + %1 cannot be installed on empty space. Please select an existing partition. %1 nemůže být instalován na místo bez oddílu. Prosím vyberte existující oddíl. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 nemůže být instalován na rozšířený oddíl. Prosím vyberte existující primární nebo logický oddíl. - + %1 cannot be installed on this partition. %1 nemůže být instalován na tento oddíl. - + Data partition (%1) Datový oddíl (%1) - + Unknown system partition (%1) Neznámý systémový oddíl (%1) - + %1 system partition (%2) %1 systémový oddíl (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>Oddíl %1 je příliš malý pro %2. Prosím vyberte oddíl s kapacitou alespoň %3 GiB. - + <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/>Systémový oddíl EFI nenalezen. Prosím vraťte se a zvolte ruční rozdělení disku pro nastavení %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 bude instalován na %2.<br/><font color="red">Upozornění: </font>všechna data v oddílu %2 budou ztracena. - + The EFI system partition at %1 will be used for starting %2. Pro zavedení %2 se využije systémový oddíl EFI %1. - + EFI system partition: Systémový oddíl EFI: @@ -1783,55 +1805,60 @@ Instalační program bude ukončen a všechny změny ztraceny. RequirementsChecker - + Gathering system information... Shromažďuji informace o systému... - + has at least %1 GB available drive space má minimálně %1 GB dostupného místa na disku. - + There is not enough drive space. At least %1 GB is required. Nedostatek místa na disku. Je potřeba nejméně %1 GB. - + has at least %1 GB working memory má alespoň %1 GB operační paměti - + The system does not have enough working memory. At least %1 GB is required. Systém nemá dostatek paměti. Je potřeba nejméně %1 GB. - + is plugged in to a power source je připojený ke zdroji napájení - + The system is not plugged in to a power source. Systém není připojen ke zdroji napájení. - + is connected to the Internet je připojený k Internetu - + The system is not connected to the Internet. Systém není připojený k Internetu. - + The installer is not running with administrator rights. Instalační program není spuštěn s právy administrátora. + + + The screen is too small to display the installer. + Obrazovka je příliš malá pro zobrazení instalátoru. + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ Instalační program bude ukončen a všechny změny ztraceny. SetPasswordJob - + Set password for user %1 Nastavit heslo pro uživatele %1 - + Setting password for user %1. Nastavuji heslo pro uživatele %1. - + Bad destination system path. Špatná cílová systémová cesta. - + rootMountPoint is %1 rootMountPoint je %1 - + Cannot disable root account. - + Nelze zakázat účet root. - + passwd terminated with error code %1. - + Příkaz passwd ukončen s chybovým kódem %1. - + Cannot set password for user %1. Nelze nastavit heslo uživatele %1. - + usermod terminated with error code %1. usermod ukončen s chybovým kódem %1. @@ -2236,22 +2263,27 @@ Instalační program bude ukončen a všechny změny ztraceny. &O nás - + <h1>Welcome to the %1 installer.</h1> <h1>Vítejte v instalačním programu %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Vítá vás instalační program Calamares pro %1.</h1> + + + About %1 installer O instalačním programu %1. - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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/>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/">Překladatelský tým Calamares</a>.<br/><br/>Vývoj <a href="http://calamares.io/">Calamares</a> je podporován <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + %1 support %1 podpora diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index 7ee9aef3a..5ce8ee77e 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Vælg partitionen der skal mindskes: - - - - Allocate drive space by dragging the divider below: - Tildel diskplads ved at trække fordeleren nedenunder: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Med denne handling vil partitionen <strong>%1</strong>, som indeholder %4, blive skrumpet til %2 MB og en ny %3 MB partition vil blive oprettet for %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - En EFI-partition blev ikke fundet på systemet. Gå venligst tilbage og brug manuel partitionering til at opsætte %1. - - - - The EFI system partition at %1 will be used for starting %2. - EFI-systempartitionen ved %1 vil blive brugt til at starte %2. - - - - EFI system partition: - EFI-systempartition: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. <strong>Bootmiljøet</strong> for dette system.<br><br>Ældre x86-systemer understøtter kun <strong>BIOS</strong>.<br>Moderne systemer bruger normalt <strong>EFI</strong>, men kan også vises som BIOS hvis det startes i kompatibilitetstilstand. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Dette system blev startet med et <strong>EFI</strong>-bootmiljø.<br><br>For at konfigurere opstart fra et EFI-miljø, bliver installationsprogrammet nødt til at installere et bootloaderprogram, såsom <strong>GRUB</strong> eller <strong>systemd-boot</strong> på en <strong>EFI-systempartition</strong>. Dette vil ske automatisk, med mindre du vælger manuel partitionering, hvor du i så fald skal vælge eller oprette den selv. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Dette system blev startet med et <strong>BIOS</strong>-bootmiljø.<br><br>For at konfigurere opstart fra et BIOS-miljø, bliver installationsprogrammet nødt til at installere en bootloader, såsom <strong>GRUB</strong>, enten i begyndelsen af en partition eller på <strong>Master Boot Record</strong> nær begyndelsen af partitionstabellen (foretrukket). Dette sker automatisk, med mindre du vælger manuel partitionering, hvor du i så fald skal opsætte den selv. @@ -206,7 +173,7 @@ Output: External command finished with errors - Ekstern kommando blev færdiggjort uden fejl + Ekstern kommando blev færdiggjort med fejl @@ -221,32 +188,32 @@ Output: Calamares::PythonJob - + Running %1 operation. Kører %1-handling. - + Bad working directory path Ugyldig arbejdsmappesti - + Working directory %1 for python job %2 is not readable. Arbejdsmappe %1 for python-job %2 er ikke læsbar. - + Bad main script file Ugyldig primær skriptfil - + Main script file %1 for python job %2 is not readable. Primær skriptfil %1 for python-job %2 er ikke læsbar. - + Boost.Python error in job "%1". Boost.Python-fejl i job "%1". @@ -254,65 +221,91 @@ Output: Calamares::ViewManager - + &Back &Tilbage - + &Next &Næste - - + + &Cancel &Annullér - + + + Cancel installation without changing the system. + Annullér installation uden at ændre systemet. + + + Cancel installation? Annullér installationen? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Vil du virkelig annullere den igangværende installationsproces? Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. - + + &Yes + &Ja + + + + &No + &Nej + + + + &Close + &Luk + + + Continue with setup? Fortsæt med installation? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1-installationsprogrammet er ved at lave ændringer til din disk for at installere %2. <br/><strong>Det vil ikke være muligt at fortryde disse ændringer.</strong> - + &Install now &Installér nu - + Go &back Gå &tilbage - - &Quit - &Afslut + + &Done + &Færdig - + + The installation is complete. Close the installer. + Installationen er fuldført. Luk installationsprogrammet. + + + Error Fejl - + Installation Failed Installation mislykkedes @@ -343,12 +336,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. CalamaresWindow - + %1 Installer %1-installationsprogram - + Show debug information Vis fejlretningsinformation @@ -369,7 +362,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Denne computer møder ikke minimumsystemkravene for at installere %1.<br/>Installationen kan ikke fortsætte. <a href="#details">Detaljer...</a> @@ -379,17 +372,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Denne computer møder ikke nogle af de anbefalede systemkrav for at installere %1.<br/>Installationen kan fortsætte, men nogle funktionaliteter kan være deaktiveret. - + This program will ask you some questions and set up %2 on your computer. Dette program vil stille dig nogle spørgsmål og opsætte %2 på din computer. - + For best results, please ensure that this computer: For det bedste resultat sørg venligst for at denne computer: - + System requirements Systemkrav @@ -402,35 +395,35 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Formular - + After: Efter: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Manuel partitionering</strong><br/>Du kan selv oprette og ændre størrelse på partitioner. - + Boot loader location: Bootloaderplacering: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 vil blive skrumpet til %2 MB og en ny %3 MB partition vil blive oprettet for %4. - + Select storage de&vice: Vælg lageren&hed: - - - - + + + + Current: Nuværende: @@ -440,71 +433,71 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Genbrug %1 som hjemmepartition til %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Vælg en partition der skal mindskes, træk herefter den nederste bjælke for at ændre størrelsen</strong> - + <strong>Select a partition to install on</strong> <strong>Vælg en partition at installere på</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. En EFI-partition blev ikke fundet på systemet. Gå venligst tilbage og brug manuel partitionering til at opsætte %1. - + The EFI system partition at %1 will be used for starting %2. EFI-systempartitionen ved %1 vil blive brugt til at starte %2. - + EFI system partition: EFI-systempartition: - + 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. Denne lagerenhed ser ikke ud til at indeholde et styresystem. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Slet disk</strong><br/>Dette vil <font color="red">slette</font> alt data der er på den valgte lagerenhed. - + 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. Denne lagerenhed har %1 på sig. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før det sker ændringer til lagerenheden. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Installér ved siden af</strong><br/>Installationsprogrammet vil mindske en partition for at gøre plads til %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Erstat en partition</strong><br/>Erstatter en partition med %1. - + This storage device already has 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. Denne lagerenhed indeholder allerede et styresystem. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden. - + This storage device has multiple operating systems 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. Denne lagerenhed indeholder flere styresystemer. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden. @@ -530,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. @@ -557,6 +550,11 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Create a Partition Opret en partition + + + MiB + MiB + Partition &Type: @@ -593,32 +591,27 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.&Størrelse: - - MB - MB - - - + En&crypt Kryp&tér - + Logical Logisk - + Primary Primær - + GPT GPT - + Mountpoint already in use. Please select another one. Monteringspunktet er allerede i brug. Vælg venligst et andet. @@ -709,7 +702,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Creating new %1 partition table on %2. - Opretter ny %1 partitionstabel på %2. + Opretter ny %1-partitionstabel på %2. @@ -831,7 +824,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. DeviceInfoWidget - + 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. Typen af <strong>partitionstabel</strong> på den valgte lagerenhed.<br><br>Den eneste måde at ændre partitionstabeltypen, er at slette og oprette partitionstabellen igen, hvilket vil destruere al data på lagerenheden.<br>Installationsprogrammet vil beholde den nuværende partitionstabel medmindre du specifikt vælger andet.<br>Hvis usikker, er GPT foretrukket på moderne systemer. @@ -933,17 +926,22 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Stø&rrelse: - + + MiB + MiB + + + Fi&le System: Fi&lsystem: - + Flags: Flag: - + Mountpoint already in use. Please select another one. Monteringspunktet er allerede i brug. Vælg venligst et andet. @@ -971,7 +969,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Bekræft adgangskode - + Please enter the same passphrase in both boxes. Indtast venligst samme adgangskode i begge bokse. @@ -986,30 +984,30 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Install %1 on <strong>new</strong> %2 system partition. - Installér %1 på den <strong>nye</strong> %2 systempartition. + Installér %1 på <strong>nye</strong> %2-systempartition. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Opsæt den <strong>nye</strong> %2 partition med monteringspunkt <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - Installér %2 på %3 systempartition <strong>%1</strong>. + Installér %2 på %3-systempartition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Opsæt %3 partition <strong>%1</strong> med monteringspunkt <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Installér bootloader på <strong>%1</strong>. - + Setting up mount points. Opsætter monteringspunkter. @@ -1027,18 +1025,33 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.&Genstart nu - + <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>Færdig.</h1><br/>%1 er blevet installeret på din computer.<br/>Du kan nu genstarte for at komme ind i dit nye system eller fortsætte med at bruge %2 live-miljøet. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>Installation mislykkede</h1><br/>%1 er ikke blevet installeret på din computer.<br/>Fejlmeddelelsen var: %2. + FinishedViewStep - + Finish Færdig + + + Installation Complete + Installation fuldført + + + + The installation of %1 is complete. + Installationen af %1 er fuldført. + FormatPartitionJob @@ -1116,12 +1129,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. KeyboardPage - + Set keyboard model to %1.<br/> Sæt tastaturmodel til %1.<br/> - + Set keyboard layout to %1/%2. Sæt tastaturlayout til %1/%2. @@ -1137,15 +1150,25 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. LCLocaleDialog - + System locale setting Systemets lokalitetsindstilling - + 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>. Systemets lokalitetsindstilling har indflydelse på sproget og tegnsættet for nogle kommandolinje-brugerelementer.<br/>Den nuværende indstilling er <strong>%1</strong>. + + + &Cancel + &Annullér + + + + &OK + &OK + LicensePage @@ -1228,12 +1251,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. LocalePage - + The system language will be set to %1. Systemsproget vil blive sat til %1. - + The numbers and dates locale will be set to %1. Lokalitet for tal og datoer vil blive sat til %1. @@ -1254,12 +1277,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.&Skift... - + Set timezone to %1/%2.<br/> Sæt tidszone til %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. NetInstallPage - + Name Navn - + Description Beskrivelse - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Netværksinstallation. (Deaktiveret: Kunne ikke hente pakkelister, tjek din netværksforbindelse) @@ -1389,7 +1412,6 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Hvilket navn vil du bruge til at logge ind med? - @@ -1563,7 +1585,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Installér boot&loader på: - + Are you sure you want to create a new partition table on %1? Er du sikker på, at du vil oprette en ny partitionstabel på %1? @@ -1586,82 +1608,82 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Installér %1 <strong>ved siden af</strong> et andet styresystem. - + <strong>Erase</strong> disk and install %1. <strong>Slet</strong> disk og installér %1. - + <strong>Replace</strong> a partition with %1. <strong>Erstat</strong> en partition med %1. - + <strong>Manual</strong> partitioning. <strong>Manuel</strong> partitionering. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Installér %1 <strong>ved siden af</strong> et andet styresystem på disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Slet</strong> disk <strong>%2</strong> (%3) og installér %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Erstat</strong> en partition på disk <strong>%2</strong> (%3) med %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Manuel</strong> partitionering på disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disk <strong>%1</strong> (%2) - + Current: Nuværende: - + After: Efter: - + No EFI system partition configured Ingen EFI-systempartition konfigureret - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. En EFI-systempartition er nødvendig for at starte %1.<br/><br/>For at konfigurere en EFI-systempartition skal du gå tilbage og vælge eller oprette et FAT32-filsystem med <strong>esp</strong>-flaget aktiveret og monteringspunkt <strong>%2</strong>.<br/><br/>Du kan fortsætte uden at opsætte en EFI-systempartition, men dit system vil muligvis ikke kunne starte. - + EFI system partition flag not set EFI-systempartitionsflag ikke sat - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. En EFI-systempartition er nødvendig for at starte %1.<br/><br/>En partition var konfigureret med monteringspunkt <strong>%2</strong>, men dens <strong>esp</strong>-flag var ikke sat.<br/>For at sætte flaget skal du gå tilbage og redigere partitionen.<br/><br/>Du kan fortsætte uden at konfigurere flaget, men dit system vil muligvis ikke kunne starte. - + Boot partition not encrypted Bootpartition ikke krypteret - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. En separat bootpartition blev opsat sammen med en krypteret rodpartition, men bootpartitionen er ikke krypteret.<br/><br/>Der er sikkerhedsmæssige bekymringer med denne type opsætning, da vigtige systemfiler er gemt på en ikke-krypteret partition.<br/>Du kan fortsætte hvis du vil, men oplåsning af filsystemet sker senere under systemets opstart.<br/>For at kryptere bootpartitionen skal du gå tilbage og oprette den igen, vælge <strong>Kryptér</strong> i partitionsoprettelsesvinduet. @@ -1680,22 +1702,22 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Standard - + unknown ukendt - + extended udvidet - + unformatted uformatteret - + swap swap @@ -1718,64 +1740,64 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Vælg hvor %1 skal installeres.<br/><font color="red">Advarsel: </font>Dette vil slette alle filer på den valgte partition. - + The selected item does not appear to be a valid partition. Det valgte emne ser ikke ud til at være en gyldig partition. - + %1 cannot be installed on empty space. Please select an existing partition. %1 kan ikke installeres på tom plads. Vælg venligst en eksisterende partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 kan ikke installeres på en udvidet partition. Vælg venligst en eksisterende primær eller logisk partition. - + %1 cannot be installed on this partition. %1 kan ikke installeres på denne partition. - + Data partition (%1) Datapartition (%1) - + Unknown system partition (%1) Ukendt systempartition (%1) - + %1 system partition (%2) - %1 systempartition (%2) + %1-systempartition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>Partitionen %1 er for lille til %2. Vælg venligst en partition med mindst %3 GiB plads. - + <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/>En EFI-systempartition kunne ikke findes på systemet. Gå venligst tilbage og brug manuel partitionering til at opsætte %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 vil blive installeret på %2.<br/><font color="red">Advarsel: </font>Al data på partition %2 vil gå tabt. - + The EFI system partition at %1 will be used for starting %2. EFI-systempartitionen ved %1 vil blive brugt til at starte %2. - + EFI system partition: EFI-systempartition: @@ -1783,55 +1805,60 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. RequirementsChecker - + Gathering system information... Indsamler systeminformation... - + has at least %1 GB available drive space har mindst %1 GB ledig plads på drevet - + There is not enough drive space. At least %1 GB is required. Der er ikke nok ledig plads på drevet. Mindst %1 GB er påkrævet. - + has at least %1 GB working memory har mindst %1 GB arbejdshukommelse - + The system does not have enough working memory. At least %1 GB is required. Systemet har ikke nok arbejdshukommelse. Mindst %1 GB er påkrævet. - + is plugged in to a power source er tilsluttet en strømkilde - + The system is not plugged in to a power source. Systemet er ikke tilsluttet en strømkilde. - + is connected to the Internet er forbundet til internettet - + The system is not connected to the Internet. Systemet er ikke forbundet til internettet. - + The installer is not running with administrator rights. Installationsprogrammet kører ikke med administratorrettigheder. + + + The screen is too small to display the installer. + Skærmen er for lille til at vise installationsprogrammet. + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. SetPasswordJob - + Set password for user %1 Sæt adgangskode for bruger %1 - + Setting password for user %1. Sætter adgangskode for bruger %1. - + Bad destination system path. Ugyldig destinationssystemsti. - + rootMountPoint is %1 rodMonteringsPunkt er %1 - + Cannot disable root account. Kan ikke deaktivere root-konto. - + passwd terminated with error code %1. passwd stoppet med fejlkode %1. - + Cannot set password for user %1. Kan ikke sætte adgangskode for bruger %1. - + usermod terminated with error code %1. usermod stoppet med fejlkode %1. @@ -2236,22 +2263,27 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.&Om - + <h1>Welcome to the %1 installer.</h1> <h1>Velkommen til %1-installationsprogrammet.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Velkommen til Calamares-installationsprogrammet for %1.</h1> + + + About %1 installer Om %1-installationsprogrammet - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>til %3</strong><br/><br/>Ophavsret 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Tak til: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg og <a href="https://www.transifex.com/calamares/calamares/">Calamares oversætterhold</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> udvikling er sponsoreret af <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + <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/>for %3</strong><br/><br/>Ophavsret 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Ophavsret 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Tak til: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg og <a href="https://www.transifex.com/calamares/calamares/">Calamares-oversætterteam</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> udvikling er sponsoreret af <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + %1 support %1 support diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index 33b14872b..ff93c6377 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -1,52 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Wählen Sie eine Partition zum Verkleinern: - - - - Allocate drive space by dragging the divider below: - Teilen Sie Festplattenplatz zu, indem Sie den Trenner unten verschieben: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Durch diesen Vorgang wird die Partition <strong>%1</strong>, welche %4 enthält, auf %2MB verkleinert, und für %5 wird eine neue Partition mit %3MB erstellt. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Es wurde keine EFI-Systempartition auf diesem System gefunden. -Bitte gehen Sie zurück und nutzen Sie die manuelle Partitionierung, um %1 aufzusetzen. - - - - The EFI system partition at %1 will be used for starting %2. - Die EFI-Systempartition auf %1 wird benutzt, um %2 zu starten. - - - - EFI system partition: - EFI-Systempartition: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. Die <strong>Boot-Umgebung</strong> dieses Systems.<br><br>Ältere x86-Systeme unterstützen nur <strong>BIOS</strong>.<br>Moderne Systeme verwenden normalerweise <strong>EFI</strong>, können jedoch auch als BIOS angezeigt werden, wenn sie im Kompatibilitätsmodus gestartet werden. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Dieses System wurde mit einer <strong>EFI</strong> Boot-Umgebung gestartet.<br><br>Um den Start von einer EFI-Umgebung zu konfigurieren, muss dieser Installer eine Bootloader-Anwendung nutzen , wie <strong>GRUB</strong> oder <strong>systemd-boot</strong> auf einer <strong>EFI System-Partition</strong>. Dies passiert automatisch, außer Sie wählen die maunuelle Partitionierung. In diesem Fall müssen Sie sie selbst auswählen oder erstellen. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Dieses System wurde mit einer <strong>BIOS</strong> Boot-Umgebung gestartet.<br><br>Um den Systemstart aus einer BIOS-Umgebung zu konfigurieren, muss dieses Installationsprogramm einen Boot-Loader installieren, wie <strong>GRUB</strong>, entweder am Anfang einer Partition oder im <strong>Master Boot Record</strong> nahe am Anfang der Partitionstabelle (bevorzugt). Dies passiert automatisch, außer Sie wählen die manuelle Partitionierung. In diesem Fall müssen Sie ihn selbst aufsetzen. @@ -222,32 +188,32 @@ Ausgabe: Calamares::PythonJob - + Running %1 operation. Operation %1 wird ausgeführt. - + Bad working directory path Fehlerhafter Arbeitsverzeichnis-Pfad - + Working directory %1 for python job %2 is not readable. Arbeitsverzeichnis %1 für Python-Job %2 ist nicht lesbar. - + Bad main script file Fehlerhaftes Hauptskript - + Main script file %1 for python job %2 is not readable. Hauptskript-Datei %1 für Python-Job %2 ist nicht lesbar. - + Boost.Python error in job "%1". Boost.Python-Fehler in Job "%1". @@ -255,65 +221,91 @@ Ausgabe: Calamares::ViewManager - + &Back &Zurück - + &Next &Weiter - - + + &Cancel &Abbrechen - + + + Cancel installation without changing the system. + Lösche die Installation ohne das System zu ändern. + + + Cancel installation? Installation abbrechen? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Wollen Sie wirklich die aktuelle Installation abbrechen? Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. - + + &Yes + &Ja + + + + &No + &Nein + + + + &Close + &Schließen + + + Continue with setup? Setup fortsetzen? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Das %1 Installationsprogramm wird Änderungen an Ihrer Festplatte vornehmen, um %2 zu installieren.<br/><strong>Diese Änderungen können nicht rückgängig gemacht werden.</strong> - + &Install now Jetzt &installieren - + Go &back Gehe &zurück - - &Quit - &Beenden + + &Done + &Erledigt - + + The installation is complete. Close the installer. + Die Installation ist abgeschlossen. Schließe das Installationsprogramm. + + + Error Fehler - + Installation Failed Installation gescheitert @@ -344,12 +336,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. CalamaresWindow - + %1 Installer %1 Installationsprogramm - + Show debug information Debug-Information anzeigen @@ -370,7 +362,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Dieser Computer erfüllt nicht die Mindestvoraussetzungen für die Installation von %1.<br/>Die Installation kann nicht fortgesetzt werden. <a href="#details">Details...</a> @@ -380,17 +372,17 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Dieser Computer erfüllt nicht alle Voraussetzungen für die Installation von %1.<br/>Die Installation wird fortgesetzt, aber es werden eventuell nicht alle Funktionen verfügbar sein. - + This program will ask you some questions and set up %2 on your computer. Dieses Programm wird Ihnen einige Fragen stellen, um %2 auf Ihrem Computer zu installieren. - + For best results, please ensure that this computer: Für das beste Ergebnis stellen Sie bitte sicher, dass dieser Computer: - + System requirements Systemanforderungen @@ -403,35 +395,35 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Form - + After: Nachher: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Manuelle Partitionierung</strong><br/>Sie können Partitionen eigenhändig erstellen oder in der Grösse verändern. - + Boot loader location: Installationsziel des Bootloaders: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 wird auf %2MB verkleinert und eine neue Partition mit einer Größe von %3MB wird für %4 erstellt werden. - + Select storage de&vice: Speichermedium auswählen - - - - + + + + Current: Aktuell: @@ -441,71 +433,71 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. %1 als Home-Partition für %2 wiederverwenden. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Wählen Sie die zu verkleinernde Partition, dann ziehen Sie den Regler, um die Größe zu ändern</strong> - + <strong>Select a partition to install on</strong> <strong>Wählen Sie eine Partition für die Installation</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Es wurde keine EFI-Systempartition auf diesem System gefunden. Bitte gehen Sie zurück und nutzen Sie die manuelle Partitionierung für das Einrichten von %1. - + The EFI system partition at %1 will be used for starting %2. Die EFI-Systempartition %1 wird benutzt, um %2 zu starten. - + EFI system partition: EFI-Systempartition: - + 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. Auf diesem Speichermedium scheint kein Betriebssystem installiert zu sein. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen auf diesem Speichermedium vorgenommen werden. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Festplatte löschen</strong><br/>Dies wird alle vorhandenen Daten auf dem gewählten Speichermedium <font color="red">löschen</font>. - + 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. Auf diesem Speichermedium ist %1 installiert. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen an dem Speichermedium vorgenommen werden. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Parallel dazu installieren</strong><br/>Das Installationsprogramm wird eine Partition verkleinern, um Platz für %1 zu schaffen. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Ersetze eine Partition</strong><br/>Ersetzt eine Partition durch %1. - + This storage device already has 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. Dieses Speichermedium enthält bereits ein Betriebssystem. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen an dem Speichermedium vorgenommen wird. - + This storage device has multiple operating systems 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. Auf diesem Speichermedium sind mehrere Betriebssysteme installiert. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen an dem Speichermedium vorgenommen werden. @@ -531,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. @@ -558,6 +550,11 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Create a Partition Partition erstellen + + + MiB + MiB + Partition &Type: @@ -594,32 +591,27 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Grö&sse: - - MB - MB - - - + En&crypt Ver&schlüsseln - + Logical Logisch - + Primary Primär - + GPT GPT - + Mountpoint already in use. Please select another one. Dieser Einhängepunkt wird schon benuztzt. Bitte wählen Sie einen anderen. @@ -832,7 +824,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. DeviceInfoWidget - + 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. Die Art von <strong>Partitionstabelle</strong> auf dem gewählten Speichermedium.<br><br>Die einzige Möglichkeit die Art der Partitionstabelle zu ändern ist sie zu löschen und sie von Grund auf neu aufzusetzen, was alle Daten auf dem Speichermedium vernichtet.<br>Dieses Installationsprogramm wird die aktuelle Partitionstabelle behalten außer Sie wählen ausdrücklich etwas anderes..<br>Falls Sie unsicher sind: auf modernen Systemen wird GPT bevorzugt. @@ -934,17 +926,22 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Grö&sse: - + + MiB + MiB + + + Fi&le System: Datei&system: - + Flags: Markierungen: - + Mountpoint already in use. Please select another one. Der Einhängepunkt wird schon benutzt. Bitte wählen Sie einen anderen. @@ -972,7 +969,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Passwort wiederholen - + Please enter the same passphrase in both boxes. Bitte tragen Sie dasselbe Passwort in beide Felder ein. @@ -990,27 +987,27 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Installiere %1 auf <strong>neuer</strong> %2 Systempartition. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Erstelle <strong>neue</strong> %2 Partition mit Einhängepunkt <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Installiere %2 auf %3 Systempartition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Erstelle %3 Partition <strong>%1</strong> mit Einhängepunkt <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Installiere Bootloader auf <strong>%1</strong>. - + Setting up mount points. Richte Einhängepunkte ein. @@ -1028,18 +1025,33 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Jetzt &Neustarten - + <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>Alles erledigt.</h1><br/>%1 wurde auf Ihrem Computer installiert.<br/>Sie können nun in Ihr neues System neustarten oder mit der %2 Live-Umgebung fortfahren. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>Installation fehlgeschlagen</h1><br/>%1 wurde nicht auf deinem Computer installiert.<br/>Die Fehlermeldung lautet: %2. + FinishedViewStep - + Finish Beenden + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1117,12 +1129,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. KeyboardPage - + Set keyboard model to %1.<br/> Setze Tastaturmodell auf %1.<br/> - + Set keyboard layout to %1/%2. Setze Tastaturbelegung auf %1/%2. @@ -1138,15 +1150,25 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. LCLocaleDialog - + System locale setting Regions- und Spracheinstellungen - + 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>. Die Lokalisierung des Systems beeinflusst die Sprache und den Zeichensatz einiger Elemente der Kommandozeile.<br/>Die derzeitige Einstellung ist <strong>%1</strong>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1229,12 +1251,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. LocalePage - + The system language will be set to %1. Die Systemsprache wird auf %1 gestellt. - + The numbers and dates locale will be set to %1. Das Format für Zahlen und Datum wird auf %1 gesetzt. @@ -1255,12 +1277,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. &Ändern... - + Set timezone to %1/%2.<br/> Setze Zeitzone auf %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1331,17 +1353,17 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. NetInstallPage - + Name Name - + Description Beschreibung - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Netzwerk-Installation. (Deaktiviert: Paketlisten nicht erreichbar, prüfe deine Netzwerk-Verbindung) @@ -1390,12 +1412,11 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Welchen Namen möchten Sie zum Anmelden benutzen? - font-weight: normal - Schriftstil: normal + font-weight: normal @@ -1564,7 +1585,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Installiere Boot&loader auf: - + Are you sure you want to create a new partition table on %1? Sind Sie sicher, dass Sie eine neue Partitionstabelle auf %1 erstellen möchten? @@ -1587,82 +1608,82 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Installiere %1 <strong>neben</strong> einem anderen Betriebssystem. - + <strong>Erase</strong> disk and install %1. <strong>Lösche</strong> Festplatte und installiere %1. - + <strong>Replace</strong> a partition with %1. <strong>Ersetze</strong> eine Partition durch %1. - + <strong>Manual</strong> partitioning. <strong>Manuelle</strong> Partitionierung. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). %1 <strong>parallel</strong> zu einem anderen Betriebssystem auf der Festplatte <strong>%2</strong> (%3) installieren. - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. Festplatte <strong>%2</strong> <strong>löschen</strong> (%3) und %1 installieren. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. Eine Partition auf Festplatte <strong>%2</strong> (%3) durch %1 <strong>ersetzen</strong>. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Manuelle</strong> Partitionierung auf Festplatte <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Festplatte <strong>%1</strong> (%2) - + Current: Aktuell: - + After: Nachher: - + No EFI system partition configured Keine EFI-Systempartition konfiguriert - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. Eine EFI Systempartition wird benötigt um %1 zu starten.<br/><br/>Um eine EFI Systempartition zu konfigurieren, gehen Sie zurück und wählen oder erstellen Sie ein FAT32 Dateisystem mit einer aktivierten <strong>esp</strong> Markierung sowie Einhängepunkt <strong>%2</strong>.<br/><br/>Sie können ohne die Einrichtung einer EFI-Systempartition weitermachen aber ihr System wird unter Umständen nicht starten können. - + EFI system partition flag not set Die Markierung als EFI-Systempartition wurde nicht gesetzt - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. Eine EFI Systempartition wird benötigt um %1 zu starten.<br/><br/>Eine Partition wurde mit dem Einhängepunkt <strong>%2</strong> konfiguriert jedoch wurde dort keine <strong>esp</strong> Markierung gesetzt.<br/>Um diese Markierung zu setzen, gehen Sie zurück und bearbeiten Sie die Partition.<br/><br/>Sie können ohne die Markierung fortfahren aber ihr System wird unter Umständen nicht starten können. - + Boot partition not encrypted Bootpartition nicht verschlüsselt - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Eine saparate Bootpartition wurde zusammen mit einer verschlüsselten Rootpartition erstellt, die Bootpartition ist aber unverschlüsselt.<br/><br/>. Dies begnet Sicherheitsbedenken, weil wichtige Systemdateien auf einer unverschlüsselten Partition gespeichert werden.<br/>Wenn Sie wollen, können Sie fortfahren, aber das entschlüsseln des Filesystems wird später während des Systemstarts erfolgen.<br/>Um die Bootpartition zu verschlüsseln, gehen Sie zurück und erstellen Sie sie neu, indem Sie <strong>Verschlüsseln</strong> im Partitionserstellungs-Fenster wählen. @@ -1681,22 +1702,22 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Standard - + unknown unbekannt - + extended erweitert - + unformatted unformatiert - + swap Swap @@ -1719,64 +1740,64 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Wählen Sie den Installationsort für %1.<br/><font color="red">Warnung: </font>Dies wird alle Daten auf der ausgewählten Partition löschen. - + The selected item does not appear to be a valid partition. Die aktuelle Auswahl scheint keine gültige Partition zu sein. - + %1 cannot be installed on empty space. Please select an existing partition. %1 kann nicht in einem unpartitionierten Bereich installiert werden. Bitte wählen Sie eine existierende Partition aus. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 kann nicht auf einer erweiterten Partition installiert werden. Bitte wählen Sie eine primäre oder logische Partition aus. - + %1 cannot be installed on this partition. %1 kann auf dieser Partition nicht installiert werden. - + Data partition (%1) Datenpartition (%1) - + Unknown system partition (%1) Unbekannte Systempartition (%1) - + %1 system partition (%2) %1 Systempartition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>Die Partition %1 ist zu klein für %2. Bitte wählen Sie eine Partition mit einer Kapazität von mindestens %3 GiB. - + <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/>Es wurde keine EFI-Systempartition auf diesem System gefunden. Bitte gehen Sie zurück, und nutzen Sie die manuelle Partitionierung, um %1 aufzusetzen. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 wird installiert auf %2.<br/><font color="red">Warnung: </font> Alle Daten auf der Partition %2 werden gelöscht. - + The EFI system partition at %1 will be used for starting %2. Die EFI-Systempartition auf %1 wird benutzt, um %2 zu starten. - + EFI system partition: EFI-Systempartition: @@ -1784,55 +1805,60 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. RequirementsChecker - + Gathering system information... Sammle Systeminformationen... - + has at least %1 GB available drive space mindestens %1 GB freien Festplattenplatz hat - + There is not enough drive space. At least %1 GB is required. Der Speicherplatz auf der Festplatte ist unzureichend. Es wird mindestens %1 GB benötigt. - + has at least %1 GB working memory hat mindestens %1 GB Arbeitsspeicher - + The system does not have enough working memory. At least %1 GB is required. Das System hat nicht genug Arbeitsspeicher. Es wird mindestens %1GB benötigt. - + is plugged in to a power source ist an eine Stromquelle angeschlossen - + The system is not plugged in to a power source. Das System ist an keine Stromquelle angeschlossen. - + is connected to the Internet ist mit dem Internet verbunden - + The system is not connected to the Internet. Das System ist nicht mit dem Internet verbunden. - + The installer is not running with administrator rights. Das Installationsprogramm wird nicht mit Administratorrechten ausgeführt. + + + The screen is too small to display the installer. + Der Bildschirm ist zu klein um das Installationsprogramm anzuzeigen. + ResizeFileSystemJob @@ -2068,42 +2094,42 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. SetPasswordJob - + Set password for user %1 Setze Passwort für Benutzer %1 - + Setting password for user %1. Setze Passwort für Benutzer %1. - + Bad destination system path. Ungültiger System-Zielpfad. - + rootMountPoint is %1 root-Einhängepunkt ist %1 - + Cannot disable root account. Das Root-Konto kann nicht deaktiviert werden. - + passwd terminated with error code %1. Passwd beendet mit Fehlercode %1. - + Cannot set password for user %1. Passwort für Benutzer %1 kann nicht gesetzt werden. - + usermod terminated with error code %1. usermod wurde mit Fehlercode %1 beendet. @@ -2237,22 +2263,29 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. &Über - + <h1>Welcome to the %1 installer.</h1> <h1>Willkommen im %1 Installationsprogramm.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Willkommen beim Calamares-Installationsprogramm für %1. + + + About %1 installer Über das %1 Installationsprogramm - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Dank an: 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> wird unterstützt von <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + <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/>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/>Danke an: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg und das <a href="https://www.transifex.com/calamares/calamares/">Calamares Übersetzungs-Team</a>.<br/><br/><a href="http://calamares.io/">Die Calamares Entwicklung wird gefördert von<br/><a href="http://www.blue-systems.com/"> Blue Systems</a> - Liberating Software. - + %1 support Unterstützung für %1 diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts index 145e8bc29..ee760147c 100644 --- a/lang/calamares_el.ts +++ b/lang/calamares_el.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Επιλέξτε κατάτμηση για συρρίκνωση: - - - - Allocate drive space by dragging the divider below: - Διανείμετε τον χώρο του δίσκου σύροντας το παρακάτω διαχωριστικό: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Με αυτή τη λειτουργία, η κατάτμηση <strong>%1</strong> που περιέχει το %4 θα συρρικνωθεί σε %2MB και μία νέα κατάτμηση %3MB θα δημιουργηθεί για το %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Πουθενά στο σύστημα δεν μπορεί να ανιχθευθεί μία κατάτμηση EFI. Παρακαλώ επιστρέψτε πίσω και χρησιμοποιήστε τη χειροκίνητη τμηματοποίηση για την εγκατάσταση του %1. - - - - The EFI system partition at %1 will be used for starting %2. - Η κατάτμηση συστήματος EFI στο %1 θα χρησιμοποιηθεί για την εκκίνηση του %2. - - - - EFI system partition: - Κατάτμηση συστήματος EFI: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. Το <strong> περιβάλλον εκκίνησης <strong> αυτού του συστήματος.<br><br>Παλαιότερα συστήματα x86 υποστηρίζουν μόνο <strong>BIOS</strong>.<br> Τα σύγχρονα συστήματα συνήθως χρησιμοποιούν <strong>EFI</strong>, αλλά ίσως επίσης να φαίνονται ως BIOS εάν εκκινήθηκαν σε λειτουργία συμβατότητας. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Αυτό το σύστημα εκκινήθηκε με ένα <strong>EFI</strong> περιβάλλον εκκίνησης.<br><br>Για να ρυθμιστεί η εκκίνηση από ένα περιβάλλον EFI, αυτός ο εγκαταστάτης πρέπει να αναπτυχθεί ένα πρόγραμμα φορτωτή εκκίνησης, όπως <strong>GRUB</strong> ή <strong>systemd-boot</strong> σε ένα <strong>EFI Σύστημα Διαμερισμού</strong>. Αυτό είναι αυτόματο, εκτός εάν επιλέξεις χειροκίνητο διαμερισμό, στην οποία περίπτωση οφείλεις να το επιλέξεις ή να το δημιουργήσεις από μόνος σου. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -221,32 +188,32 @@ Output: Calamares::PythonJob - + Running %1 operation. Εκτελείται η λειτουργία %1. - + Bad working directory path Λανθασμένη διαδρομή καταλόγου εργασίας - + Working directory %1 for python job %2 is not readable. Ο ενεργός κατάλογος %1 για την εργασία python %2 δεν είναι δυνατόν να διαβαστεί. - + Bad main script file Λανθασμένο κύριο αρχείο δέσμης ενεργειών - + Main script file %1 for python job %2 is not readable. Η κύρια δέσμη ενεργειών %1 για την εργασία python %2 δεν είναι δυνατόν να διαβαστεί. - + Boost.Python error in job "%1". Σφάλμα Boost.Python στην εργασία "%1". @@ -254,65 +221,91 @@ Output: Calamares::ViewManager - + &Back &Προηγούμενο - + &Next &Επόμενο - - + + &Cancel &Ακύρωση - + + + Cancel installation without changing the system. + + + + Cancel installation? Ακύρωση της εγκατάστασης; - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Θέλετε πραγματικά να ακυρώσετε τη διαδικασία εγκατάστασης; Το πρόγραμμα εγκατάστασης θα τερματιστεί και όλες οι αλλαγές θα χαθούν. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? Συνέχεια με την εγκατάσταση; - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Το πρόγραμμα εγκατάστασης %1 θα κάνει αλλαγές στον δίσκο για να εγκαταστήσετε το %2.<br/><strong>Δεν θα είστε σε θέση να αναιρέσετε τις αλλαγές.</strong> - + &Install now Ε&γκατάσταση τώρα - + Go &back Μετάβαση πί&σω - - &Quit - Έ&ξοδος + + &Done + - + + The installation is complete. Close the installer. + + + + Error Σφάλμα - + Installation Failed Η εγκατάσταση απέτυχε @@ -343,12 +336,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer Εφαρμογή εγκατάστασης του %1 - + Show debug information Εμφάνιση πληροφοριών απασφαλμάτωσης @@ -369,7 +362,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Ο υπολογιστής δεν ικανοποιεί τις ελάχιστες απαιτήσεις για την εγκατάσταση του %1.<br/>Η εγκατάσταση δεν μπορεί να συνεχιστεί. <a href="#details">Λεπτομέριες...</a> @@ -379,17 +372,17 @@ The installer will quit and all changes will be lost. Αυτός ο υπολογιστής δεν ικανοποιεί μερικές από τις συνιστώμενες απαιτήσεις για την εγκατάσταση του %1.<br/>Η εγκατάσταση μπορεί να συνεχιστεί, αλλά ορισμένες λειτουργίες μπορεί να απενεργοποιηθούν. - + This program will ask you some questions and set up %2 on your computer. Το πρόγραμμα θα σας κάνει μερικές ερωτήσεις και θα ρυθμίσει το %2 στον υπολογιστή σας. - + For best results, please ensure that this computer: Για καλύτερο αποτέλεσμα, παρακαλώ βεβαιωθείτε ότι ο υπολογιστής: - + System requirements Απαιτήσεις συστήματος @@ -402,35 +395,35 @@ The installer will quit and all changes will be lost. Τύπος - + After: Μετά: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Χειροκίνητη τμηματοποίηση</strong><br/>Μπορείτε να δημιουργήσετε κατατμήσεις ή να αλλάξετε το μέγεθός τους μόνοι σας. - + Boot loader location: Τοποθεσία προγράμματος εκκίνησης: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. Το %1 θα συρρικνωθεί σε %2MB και μία νέα κατάτμηση %3MB θα δημιουργηθεί για το %4. - + Select storage de&vice: Επιλέξτε συσκευή απ&οθήκευσης: - - - - + + + + Current: Τρέχον: @@ -440,71 +433,71 @@ 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>Select a partition to install on</strong> <strong>Επιλέξτε διαμέρισμα για την εγκατάσταση</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Πουθενά στο σύστημα δεν μπορεί να ανιχθευθεί μία κατάτμηση EFI. Παρακαλώ επιστρέψτε πίσω και χρησιμοποιήστε τη χειροκίνητη τμηματοποίηση για την εγκατάσταση του %1. - + The EFI system partition at %1 will be used for starting %2. Η κατάτμηση συστήματος EFI στο %1 θα χρησιμοποιηθεί για την εκκίνηση του %2. - + EFI system partition: Κατάτμηση συστήματος EFI: - + 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/>Θα έχεις την δυνατότητα να επιβεβαιώσεις και αναθεωρήσεις τις αλλαγές πριν γίνει οποιαδήποτε αλλαγή στην συσκευή αποθήκευσης. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Διαγραφή του δίσκου</strong><br/>Αυτό θα <font color="red">διαγράψει</font> όλα τα αρχεία στην επιλεγμένη συσκευή αποθήκευσης. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Εγκατάσταση σε επαλληλία</strong><br/>Η εγκατάσταση θα συρρικνώσει μία κατάτμηση για να κάνει χώρο για το %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Αντικατάσταση μίας κατάτμησης</strong><br/>Αντικαθιστά μία κατάτμηση με το %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -530,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. Καθαρίστηκαν όλες οι προσωρινές προσαρτήσεις. @@ -557,6 +550,11 @@ The installer will quit and all changes will be lost. Create a Partition Δημιουργία κατάτμησης + + + MiB + + Partition &Type: @@ -593,32 +591,27 @@ The installer will quit and all changes will be lost. &Μέγεθος: - - MB - MB - - - + En&crypt - + Logical Λογική - + Primary Πρωτεύουσα - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -831,7 +824,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -933,17 +926,22 @@ The installer will quit and all changes will be lost. &Μέγεθος: - + + MiB + + + + Fi&le System: &Σύστημα αρχείων: - + Flags: Σημαίες: - + Mountpoint already in use. Please select another one. @@ -971,7 +969,7 @@ The installer will quit and all changes will be lost. Επιβεβαίωση λέξης κλειδί - + Please enter the same passphrase in both boxes. Παρακαλώ εισάγετε την ίδια λέξη κλειδί και στα δύο κουτιά. @@ -989,27 +987,27 @@ The installer will quit and all changes will be lost. Εγκατάσταση %1 στο <strong>νέο</strong> %2 διαμέρισμα συστήματος. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Εγκατάσταση φορτωτή εκκίνησης στο <strong>%1</strong>. - + Setting up mount points. @@ -1027,18 +1025,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish Τέλος + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1116,12 +1129,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> Ορισμός του μοντέλου πληκτρολογίου σε %1.<br/> - + Set keyboard layout to %1/%2. Ορισμός της διάταξης πληκτρολογίου σε %1/%2. @@ -1137,15 +1150,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting Τοπική ρύθμιση συστήματος - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. Η τοπική γλώσσα του συστήματος έχει οριστεί σε %1. - + The numbers and dates locale will be set to %1. @@ -1254,12 +1277,12 @@ The installer will quit and all changes will be lost. &Αλλαγή... - + Set timezone to %1/%2.<br/> Ορισμός της ζώνης ώρας σε %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1330,17 +1353,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Όνομα - + Description - + Περιγραφή - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1389,7 +1412,6 @@ The installer will quit and all changes will be lost. Ποιο όνομα θα θέλατε να χρησιμοποιείτε για σύνδεση; - @@ -1563,7 +1585,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; @@ -1586,82 +1608,82 @@ The installer will quit and all changes will be lost. Εγκατάσταση του %1 <strong>παράλληλα με</strong> ένα άλλο λειτουργικό σύστημα στον δίσκο. - + <strong>Erase</strong> disk and install %1. <strong>Διαγραφή</strong> του δίσκου και εγκατάσταση του %1. - + <strong>Replace</strong> a partition with %1. <strong>Αντικατάσταση</strong> μιας κατάτμησης με το %1. - + <strong>Manual</strong> partitioning. <strong>Χειροκίνητη</strong> τμηματοποίηση. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Εγκατάσταση του %1 <strong>παράλληλα με</strong> ένα άλλο λειτουργικό σύστημα στον δίσκο<strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Διαγραφή</strong> του δίσκου <strong>%2</strong> (%3) και εγκατάσταση του %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Αντικατάσταση</strong> μιας κατάτμησης στον δίσκο <strong>%2</strong> (%3) με το %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Χειροκίνητη</strong> τμηματοποίηση του δίσκου <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Δίσκος <strong>%1</strong> (%2) - + Current: Τρέχον: - + After: Μετά: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1680,22 +1702,22 @@ The installer will quit and all changes will be lost. Προκαθορισμένο - + unknown άγνωστη - + extended εκτεταμένη - + unformatted μη μορφοποιημένη - + swap @@ -1718,64 +1740,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. Το επιλεγμένο στοιχείο φαίνεται να μην είναι ένα έγκυρο διαμέρισμα. - + %1 cannot be installed on empty space. Please select an existing partition. %1 δεν μπορεί να εγκατασταθεί σε άδειο χώρο. Παρακαλώ επίλεξε ένα υφιστάμενο διαμέρισμα. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 δεν μπορεί να εγκατασταθεί σε ένα εκτεταμένο διαμέρισμα. Παρακαλώ επίλεξε ένα υφιστάμενο πρωτεύον ή λογικό διαμέρισμα. - + %1 cannot be installed on this partition. %1 δεν μπορεί να εγκατασταθεί σ' αυτό το διαμέρισμα. - + Data partition (%1) Κατάτμηση δεδομένων (%1) - + Unknown system partition (%1) Άγνωστη κατάτμηση συστήματος (%1) - + %1 system partition (%2) %1 κατάτμηση συστήματος (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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. Παρακαλώ επιστρέψτε πίσω και χρησιμοποιήστε τη χειροκίνητη τμηματοποίηση για την εγκατάσταση του %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. Η κατάτμηση συστήματος EFI στο %1 θα χρησιμοποιηθεί για την εκκίνηση του %2. - + EFI system partition: Κατάτμηση συστήματος EFI: @@ -1783,55 +1805,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... Συλλογή πληροφοριών συστήματος... - + has at least %1 GB available drive space έχει τουλάχιστον %1 GB διαθέσιμου χώρου στον δίσκο - + There is not enough drive space. At least %1 GB is required. Δεν υπάρχει αρκετός χώρος στον δίσκο. Απαιτείται τουλάχιστον %1 GB. - + has at least %1 GB working memory έχει τουλάχιστον %1 GB μνημης - + The system does not have enough working memory. At least %1 GB is required. Το σύστημα δεν έχει αρκετή μνήμη. Απαιτείται τουλάχιστον %1 GB. - + is plugged in to a power source είναι συνδεδεμένος σε πηγή ρεύματος - + The system is not plugged in to a power source. Το σύστημα δεν είναι συνδεδεμένο σε πηγή ρεύματος. - + is connected to the Internet είναι συνδεδεμένος στο διαδίκτυο - + The system is not connected to the Internet. Το σύστημα δεν είναι συνδεδεμένο στο διαδίκτυο. - + The installer is not running with administrator rights. Το πρόγραμμα εγκατάστασης δεν εκτελείται με δικαιώματα διαχειριστή. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 Ορισμός κωδικού για τον χρήστη %1 - + Setting password for user %1. Ορίζεται κωδικός για τον χρήστη %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2236,22 +2263,27 @@ The installer will quit and all changes will be lost. Σ&χετικά με - + <h1>Welcome to the %1 installer.</h1> <h1>Καλώς ήλθατε στην εγκατάσταση του %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer Σχετικά με το πρόγραμμα εγκατάστασης %1 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support Υποστήριξη %1 diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts index 1e5e1ea73..8c81b818a 100644 --- a/lang/calamares_en.ts +++ b/lang/calamares_en.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Choose partition to shrink: - - - - Allocate drive space by dragging the divider below: - Allocate drive space by dragging the divider below: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - The EFI system partition at %1 will be used for starting %2. - The EFI system partition at %1 will be used for starting %2. - - - - EFI system partition: - EFI system partition: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -221,32 +188,32 @@ Output: Calamares::PythonJob - + Running %1 operation. Running %1 operation. - + Bad working directory path Bad working directory path - + Working directory %1 for python job %2 is not readable. Working directory %1 for python job %2 is not readable. - + Bad main script file Bad main script file - + Main script file %1 for python job %2 is not readable. Main script file %1 for python job %2 is not readable. - + Boost.Python error in job "%1". Boost.Python error in job "%1". @@ -254,65 +221,91 @@ Output: Calamares::ViewManager - + &Back &Back - + &Next &Next - - + + &Cancel &Cancel - + + + Cancel installation without changing the system. + Cancel installation without changing the system. + + + Cancel installation? Cancel installation? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + + &Yes + &Yes + + + + &No + &No + + + + &Close + &Close + + + Continue with setup? Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now &Install now - + Go &back Go &back - - &Quit - &Quit + + &Done + &Done - + + The installation is complete. Close the installer. + The installation is complete. Close the installer. + + + Error Error - + Installation Failed Installation Failed @@ -343,12 +336,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer %1 Installer - + Show debug information Show debug information @@ -369,7 +362,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -379,17 +372,17 @@ The installer will quit and all changes will be lost. This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: For best results, please ensure that this computer: - + System requirements System requirements @@ -402,35 +395,35 @@ The installer will quit and all changes will be lost. Form - + After: After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: Select storage de&vice: - - - - + + + + Current: Current: @@ -440,71 +433,71 @@ The installer will quit and all changes will be lost. Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + <strong>Select a partition to install on</strong> <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. The EFI system partition at %1 will be used for starting %2. - + EFI system partition: EFI system partition: - + 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. 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. This storage device already has 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. - + This storage device has multiple operating systems 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. This storage device has multiple operating systems 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. @@ -530,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. @@ -557,6 +550,11 @@ The installer will quit and all changes will be lost. Create a Partition Create a Partition + + + MiB + MiB + Partition &Type: @@ -593,32 +591,27 @@ The installer will quit and all changes will be lost. Si&ze: - - MB - MB - - - + En&crypt En&crypt - + Logical Logical - + Primary Primary - + GPT GPT - + Mountpoint already in use. Please select another one. Mountpoint already in use. Please select another one. @@ -831,7 +824,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. 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. @@ -933,17 +926,22 @@ The installer will quit and all changes will be lost. Si&ze: - + + MiB + MiB + + + Fi&le System: Fi&le System: - + Flags: Flags: - + Mountpoint already in use. Please select another one. Mountpoint already in use. Please select another one. @@ -971,7 +969,7 @@ The installer will quit and all changes will be lost. Confirm passphrase - + Please enter the same passphrase in both boxes. Please enter the same passphrase in both boxes. @@ -989,27 +987,27 @@ The installer will quit and all changes will be lost. Install %1 on <strong>new</strong> %2 system partition. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Install boot loader on <strong>%1</strong>. - + Setting up mount points. Setting up mount points. @@ -1027,18 +1025,33 @@ The installer will quit and all changes will be lost. &Restart now - + <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>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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + FinishedViewStep - + Finish Finish + + + Installation Complete + Installation Complete + + + + The installation of %1 is complete. + The installation of %1 is complete. + FormatPartitionJob @@ -1116,12 +1129,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. Set keyboard layout to %1/%2. @@ -1137,15 +1150,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting System locale setting - + 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>. 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>. + + + &Cancel + &Cancel + + + + &OK + &OK + LicensePage @@ -1228,12 +1251,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. The system language will be set to %1. - + The numbers and dates locale will be set to %1. The numbers and dates locale will be set to %1. @@ -1254,12 +1277,12 @@ The installer will quit and all changes will be lost. &Change... - + Set timezone to %1/%2.<br/> Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name Name - + Description Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1389,7 +1412,6 @@ The installer will quit and all changes will be lost. What name do you want to use to log in? - @@ -1563,7 +1585,7 @@ The installer will quit and all changes will be lost. Install boot &loader on: - + Are you sure you want to create a new partition table on %1? Are you sure you want to create a new partition table on %1? @@ -1586,82 +1608,82 @@ The installer will quit and all changes will be lost. Install %1 <strong>alongside</strong> another operating system. - + <strong>Erase</strong> disk and install %1. <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disk <strong>%1</strong> (%2) - + Current: Current: - + After: After: - + No EFI system partition configured No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1680,22 +1702,22 @@ The installer will quit and all changes will be lost. Default - + unknown unknown - + extended extended - + unformatted unformatted - + swap swap @@ -1718,64 +1740,64 @@ The installer will quit and all changes will be lost. Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. - + The selected item does not appear to be a valid partition. The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. %1 cannot be installed on this partition. - + Data partition (%1) Data partition (%1) - + Unknown system partition (%1) Unknown system partition (%1) - + %1 system partition (%2) %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. The EFI system partition at %1 will be used for starting %2. - + EFI system partition: EFI system partition: @@ -1783,55 +1805,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... Gathering system information... - + has at least %1 GB available drive space has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source is plugged in to a power source - + The system is not plugged in to a power source. The system is not plugged in to a power source. - + is connected to the Internet is connected to the Internet - + The system is not connected to the Internet. The system is not connected to the Internet. - + The installer is not running with administrator rights. The installer is not running with administrator rights. + + + The screen is too small to display the installer. + The screen is too small to display the installer. + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 Set password for user %1 - + Setting password for user %1. Setting password for user %1. - + Bad destination system path. Bad destination system path. - + rootMountPoint is %1 rootMountPoint is %1 - + Cannot disable root account. Cannot disable root account. - + passwd terminated with error code %1. passwd terminated with error code %1. - + Cannot set password for user %1. Cannot set password for user %1. - + usermod terminated with error code %1. usermod terminated with error code %1. @@ -2236,22 +2263,27 @@ The installer will quit and all changes will be lost. &About - + <h1>Welcome to the %1 installer.</h1> <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Welcome to the Calamares installer for %1.</h1> + + + About %1 installer About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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/>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. - + %1 support %1 support diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts index 1b8cf486a..5fcf677a5 100644 --- a/lang/calamares_en_GB.ts +++ b/lang/calamares_en_GB.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Choose partition to shrink: - - - - Allocate drive space by dragging the divider below: - Allocate drive space by dragging the divider below: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -221,32 +188,32 @@ Output: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path Bad working directory path - + Working directory %1 for python job %2 is not readable. Working directory %1 for python job %2 is not readable. - + Bad main script file Bad main script file - + Main script file %1 for python job %2 is not readable. Main script file %1 for python job %2 is not readable. - + Boost.Python error in job "%1". Boost.Python error in job "%1". @@ -254,65 +221,91 @@ Output: Calamares::ViewManager - + &Back &Back - + &Next &Next - - + + &Cancel &Cancel - + + + Cancel installation without changing the system. + + + + Cancel installation? Cancel installation? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now &Install now - + Go &back Go &back - - &Quit - &Quit + + &Done + - + + The installation is complete. Close the installer. + + + + Error Error - + Installation Failed Installation Failed @@ -343,12 +336,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer %1 Installer - + Show debug information Show debug information @@ -369,7 +362,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -379,17 +372,17 @@ The installer will quit and all changes will be lost. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -402,35 +395,35 @@ The installer will quit and all changes will be lost. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -440,71 +433,71 @@ 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>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -530,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. @@ -557,6 +550,11 @@ The installer will quit and all changes will be lost. Create a Partition Create a Partition + + + MiB + + Partition &Type: @@ -593,32 +591,27 @@ The installer will quit and all changes will be lost. Si&ze: - - MB - MB - - - + En&crypt - + Logical Logical - + Primary Primary - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -831,7 +824,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -933,17 +926,22 @@ The installer will quit and all changes will be lost. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -971,7 +969,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -989,27 +987,27 @@ The installer will quit and all changes will be lost. Install %1 on <strong>new</strong> %2 system partition. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1027,18 +1025,33 @@ The installer will quit and all changes will be lost. &Restart now - + <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>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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1116,12 +1129,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. Set keyboard layout to %1/%2. @@ -1137,15 +1150,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting System locale setting - + 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>. 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1254,12 +1277,12 @@ The installer will quit and all changes will be lost. &Change... - + Set timezone to %1/%2.<br/> Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1330,17 +1353,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1389,7 +1412,6 @@ The installer will quit and all changes will be lost. What name do you want to use to log in? - @@ -1563,7 +1585,7 @@ The installer will quit and all changes will be lost. - + Are you sure you want to create a new partition table on %1? Are you sure you want to create a new partition table on %1? @@ -1586,82 +1608,82 @@ The installer will quit and all changes will be lost. Install %1 <strong>alongside</strong> another operating system. - + <strong>Erase</strong> disk and install %1. <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1680,22 +1702,22 @@ The installer will quit and all changes will be lost. Default - + unknown - + extended - + unformatted - + swap @@ -1718,64 +1740,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1783,55 +1805,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 Set password for user %1 - + Setting password for user %1. - + Bad destination system path. Bad destination system path. - + rootMountPoint is %1 rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. Cannot set password for user %1. - + usermod terminated with error code %1. usermod terminated with error code %1. @@ -2236,22 +2263,27 @@ The installer will quit and all changes will be lost. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts index 9302d44d3..0ae26c8da 100644 --- a/lang/calamares_es.ts +++ b/lang/calamares_es.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Selecciona la partición a reducir: - - - - Allocate drive space by dragging the divider below: - Asignar espacio en el disco arrastrando el separador de abajo: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Con esta operación, la partición <strong>%1</strong> que contiene %4 será reducida a %2MB y una nueva partición de %3MB será creada para %5 - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - No se puede encontrar en el sistema una partición EFI. Por favor vuelva a atrás y use el particionamiento manual para configurar %1. - - - - The EFI system partition at %1 will be used for starting %2. - La partición EFI en %1 será usada para iniciar %2. - - - - EFI system partition: - Partición del sistema EFI: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. El <strong>entorno de arranque<strong> de este sistema.<br><br>Los sistemas x86 sólo soportan <strong>BIOS</strong>.<br>Los sistemas modernos habitualmente usan <strong>EFI</strong>, pero también pueden mostrarse como BIOS si se inician en modo de compatibildiad. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Este sistema se inició con un entorno de arranque <strong>EFI</strong>.<br><br>Para configurar el arranque desde un entorno EFI, este instalador debe desplegar una aplicación de gestor de arranque, como <strong>GRUB</strong> o <strong>systemd-boot</strong> en una <strong>Partición de Sistema EFI</strong>. Esto es automático, a menos que escoja particionamiento manual, en cuyo caso debe escogerlo o crearlo usted mismo. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Este sistema fue iniciado con un entorno de arranque <strong>BIOS</strong>.<br><br> Para configurar el arranque desde un entorno BIOS, este instalador debe instalar un gestor de arranque, como <strong>GRUB</strong>, tanto al principio de una partición o en el <strong>Master Boot Record</strong> (registro maestro de arranque) cerca del principio de la tabla de partición (preferentemente). Esto es automático, a menos que escoja particionamiento manual, en cuayo caso debe establecerlo usted mismo. @@ -222,32 +189,32 @@ Salida: Calamares::PythonJob - + Running %1 operation. Ejecutando %1 operación. - + Bad working directory path Error en la ruta del directorio de trabajo - + Working directory %1 for python job %2 is not readable. El directorio de trabajo %1 para el script de python %2 no se puede leer. - + Bad main script file Script principal erróneo - + Main script file %1 for python job %2 is not readable. El script principal %1 del proceso python %2 no es accesible. - + Boost.Python error in job "%1". Error Boost.Python en el proceso "%1". @@ -255,65 +222,91 @@ Salida: Calamares::ViewManager - + &Back &Atrás - + &Next &Siguiente - - + + &Cancel &Cancelar - + + + Cancel installation without changing the system. + Cancelar instalación sin cambiar el sistema. + + + Cancel installation? ¿Cancelar la instalación? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. ¿Realmente quiere cancelar el proceso de instalación? Saldrá del instalador y se perderán todos los cambios. - + + &Yes + &Sí + + + + &No + &No + + + + &Close + &Cerrar + + + Continue with setup? ¿Continuar con la configuración? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> El instalador %1 va a realizar cambios en su disco para instalar %2.<br/><strong>No podrá deshacer estos cambios.</strong> - + &Install now &Instalar ahora - + Go &back Regresar - - &Quit - &Salir + + &Done + &Hecho - + + The installation is complete. Close the installer. + La instalación se ha completado. Cierre el instalador. + + + Error Error - + Installation Failed Error en la Instalación @@ -344,12 +337,12 @@ Saldrá del instalador y se perderán todos los cambios. CalamaresWindow - + %1 Installer %1 Instalador - + Show debug information Mostrar información de depuración. @@ -370,7 +363,7 @@ Saldrá del instalador y se perderán todos los cambios. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Este ordenador no cumple los requisitos mínimos para la instalación. %1.<br/>La instalación no puede continuar. <a href="#details">Detalles...</a> @@ -380,17 +373,17 @@ Saldrá del instalador y se perderán todos los cambios. Este ordenador no cumple alguno de los requisitos recomendados para la instalación %1.<br/>La instalación puede continuar, pero algunas funcionalidades podrían ser deshabilitadas. - + This program will ask you some questions and set up %2 on your computer. El programa le preguntará algunas cuestiones y configurará %2 en su ordenador. - + For best results, please ensure that this computer: Para obtener los mejores resultados, por favor asegúrese que este ordenador: - + System requirements Requisitos del sistema @@ -403,35 +396,35 @@ Saldrá del instalador y se perderán todos los cambios. Formulario - + After: Despues: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Particionado manual </strong><br/> Usted puede crear o cambiar el tamaño de las particiones usted mismo. - + Boot loader location: Ubicación del cargador de arranque: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 se contraerá a %2 MB y se creará una nueva partición de %3 MB para %4. - + Select storage de&vice: Seleccionar dispositivo de almacenamiento: - - - - + + + + Current: Corriente @@ -441,71 +434,71 @@ Saldrá del instalador y se perderán todos los cambios. Volver a usar %1 como partición home para %2 - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Seleccione una partición para reducir el tamaño, a continuación, arrastre la barra inferior para cambiar el tamaño</strong> - + <strong>Select a partition to install on</strong> <strong>Seleccione una partición para instalar en</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. No se puede encontrar una partición de sistema EFI en ningún lugar de este sistema. Por favor, vuelva y use el particionamiento manual para establecer %1. - + The EFI system partition at %1 will be used for starting %2. La partición de sistema EFI en %1 se usará para iniciar %2. - + EFI system partition: Partición del sistema EFI: - + 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. Este dispositivo de almacenamiento no parece tener un sistema operativo en él. ¿Qué quiere hacer?<br/>Podrá revisar y confirmar sus elecciones antes de que se haga cualquier cambio en el dispositivo de almacenamiento. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Borrar disco</strong><br/>Esto <font color="red">borrará</font> todos los datos presentes actualmente en el dispositivo de almacenamiento. - + 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 se encuentra instalado en este dispositivo de almacenamiento. ¿Qué desea hacer?<br/>Podrá revisar y confirmar su elección antes de que cualquier cambio se haga efectivo en el dispositivo de almacenamiento. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instalar junto al otro SO</strong><br/>El instalador reducirá la partición del SO existente para tener espacio para instalar %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Reemplazar una partición</strong><br/>Reemplazar una partición con %1. - + This storage device already has 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. Este dispositivo de almacenamiento parece que ya tiene un sistema operativo instalado en él. ¿Qué desea hacer?<br/>Podrá revisar y confirmar su elección antes de que cualquier cambio se haga efectivo en el dispositivo de almacenamiento. - + This storage device has multiple operating systems 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. Este dispositivo de almacenamiento contiene múltiples sistemas operativos instalados en él. ¿Qué desea hacer?<br/>Podrá revisar y confirmar su elección antes de que cualquier cambio se haga efectivo en el dispositivo de almacenamiento. @@ -531,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. @@ -558,6 +551,11 @@ Saldrá del instalador y se perderán todos los cambios. Create a Partition Crear partición + + + MiB + MiB + Partition &Type: @@ -594,32 +592,27 @@ Saldrá del instalador y se perderán todos los cambios. &Tamaño: - - MB - MB - - - + En&crypt &Cifrar - + Logical Lógica - + Primary Primaria - + GPT GPT - + Mountpoint already in use. Please select another one. Punto de montaje ya en uso. Por favor, seleccione otro. @@ -832,7 +825,7 @@ Saldrá del instalador y se perderán todos los cambios. DeviceInfoWidget - + 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. El tipo de <strong>tabla de particiones</strong> en el dispositivo de almacenamiento seleccionado.<br/><br/>La única forma de cambiar el tipo de la tabla de particiones es borrando y creando la tabla de particiones de nuevo, lo cual destruirá todos los datos almacenados en el dispositivo de almacenamiento.<br/>Este instalador mantendrá la tabla de particiones actual salvo que explícitamente se indique lo contrario.<br/>En caso de dudas, GPT es preferible en sistemas modernos. @@ -934,17 +927,22 @@ Saldrá del instalador y se perderán todos los cambios. &Tamaño: - + + MiB + MiB + + + Fi&le System: S&istema de archivo: - + Flags: Banderas: - + Mountpoint already in use. Please select another one. Punto de montaje ya en uso. Por favor, seleccione otro. @@ -972,7 +970,7 @@ Saldrá del instalador y se perderán todos los cambios. Confirmar frase-contraseña - + Please enter the same passphrase in both boxes. Por favor, introduzca la misma frase-contraseña en ambos recuadros. @@ -990,27 +988,27 @@ Saldrá del instalador y se perderán todos los cambios. Instalar %1 en <strong>nuevo</strong> %2 partición del sistema. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Configurar <strong>nueva</strong> %2 partición con punto de montaje <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Instalar %2 en %3 partición del sistema <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Configurar %3 partición <strong>%1</strong> con punto de montaje <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Instalar gestor de arranque en <strong>%1</strong>. - + Setting up mount points. Configurando puntos de montaje. @@ -1028,18 +1026,33 @@ Saldrá del instalador y se perderán todos los cambios. &Reiniciar ahora - + <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>Listo.</h1><br/>%1 ha sido instalado en su equipo.<br/>Ahora puede reiniciar hacia su nuevo sistema, o continuar utilizando %2 Live. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>La instalación falló</h1><br/>%1 no se ha instalado en su equipo.<br/>El mensaje de error fue: %2. + FinishedViewStep - + Finish Finalizar + + + Installation Complete + Instalación completada + + + + The installation of %1 is complete. + Se ha completado la instalación de %1. + FormatPartitionJob @@ -1117,12 +1130,12 @@ Saldrá del instalador y se perderán todos los cambios. KeyboardPage - + Set keyboard model to %1.<br/> Establecer el modelo de teclado a %1.<br/> - + Set keyboard layout to %1/%2. Configurar la disposición de teclado a %1/%2. @@ -1138,15 +1151,25 @@ Saldrá del instalador y se perderán todos los cambios. LCLocaleDialog - + System locale setting Configuración regional del sistema. - + 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>. La configuración regional del sistema afecta al idioma y a al conjunto de caracteres para algunos elementos de interfaz de la linea de comandos.<br/>La configuración actual es <strong>%1</strong>. + + + &Cancel + &Cancelar + + + + &OK + &Aceptar + LicensePage @@ -1229,12 +1252,12 @@ Saldrá del instalador y se perderán todos los cambios. LocalePage - + The system language will be set to %1. El idioma del sistema se establecerá a %1. - + The numbers and dates locale will be set to %1. La localización de números y fechas se establecerá a %1. @@ -1255,12 +1278,12 @@ Saldrá del instalador y se perderán todos los cambios. &Cambiar... - + Set timezone to %1/%2.<br/> Configurar zona horaria a %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1331,17 +1354,17 @@ Saldrá del instalador y se perderán todos los cambios. NetInstallPage - + Name Nombre - + Description Descripción - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalación a través de la Red. (Desactivada: no se ha podido obtener una lista de paquetes, comprueba tu conexión a la red) @@ -1390,7 +1413,6 @@ Saldrá del instalador y se perderán todos los cambios. ¿Qué nombre desea usar para ingresar? - @@ -1564,7 +1586,7 @@ Saldrá del instalador y se perderán todos los cambios. Instalar gestor de arranque en: - + Are you sure you want to create a new partition table on %1? ¿Está seguro de querer crear una nueva tabla de particiones en %1? @@ -1587,82 +1609,82 @@ Saldrá del instalador y se perderán todos los cambios. Instalar %1 <strong>junto a</strong> otro sistema operativo. - + <strong>Erase</strong> disk and install %1. <strong>Borrar</strong> disco e instalar %1. - + <strong>Replace</strong> a partition with %1. <strong>Reemplazar</strong> una partición con %1. - + <strong>Manual</strong> partitioning. Particionamiento <strong>manual</strong>. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Instalar %1 <strong>junto a</strong> otro sistema operativo en disco <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Borrar</strong> disco <strong>%2</strong> (%3) e instalar %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Reemplazar</strong> una partición en disco <strong>%2</strong> (%3) con %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). Particionamiento <strong>manual</strong> en disco <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disco <strong>%1<strong> (%2) - + Current: Corriente - + After: Despúes: - + No EFI system partition configured No hay una partición del sistema EFI configurada - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. Una partición EFI del sistema es necesaria para empezar %1.<br/><br/>Para configurar una partición EFI, vuelva atrás y seleccione crear un sistema de archivos FAT32 con el argumento <strong>esp</strong> activado y montada en <strong>%2</strong>.<br/><br/>Puede continuar sin configurar una partición EFI pero su sistema puede fallar al arrancar. - + EFI system partition flag not set Bandera EFI no establecida en la partición del sistema - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. Una partición EFI del sistema es necesaria para empezar %1.<br/><br/>Una partición EFI fue configurada para ser montada en <strong>%2</strong> pero su argumento <strong>esp</strong> no fue seleccionado.<br/>Para activar el argumento, vuelva atrás y edite la partición.<br/><br/>Puede continuar sin configurar el argumento pero su sistema puede fallar al arrancar. - + Boot partition not encrypted Partición de arranque no cifrada - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Se estableció una partición de arranque aparte junto con una partición raíz cifrada, pero la partición de arranque no está cifrada.<br/><br/>Hay consideraciones de seguridad con esta clase de instalación, porque los ficheros de sistema importantes se mantienen en una partición no cifrada.<br/>Puede continuar si lo desea, pero el desbloqueo del sistema de ficheros ocurrirá más tarde durante el arranque del sistema.<br/>Para cifrar la partición de arranque, retroceda y vuelva a crearla, seleccionando <strong>Cifrar</strong> en la ventana de creación de la partición. @@ -1681,22 +1703,22 @@ Saldrá del instalador y se perderán todos los cambios. Por defecto - + unknown desconocido - + extended extendido - + unformatted sin formato - + swap swap @@ -1719,64 +1741,64 @@ Saldrá del instalador y se perderán todos los cambios. Seleccione dónde instalar %1<br/><font color="red">Atención: </font>esto borrará todos sus archivos en la partición seleccionada. - + The selected item does not appear to be a valid partition. El elemento seleccionado no parece ser una partición válida. - + %1 cannot be installed on empty space. Please select an existing partition. %1 no se puede instalar en el espacio vacío. Por favor, seleccione una partición existente. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 no se puede instalar en una partición extendida. Por favor, seleccione una partición primaria o lógica existente. - + %1 cannot be installed on this partition. %1 no se puede instalar en esta partición. - + Data partition (%1) Partición de datos (%1) - + Unknown system partition (%1) Partición desconocida del sistema (%1) - + %1 system partition (%2) %1 partición del sistema (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>La partición %1 es demasiado pequeña para %2. Por favor, seleccione una participación con capacidad para al menos %3 GiB. - + <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/>No se puede encontrar una partición de sistema EFI en ninguna parte de este sistema. Por favor, retroceda y use el particionamiento manual para establecer %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 se instalará en %2.<br/><font color="red">Advertencia: </font>Todos los datos en la partición %2 se perderán. - + The EFI system partition at %1 will be used for starting %2. La partición del sistema EFI en %1 se utilizará para iniciar %2. - + EFI system partition: Partición del sistema EFI: @@ -1784,55 +1806,60 @@ Saldrá del instalador y se perderán todos los cambios. RequirementsChecker - + Gathering system information... Obteniendo información del sistema... - + has at least %1 GB available drive space tiene al menos %1 GB espacio libre en el disco - + There is not enough drive space. At least %1 GB is required. No hay suficiente espació en el disco duro. Se requiere al menos %1 GB libre. - + has at least %1 GB working memory tiene al menos %1 GB de memoria. - + The system does not have enough working memory. At least %1 GB is required. El sistema no tiene suficiente memoria. Se requiere al menos %1 GB - + is plugged in to a power source esta conectado a una fuente de alimentación - + The system is not plugged in to a power source. El sistema no esta conectado a una fuente de alimentación. - + is connected to the Internet esta conectado a Internet - + The system is not connected to the Internet. El sistema no esta conectado a Internet - + The installer is not running with administrator rights. El instalador no esta ejecutándose con permisos de administrador. + + + The screen is too small to display the installer. + La pantalla es demasiado pequeña para mostrar el instalador. + ResizeFileSystemJob @@ -2068,42 +2095,42 @@ Saldrá del instalador y se perderán todos los cambios. SetPasswordJob - + Set password for user %1 Definir contraseña para el usuario %1. - + Setting password for user %1. Configurando contraseña para el usuario %1. - + Bad destination system path. Destino erróneo del sistema. - + rootMountPoint is %1 El punto de montaje de la raíz es %1 - + Cannot disable root account. No se puede deshabilitar la cuenta root - + passwd terminated with error code %1. passwd finalizó con el código de error %1. - + Cannot set password for user %1. No se puede definir contraseña para el usuario %1. - + usermod terminated with error code %1. usermod ha terminado con el código de error %1 @@ -2237,22 +2264,27 @@ Saldrá del instalador y se perderán todos los cambios. &Acerca de - + <h1>Welcome to the %1 installer.</h1> <h1>Bienvenido al instalador %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Bienvenido al instalador de Calamares para %1.</h1> + + + About %1 installer Acerca del instalador %1 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Gracias a: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg y al <a href="https://www.transifex.com/calamares/calamares/">el equipo de traductores de Calamares</a>.<br/><br/>El desarrollo de <a href="http://calamares.io/">Calamares</a> está patrocinado por <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberando Software. + + <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/>para %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/>Agradecimientos a: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg y el <a href="https://www.transifex.com/calamares/calamares/">equipo de traductores de Calamares</a>.<br/><br/>El desarrollo de <a href="http://calamares.io/">Calamares</a> está patrocinado por: <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberando Software. - + %1 support %1 ayuda diff --git a/lang/calamares_es_ES.ts b/lang/calamares_es_ES.ts index 2bfd52582..364d9d685 100644 --- a/lang/calamares_es_ES.ts +++ b/lang/calamares_es_ES.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Elige la partición a reducir: - - - - Allocate drive space by dragging the divider below: - Asigna el espacio de disco moviendo el separado de debajo: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Con esta operación la partición <strong>%1</strong> que tiene %4 se va a reducir a %2MB y se va a crear una nueva partición de %3MB para %5 - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -221,32 +188,32 @@ Salida: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path Ruta de trabajo errónea - + Working directory %1 for python job %2 is not readable. No se puede leer la ruta de trabajo %1 de la tarea %2 de python. - + Bad main script file Script principal erróneo - + Main script file %1 for python job %2 is not readable. No se puede leer el script principal %1 de la tarea %2 de python. - + Boost.Python error in job "%1". Error de Boost.Python en la tarea "%1". @@ -254,65 +221,91 @@ Salida: Calamares::ViewManager - + &Back &Atrás - + &Next &Siguiente - - + + &Cancel &Cancelar - + + + Cancel installation without changing the system. + + + + Cancel installation? ¿Cancelar instalación? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. ¿Estás seguro de que quieres cancelar la instalación en curso? El instalador se cerrará y se perderán todos los cambios. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? ¿Continuar con la configuración? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now &Instalar ahora - + Go &back Volver atrás. - - &Quit - &Salir + + &Done + - + + The installation is complete. Close the installer. + + + + Error Error - + Installation Failed La instalación ha fallado @@ -343,12 +336,12 @@ El instalador se cerrará y se perderán todos los cambios. CalamaresWindow - + %1 Installer Instalador %1 - + Show debug information Mostrar la información de depuración @@ -369,7 +362,7 @@ El instalador se cerrará y se perderán todos los cambios. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -379,17 +372,17 @@ El instalador se cerrará y se perderán todos los cambios. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -402,35 +395,35 @@ El instalador se cerrará y se perderán todos los cambios. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -440,71 +433,71 @@ El instalador se cerrará y se perderán todos los cambios. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -530,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. @@ -557,6 +550,11 @@ El instalador se cerrará y se perderán todos los cambios. Create a Partition Crear una partición + + + MiB + + Partition &Type: @@ -593,32 +591,27 @@ El instalador se cerrará y se perderán todos los cambios. Tamaño - - MB - MB - - - + En&crypt - + Logical Logica - + Primary Primaria - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -831,7 +824,7 @@ El instalador se cerrará y se perderán todos los cambios. DeviceInfoWidget - + 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. @@ -933,17 +926,22 @@ El instalador se cerrará y se perderán todos los cambios. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -971,7 +969,7 @@ El instalador se cerrará y se perderán todos los cambios. - + Please enter the same passphrase in both boxes. @@ -989,27 +987,27 @@ El instalador se cerrará y se perderán todos los cambios. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Instalar el cargador de arranque en <strong>%1</strong> - + Setting up mount points. @@ -1027,18 +1025,33 @@ El instalador se cerrará y se perderán todos los cambios. &Reiniciar ahora - + <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. Hecho. %1 ha sido instalado en tu ordenador. Puedes reiniciar el nuevo sistema, o continuar en el modo %2 Live. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1116,12 +1129,12 @@ El instalador se cerrará y se perderán todos los cambios. KeyboardPage - + Set keyboard model to %1.<br/> Establecer el modelo de teclado a %1.<br/> - + Set keyboard layout to %1/%2. Establecer la disposición del teclado a %1/%2. @@ -1137,15 +1150,25 @@ El instalador se cerrará y se perderán todos los cambios. LCLocaleDialog - + System locale setting Ajustar configuración local - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ El instalador se cerrará y se perderán todos los cambios. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1254,12 +1277,12 @@ El instalador se cerrará y se perderán todos los cambios. &Cambiar - + Set timezone to %1/%2.<br/> Establecer la zona horaria a %1%2. <br/> - + %1 (%2) Language (Country) @@ -1330,17 +1353,17 @@ El instalador se cerrará y se perderán todos los cambios. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1389,7 +1412,6 @@ El instalador se cerrará y se perderán todos los cambios. ¿Qué nombre quieres usar para acceder al sistema? - @@ -1563,7 +1585,7 @@ El instalador se cerrará y se perderán todos los cambios. - + Are you sure you want to create a new partition table on %1? ¿Estás seguro de que quieres crear una nueva tabla de particiones en %1? @@ -1586,82 +1608,82 @@ El instalador se cerrará y se perderán todos los cambios. Instalar %1 <strong>junto con</strong> otro sistema operativo. - + <strong>Erase</strong> disk and install %1. <strong>Borrar</strong> el disco e instalar %1. - + <strong>Replace</strong> a partition with %1. <strong>Reemplazar</strong> una parición con %1. - + <strong>Manual</strong> partitioning. Particionamiento <strong>manual</strong>. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Instalar %1 <strong>junto con</strong> otro sistema operativo en el disco <strong>%2</strong>(%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Borrar</strong> el disco <strong>%2<strong> (%3) e instalar %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Reemplazar</strong> una parición en el disco <strong>%2</strong> (%3) con %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). Particionar <strong>manualmente</strong> el disco <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disco <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1680,22 +1702,22 @@ El instalador se cerrará y se perderán todos los cambios. Por defecto - + unknown - + extended - + unformatted - + swap @@ -1718,64 +1740,64 @@ El instalador se cerrará y se perderán todos los cambios. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1783,55 +1805,60 @@ El instalador se cerrará y se perderán todos los cambios. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ El instalador se cerrará y se perderán todos los cambios. SetPasswordJob - + Set password for user %1 Establecer contraseña del usuario %1 - + Setting password for user %1. - + Bad destination system path. El destino de la ruta del sistema es errónea. - + rootMountPoint is %1 El punto de montaje de root es %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. No se puede establecer la contraseña del usuario %1. - + usermod terminated with error code %1. usermod ha terminado con el código de error %1. @@ -2236,22 +2263,27 @@ El instalador se cerrará y se perderán todos los cambios. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts index 1f35fb235..5b54af656 100644 --- a/lang/calamares_es_MX.ts +++ b/lang/calamares_es_MX.ts @@ -1,52 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Escoja la partición a reducir - - - - Allocate drive space by dragging the divider below: - Asignar el espacio en disco moviendo el separador de debajo: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Con esta operación, la partición <strong>%1</strong>, que contiene %4 será reducida a %2MB y una nueva partición de %3MB será creada para %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - No se puede encontrar en el sistema una partición EFI. Por favor vuelva atrás y use el particionamiento manual para configurar %1. - - - - The EFI system partition at %1 will be used for starting %2. - La partición EFI en %1 será usada para iniciar %2. - - - - - EFI system partition: - Partición de sistema EFI: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -222,32 +188,32 @@ Salida: Calamares::PythonJob - + Running %1 operation. Ejecutando operación %1. - + Bad working directory path Ruta a la carpeta de trabajo errónea - + Working directory %1 for python job %2 is not readable. La carpeta de trabajo %1 para la tarea de python %2 no se pudo leer. - + Bad main script file Script principal erróneo - + Main script file %1 for python job %2 is not readable. El script principal %1 del proceso python %2 no es accesible. - + Boost.Python error in job "%1". Error Boost.Python en el proceso "%1". @@ -255,65 +221,91 @@ Salida: Calamares::ViewManager - + &Back &Atrás - + &Next &Siguiente - - + + &Cancel &Cancelar - + + + Cancel installation without changing the system. + + + + Cancel installation? Cancelar la instalación? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Realmente desea cancelar el proceso de instalación actual? El instalador terminará y se perderán todos los cambios. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? Continuar con la instalación? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> El instalador %1 va a realizar cambios en su disco para instalar %2.<br/><strong>No podrá deshacer estos cambios.</strong> - + &Install now &Instalar ahora - + Go &back &Regresar - - &Quit - &Salir + + &Done + - + + The installation is complete. Close the installer. + + + + Error Error - + Installation Failed Instalación Fallida @@ -344,12 +336,12 @@ El instalador terminará y se perderán todos los cambios. CalamaresWindow - + %1 Installer %1 Instalador - + Show debug information Mostrar información de depuración @@ -370,7 +362,7 @@ El instalador terminará y se perderán todos los cambios. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Este equipo no cumple los requisitos mínimos para la instalación. %1.<br/>La instalación no puede continuar. <a href="#details">Detalles...</a> @@ -380,18 +372,18 @@ El instalador terminará y se perderán todos los cambios. Este equipo no cumple alguno de los requisitos recomendados para la instalación %1.<br/>La instalación puede continuar, pero algunas funcionalidades podrían ser deshabilitadas. - + This program will ask you some questions and set up %2 on your computer. El programa le hará algunas preguntas y configurará %2 en su ordenador. - + For best results, please ensure that this computer: Para mejores resultados, por favor verifique que esta computadora: - + System requirements Requisitos de sistema @@ -404,35 +396,35 @@ El instalador terminará y se perderán todos los cambios. Formulario - + After: Después: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Particionado manual </strong><br/> Puede crear o cambiar el tamaño de las particiones usted mismo. - + Boot loader location: Ubicación del cargador de arranque: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: Seleccionar dispositivo de almacenamiento: - - - - + + + + Current: Actual: @@ -442,71 +434,71 @@ El instalador terminará y se perderán todos los cambios. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Seleccione una partición para reducir el tamaño, a continuación, arrastre la barra inferior para redimencinar</strong> - + <strong>Select a partition to install on</strong> <strong>Seleccione una partición para instalar</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -533,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. @@ -560,6 +552,11 @@ El instalador terminará y se perderán todos los cambios. Create a Partition Crear partición + + + MiB + + Partition &Type: @@ -596,32 +593,27 @@ El instalador terminará y se perderán todos los cambios. &Tamaño: - - MB - MB - - - + En&crypt - + Logical Lógica - + Primary Primaria - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -834,7 +826,7 @@ El instalador terminará y se perderán todos los cambios. DeviceInfoWidget - + 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. @@ -936,17 +928,22 @@ El instalador terminará y se perderán todos los cambios. Tam&año: - + + MiB + + + + Fi&le System: Sis&tema de Archivos: - + Flags: - + Mountpoint already in use. Please select another one. @@ -974,7 +971,7 @@ El instalador terminará y se perderán todos los cambios. - + Please enter the same passphrase in both boxes. @@ -992,27 +989,27 @@ El instalador terminará y se perderán todos los cambios. Instalar %1 en <strong>nueva</strong> partición de sistema %2. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Configurar <strong>nueva</strong> %2 partición con punto de montaje <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Instalar %2 en %3 partición del sistema <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Configurar %3 partición <strong>%1</strong> con punto de montaje <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Instalar el cargador de arranque en <strong>%1</strong>. - + Setting up mount points. Configurando puntos de montaje. @@ -1030,18 +1027,33 @@ El instalador terminará y se perderán todos los cambios. &Reiniciar ahora - + <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>Listo.</h1><br/>%1 ha sido instalado en su computadora.<br/>Ahora puede reiniciar su nuevo sistema, o continuar usando el entorno Live %2. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish Terminado + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1119,12 +1131,12 @@ El instalador terminará y se perderán todos los cambios. KeyboardPage - + Set keyboard model to %1.<br/> Ajustar el modelo de teclado a %1.<br/> - + Set keyboard layout to %1/%2. Ajustar teclado a %1/%2. @@ -1140,15 +1152,25 @@ El instalador terminará y se perderán todos los cambios. LCLocaleDialog - + System locale setting Configuración de localización del sistema - + 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>. La configuración regional del sistema afecta al idioma y a al conjunto de caracteres para algunos elementos de interfaz de la linea de comandos.<br/>La configuración actual es <strong>%1</strong>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1231,12 +1253,12 @@ El instalador terminará y se perderán todos los cambios. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1257,12 +1279,12 @@ El instalador terminará y se perderán todos los cambios. &Cambiar... - + Set timezone to %1/%2.<br/> Definir la zona horaria como %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1333,17 +1355,17 @@ El instalador terminará y se perderán todos los cambios. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1392,7 +1414,6 @@ El instalador terminará y se perderán todos los cambios. ¿Qué nombre desea usar para acceder al sistema? - @@ -1566,7 +1587,7 @@ El instalador terminará y se perderán todos los cambios. - + Are you sure you want to create a new partition table on %1? ¿Está seguro de querer crear una nueva tabla de particiones en %1? @@ -1589,82 +1610,82 @@ El instalador terminará y se perderán todos los cambios. Instalar %1 <strong>junto con</strong> otro sistema operativo. - + <strong>Erase</strong> disk and install %1. <strong>Borrar</strong> el disco e instalar %1. - + <strong>Replace</strong> a partition with %1. <strong>Reemplazar</strong> una parición con %1. - + <strong>Manual</strong> partitioning. Particionamiento <strong>manual</strong>. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Instalar %1 <strong>junto con</strong> otro sistema operativo en el disco <strong>%2</strong>(%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Borrar</strong> el disco <strong>%2<strong> (%3) e instalar %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Reemplazar</strong> una parición en el disco <strong>%2</strong> (%3) con %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). Particionar <strong>manualmente</strong> el disco <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disco <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1683,22 +1704,22 @@ El instalador terminará y se perderán todos los cambios. Por defecto - + unknown - + extended - + unformatted - + swap @@ -1721,64 +1742,64 @@ El instalador terminará y se perderán todos los cambios. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1786,55 +1807,60 @@ El instalador terminará y se perderán todos los cambios. RequirementsChecker - + Gathering system information... Obteniendo información del sistema... - + has at least %1 GB available drive space tiene al menos %1 GB de espacio en disco disponible - + There is not enough drive space. At least %1 GB is required. No hay suficiente espacio disponible en disco. Se requiere al menos %1 GB. - + has at least %1 GB working memory tiene al menos %1 GB de memoria para trabajar - + The system does not have enough working memory. At least %1 GB is required. No hay suficiente espacio disponible en disco. Se requiere al menos %1 GB. - + is plugged in to a power source está conectado a una fuente de energía - + The system is not plugged in to a power source. El sistema no está conectado a una fuente de energía. - + is connected to the Internet está conectado a Internet - + The system is not connected to the Internet. El sistema no está conectado a Internet. - + The installer is not running with administrator rights. El instalador no se está ejecutando con privilegios de administrador. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2070,42 +2096,42 @@ El instalador terminará y se perderán todos los cambios. SetPasswordJob - + Set password for user %1 Definir contraseña para el usuario %1. - + Setting password for user %1. Configurando contraseña para el usuario %1. - + Bad destination system path. Destino erróneo del sistema. - + rootMountPoint is %1 El punto de montaje de root es %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. No se puede definir contraseña para el usuario %1. - + usermod terminated with error code %1. usermod ha terminado con el código de error %1 @@ -2239,22 +2265,27 @@ El instalador terminará y se perderán todos los cambios. &Acerca de - + <h1>Welcome to the %1 installer.</h1> <h1>Bienvenido al instalador de %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer Acerca del instalador %1 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support %1 Soporte diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts index 6aaf0a710..2c7adab8b 100644 --- a/lang/calamares_es_PR.ts +++ b/lang/calamares_es_PR.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Selecciona la partición a reducir: - - - - Allocate drive space by dragging the divider below: - Asignar el espacio en el disco arrastrando el separador a continuación: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -221,32 +188,32 @@ Salida: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path La ruta del directorio de trabajo es incorrecta - + Working directory %1 for python job %2 is not readable. El directorio de trabajo %1 para el script de python %2 no se puede leer. - + Bad main script file Script principal erróneo - + Main script file %1 for python job %2 is not readable. El script principal %1 del proceso python %2 no es accesible. - + Boost.Python error in job "%1". Error Boost.Python en el proceso "%1". @@ -254,64 +221,90 @@ Salida: Calamares::ViewManager - + &Back &Atrás - + &Next &Próximo - - + + &Cancel - + + + Cancel installation without changing the system. + + + + Cancel installation? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now - + Go &back - - &Quit - &Salir + + &Done + - + + The installation is complete. Close the installer. + + + + Error Error - + Installation Failed Falló la instalación @@ -342,12 +335,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer - + Show debug information @@ -368,7 +361,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -378,17 +371,17 @@ The installer will quit and all changes will be lost. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -401,35 +394,35 @@ The installer will quit and all changes will be lost. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -439,71 +432,71 @@ 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>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -529,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. @@ -556,6 +549,11 @@ The installer will quit and all changes will be lost. Create a Partition + + + MiB + + Partition &Type: @@ -592,32 +590,27 @@ The installer will quit and all changes will be lost. - - MB - - - - + En&crypt - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -830,7 +823,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -932,17 +925,22 @@ The installer will quit and all changes will be lost. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -970,7 +968,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -988,27 +986,27 @@ The installer will quit and all changes will be lost. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1026,18 +1024,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1115,12 +1128,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1136,15 +1149,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1227,12 +1250,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1253,12 +1276,12 @@ The installer will quit and all changes will be lost. - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1329,17 +1352,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1388,7 +1411,6 @@ The installer will quit and all changes will be lost. - @@ -1562,7 +1584,7 @@ The installer will quit and all changes will be lost. - + Are you sure you want to create a new partition table on %1? @@ -1585,82 +1607,82 @@ The installer will quit and all changes will be lost. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1679,22 +1701,22 @@ The installer will quit and all changes will be lost. - + unknown - + extended - + unformatted - + swap @@ -1717,64 +1739,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1782,55 +1804,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2066,42 +2093,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2235,22 +2262,27 @@ The installer will quit and all changes will be lost. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts index 159c76be9..18ac538fa 100644 --- a/lang/calamares_et.ts +++ b/lang/calamares_et.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - - - - - Allocate drive space by dragging the divider below: - - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -215,32 +182,32 @@ Output: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path - + Working directory %1 for python job %2 is not readable. - + Bad main script file - + Main script file %1 for python job %2 is not readable. - + Boost.Python error in job "%1". @@ -248,64 +215,90 @@ Output: Calamares::ViewManager - + &Back - + &Next - - + + &Cancel - + + + Cancel installation without changing the system. + + + + Cancel installation? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now - + Go &back - - &Quit + + &Done - + + The installation is complete. Close the installer. + + + + Error Viga - + Installation Failed @@ -336,12 +329,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer - + Show debug information @@ -362,7 +355,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -372,17 +365,17 @@ The installer will quit and all changes will be lost. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -395,35 +388,35 @@ The installer will quit and all changes will be lost. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -433,71 +426,71 @@ 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>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -523,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. @@ -550,6 +543,11 @@ The installer will quit and all changes will be lost. Create a Partition Loo sektsioon + + + MiB + + Partition &Type: @@ -586,32 +584,27 @@ The installer will quit and all changes will be lost. Suurus: - - MB - - - - + En&crypt - + Logical Loogiline köide - + Primary Peamine - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -824,7 +817,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -926,17 +919,22 @@ The installer will quit and all changes will be lost. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -964,7 +962,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -982,27 +980,27 @@ The installer will quit and all changes will be lost. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1020,18 +1018,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1109,12 +1122,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1130,15 +1143,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1221,12 +1244,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1247,12 +1270,12 @@ The installer will quit and all changes will be lost. - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1323,17 +1346,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1382,7 +1405,6 @@ The installer will quit and all changes will be lost. - @@ -1556,7 +1578,7 @@ The installer will quit and all changes will be lost. - + Are you sure you want to create a new partition table on %1? @@ -1579,82 +1601,82 @@ The installer will quit and all changes will be lost. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1673,22 +1695,22 @@ The installer will quit and all changes will be lost. - + unknown - + extended - + unformatted - + swap @@ -1711,64 +1733,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1776,55 +1798,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2060,42 +2087,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2229,22 +2256,27 @@ The installer will quit and all changes will be lost. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts index 52adb86f0..845f87100 100644 --- a/lang/calamares_eu.ts +++ b/lang/calamares_eu.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Hautatu txikitu nahi duzun partizioa: - - - - Allocate drive space by dragging the divider below: - Disko-espazioa esleitu beheko barra mugituz: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Eragiketa honekin, %4 daukan <strong>%1<strong> partizioa %2MB-ra txikituko da, eta %3MB-tako partizio berri bat sortuko da %5-(e)rako. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - EFI sistema-partizioa: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -219,32 +186,32 @@ Output: Calamares::PythonJob - + Running %1 operation. %1 eragiketa burutzen. - + Bad working directory path Direktorio ibilbide ezegokia - + Working directory %1 for python job %2 is not readable. - + 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 - + Boost.Python error in job "%1". @@ -252,64 +219,90 @@ Output: Calamares::ViewManager - + &Back &Atzera - + &Next &Hurrengoa - - + + &Cancel &Utzi - + + + Cancel installation without changing the system. + Instalazioa bertan behera utsi da sisteman aldaketarik gabe. + + + Cancel installation? Bertan behera utzi instalazioa? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + + &Yes + &Bai + + + + &No + &Ez + + + + &Close + &Itxi + + + Continue with setup? Ezarpenarekin jarraitu? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now &Instalatu orain - + Go &back &Atzera - - &Quit - &Itxi + + &Done + E&ginda - + + The installation is complete. Close the installer. + Instalazioa burutu da. Itxi instalatzailea. + + + Error Akatsa - + Installation Failed Instalazioak huts egin du @@ -340,12 +333,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer %1 Instalatzailea - + Show debug information @@ -366,7 +359,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -376,17 +369,17 @@ The installer will quit and all changes will be lost. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: Emaitza egokienak lortzeko, ziurtatu ordenagailu honek baduela: - + System requirements Sistemaren betebeharrak @@ -399,109 +392,109 @@ 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: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: - + Unekoa: Reuse %1 as home partition for %2. - + Berrerabili %1 home partizio bezala %2rentzat. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + <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: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -527,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. @@ -554,6 +547,11 @@ The installer will quit and all changes will be lost. Create a Partition Sortu partizio bat + + + MiB + + Partition &Type: @@ -590,32 +588,27 @@ The installer will quit and all changes will be lost. Ta&maina: - - MB - MB - - - + En&crypt - + Logical Logikoa - + Primary Primarioa - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -828,7 +821,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -930,17 +923,22 @@ The installer will quit and all changes will be lost. &Tamaina: - + + MiB + + + + Fi&le System: Fi&txategi-Sistema: - + Flags: - + Mountpoint already in use. Please select another one. @@ -968,7 +966,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -986,27 +984,27 @@ The installer will quit and all changes will be lost. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Ezarri %2 partizio <strong>berria</strong> <strong>%1</strong> muntatze puntuarekin. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Ezarri %3 partizioa <strong>%1</strong> <strong>%2</strong> muntatze puntuarekin. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. Muntatze puntuak ezartzen. @@ -1024,18 +1022,33 @@ The installer will quit and all changes will be lost. &Berrabiarazi orain - + <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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish Bukatu + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1113,12 +1126,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1134,15 +1147,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1225,12 +1248,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1251,12 +1274,12 @@ The installer will quit and all changes will be lost. &Aldatu... - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1327,17 +1350,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1386,7 +1409,6 @@ The installer will quit and all changes will be lost. - @@ -1560,7 +1582,7 @@ The installer will quit and all changes will be lost. - + Are you sure you want to create a new partition table on %1? @@ -1583,82 +1605,82 @@ The installer will quit and all changes will be lost. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1677,22 +1699,22 @@ The installer will quit and all changes will be lost. Lehenetsia - + unknown - + extended - + unformatted - + swap @@ -1715,64 +1737,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1780,55 +1802,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... Sistemaren informazioa eskuratzen... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. Sistema ez dago indar iturri batetara konektatuta. - + is connected to the Internet Internetera konektatuta dago - + The system is not connected to the Internet. Sistema ez dago Internetera konektatuta. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2064,42 +2091,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 Ezarri %1 erabiltzailearen pasahitza - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 root Muntatze Puntua %1 da - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2233,22 +2260,27 @@ The installer will quit and all changes will be lost. Honi &buruz - + <h1>Welcome to the %1 installer.</h1> <h1>Ongi etorri %1 instalatzailera.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer %1 instalatzaileari buruz - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support %1 euskarria diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts index 59ffe1fed..35f45b757 100644 --- a/lang/calamares_fa.ts +++ b/lang/calamares_fa.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - - - - - Allocate drive space by dragging the divider below: - - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -215,32 +182,32 @@ Output: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path - + Working directory %1 for python job %2 is not readable. - + Bad main script file - + Main script file %1 for python job %2 is not readable. - + Boost.Python error in job "%1". @@ -248,64 +215,90 @@ Output: Calamares::ViewManager - + &Back - + &Next - - + + &Cancel - + + + Cancel installation without changing the system. + + + + Cancel installation? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now - + Go &back - - &Quit + + &Done - + + The installation is complete. Close the installer. + + + + Error - + Installation Failed @@ -336,12 +329,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer - + Show debug information @@ -362,7 +355,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -372,17 +365,17 @@ The installer will quit and all changes will be lost. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -395,35 +388,35 @@ The installer will quit and all changes will be lost. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -433,71 +426,71 @@ 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>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -523,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. @@ -550,6 +543,11 @@ The installer will quit and all changes will be lost. Create a Partition + + + MiB + + Partition &Type: @@ -586,32 +584,27 @@ The installer will quit and all changes will be lost. - - MB - - - - + En&crypt - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -824,7 +817,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -926,17 +919,22 @@ The installer will quit and all changes will be lost. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -964,7 +962,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -982,27 +980,27 @@ The installer will quit and all changes will be lost. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1020,18 +1018,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1109,12 +1122,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1130,15 +1143,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1221,12 +1244,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1247,12 +1270,12 @@ The installer will quit and all changes will be lost. - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1323,17 +1346,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1382,7 +1405,6 @@ The installer will quit and all changes will be lost. - @@ -1556,7 +1578,7 @@ The installer will quit and all changes will be lost. - + Are you sure you want to create a new partition table on %1? @@ -1579,82 +1601,82 @@ The installer will quit and all changes will be lost. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1673,22 +1695,22 @@ The installer will quit and all changes will be lost. - + unknown - + extended - + unformatted - + swap @@ -1711,64 +1733,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1776,55 +1798,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2060,42 +2087,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2229,22 +2256,27 @@ The installer will quit and all changes will be lost. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index 113c7c45b..56028b4eb 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Valitse osio jota supistetaan: - - - - Allocate drive space by dragging the divider below: - Jaa aseman tila raahaamalla alla olevaa jakajaa: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -221,32 +188,32 @@ Tuloste: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path Epäkelpo työskentelyhakemiston polku - + Working directory %1 for python job %2 is not readable. Työkansio %1 pythonin työlle %2 ei ole luettavissa. - + Bad main script file Huono pää-skripti tiedosto - + Main script file %1 for python job %2 is not readable. Pääskriptitiedosto %1 pythonin työlle %2 ei ole luettavissa. - + Boost.Python error in job "%1". Boost.Python virhe työlle "%1". @@ -254,65 +221,91 @@ Tuloste: Calamares::ViewManager - + &Back &Takaisin - + &Next &Seuraava - - + + &Cancel &Peruuta - + + + Cancel installation without changing the system. + + + + Cancel installation? Peruuta asennus? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Oletko varma että haluat peruuttaa käynnissä olevan asennusprosessin? Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now - + Go &back - - &Quit - &Lopeta + + &Done + - + + The installation is complete. Close the installer. + + + + Error Virhe - + Installation Failed Asennus Epäonnistui @@ -343,12 +336,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. CalamaresWindow - + %1 Installer %1 Asennusohjelma - + Show debug information @@ -369,7 +362,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -379,17 +372,17 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -402,35 +395,35 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -440,71 +433,71 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -530,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. @@ -557,6 +550,11 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Create a Partition Luo levyosio + + + MiB + + Partition &Type: @@ -593,32 +591,27 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. K&oko: - - MB - MB - - - + En&crypt - + Logical Looginen - + Primary Ensisijainen - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -831,7 +824,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. DeviceInfoWidget - + 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. @@ -933,17 +926,22 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -971,7 +969,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. - + Please enter the same passphrase in both boxes. @@ -989,27 +987,27 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1027,18 +1025,33 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. &Käynnistä uudelleen - + <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>Kaikki tehty.</h1><br/>%1 on asennettu tietokoneellesi.<br/>Voit joko uudelleenkäynnistää uuteen kokoonpanoosi, tai voit jatkaa %2 live-ympäristön käyttöä. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1116,12 +1129,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. KeyboardPage - + Set keyboard model to %1.<br/> Aseta näppäimiston malli %1.<br/> - + Set keyboard layout to %1/%2. Aseta näppäimiston asetelmaksi %1/%2. @@ -1137,15 +1150,25 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. LCLocaleDialog - + System locale setting Järjestelmän maa-asetus - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1254,12 +1277,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. &Vaihda... - + Set timezone to %1/%2.<br/> Aseta aikavyöhyke %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1330,17 +1353,17 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1389,7 +1412,6 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Mitä nimeä haluat käyttää sisäänkirjautumisessa? - @@ -1563,7 +1585,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. - + Are you sure you want to create a new partition table on %1? Oletko varma, että haluat luoda uuden osion %1? @@ -1586,82 +1608,82 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1680,22 +1702,22 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Oletus - + unknown - + extended - + unformatted - + swap @@ -1718,64 +1740,64 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1783,55 +1805,60 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. SetPasswordJob - + Set password for user %1 Aseta salasana käyttäjälle %1 - + Setting password for user %1. - + Bad destination system path. Huono kohteen järjestelmäpolku - + rootMountPoint is %1 rootMountPoint on %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. Salasanaa ei voi asettaa käyttäjälle %1. - + usermod terminated with error code %1. usermod päättyi virhekoodilla %1. @@ -2236,22 +2263,27 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts index d447a1f66..d44d8db40 100644 --- a/lang/calamares_fr.ts +++ b/lang/calamares_fr.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Choisir la partition à réduire : - - - - Allocate drive space by dragging the divider below: - Allouer l'espace disque en faisant glisser le séparateur ci-dessous : - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Avec cette opération, la partition <strong>%1</strong> qui contient %4 sera réduite à %2Mo et une nouvelle partition %3 sera créée pour %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Une partition système EFI est introuvable sur ce système. Merci de revenir en arrière et d'utiliser le partitionnement manuel pour configurer %1. - - - - The EFI system partition at %1 will be used for starting %2. - La partition système EFI à %1 sera utilisée pour démarrer %2. - - - - EFI system partition: - Partition système EFI: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. L'<strong>environnement de démarrage</strong> de ce système.<br><br>Les anciens systèmes x86 supportent uniquement le <strong>BIOS</strong>.<br>Les systèmes récents utilisent habituellement <strong>EFI</strong>, mais peuvent également exposer BIOS si démarré en mode de compatibilité. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Ce système a été initialisé avec un environnement de démarrage <strong>EFI</strong>.<br><br>Pour configurer le démarrage depuis un environnement EFI, cet installateur doit déployer un chargeur de démarrage, comme <strong>GRUB</strong> ou <strong>systemd-boot</strong> sur une <strong>partition système EFI</strong>. Ceci est automatique, à moins que vous n'ayez sélectionné le partitionnement manuel, auquel cas vous devez en choisir une ou la créer vous même. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Ce système a été initialisé avec un environnement de démarrage <strong>BIOS</strong>.<br><br>Pour configurer le démarrage depuis un environnement BIOS, cet installateur doit déployer un chargeur de démarrage, comme <strong>GRUB</strong> ou <strong>systemd-boot</strong> au début d'une partition ou bien sur le <strong>Master Boot Record</strong> au début de la table des partitions (méthode privilégiée). Ceci est automatique, à moins que vous n'ayez sélectionné le partitionnement manuel, auquel cas vous devez le configurer vous-même. @@ -221,32 +188,32 @@ Sortie : Calamares::PythonJob - + Running %1 operation. Exécution de l'opération %1. - + Bad working directory path Chemin du répertoire de travail invalide - + Working directory %1 for python job %2 is not readable. Le répertoire de travail %1 pour le job python %2 n'est pas accessible en lecture. - + Bad main script file Fichier de script principal invalide - + Main script file %1 for python job %2 is not readable. Le fichier de script principal %1 pour la tâche python %2 n'est pas accessible en lecture. - + Boost.Python error in job "%1". Erreur Boost.Python pour le job "%1". @@ -254,65 +221,91 @@ Sortie : Calamares::ViewManager - + &Back &Précédent - + &Next &Suivant - - + + &Cancel &Annuler - + + + Cancel installation without changing the system. + Annuler l'installation sans modifier votre système. + + + Cancel installation? Abandonner l'installation ? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Voulez-vous réellement abandonner le processus d'installation ? L'installateur se fermera et les changements seront perdus. - + + &Yes + &Oui + + + + &No + &Non + + + + &Close + &Fermer + + + Continue with setup? Poursuivre la configuration ? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> L'installateur %1 est sur le point de procéder aux changements sur le disque afin d'installer %2.<br/> <strong>Vous ne pourrez pas annulez ces changements.<strong> - + &Install now &Installer maintenant - + Go &back &Retour - - &Quit - &Quitter + + &Done + &Terminé - + + The installation is complete. Close the installer. + L'installation est terminée. Fermer l'installateur. + + + Error Erreur - + Installation Failed L'installation a échoué @@ -343,12 +336,12 @@ L'installateur se fermera et les changements seront perdus. CalamaresWindow - + %1 Installer Installateur %1 - + Show debug information Afficher les informations de dépannage @@ -369,7 +362,7 @@ L'installateur se fermera et les changements seront perdus. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Cet ordinateur ne satisfait pas les minimum prérequis pour installer %1.<br/>L'installation ne peut pas continuer. <a href="#details">Détails...</a> @@ -379,17 +372,17 @@ L'installateur se fermera et les changements seront perdus. Cet ordinateur ne satisfait pas certains des prérequis recommandés pour installer %1.<br/>L'installation peut continuer, mais certaines fonctionnalités pourraient être désactivées. - + This program will ask you some questions and set up %2 on your computer. Ce programme va vous poser quelques questions et installer %2 sur votre ordinateur. - + For best results, please ensure that this computer: Pour de meilleur résultats, merci de s'assurer que cet ordinateur : - + System requirements Prérequis système @@ -402,35 +395,35 @@ L'installateur se fermera et les changements seront perdus. Formulaire - + After: Après: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Partitionnement manuel</strong><br/>Vous pouvez créer ou redimensionner vous-même des partitions. - + Boot loader location: Emplacement du chargeur de démarrage: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 va être réduit à %2Mo et une nouvelle partition de %3Mo va être créée pour %4. - + Select storage de&vice: Sélectionnez le support de sto&ckage : - - - - + + + + Current: Actuel : @@ -440,71 +433,71 @@ L'installateur se fermera et les changements seront perdus. Réutiliser %1 comme partition home pour %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Sélectionnez une partition à réduire, puis faites glisser la barre du bas pour redimensionner</strong> - + <strong>Select a partition to install on</strong> <strong>Sélectionner une partition pour l'installation</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Une partition système EFI n'a pas pu être trouvée sur ce système. Veuillez retourner à l'étape précédente et sélectionner le partitionnement manuel pour configurer %1. - + The EFI system partition at %1 will be used for starting %2. La partition système EFI sur %1 va être utilisée pour démarrer %2. - + EFI system partition: Partition système EFI : - + 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. Ce périphérique de stockage ne semble pas contenir de système d'exploitation. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Effacer le disque</strong><br/>Ceci va <font color="red">effacer</font> toutes les données actuellement présentes sur le périphérique de stockage sélectionné. - + 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. Ce périphérique de stockage contient %1. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Installer à côté</strong><br/>L'installateur va réduire une partition pour faire de la place pour %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Remplacer une partition</strong><br>Remplace une partition par %1. - + This storage device already has 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. Ce périphérique de stockage contient déjà un système d'exploitation. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage. - + This storage device has multiple operating systems 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. Ce péiphérique de stockage contient déjà plusieurs systèmes d'exploitation. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage. @@ -530,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. @@ -557,6 +550,11 @@ L'installateur se fermera et les changements seront perdus. Create a Partition Créer une partition + + + MiB + Mio + Partition &Type: @@ -593,32 +591,27 @@ L'installateur se fermera et les changements seront perdus. Ta&ille : - - MB - Mo - - - + En&crypt Chi&ffrer - + Logical Logique - + Primary Primaire - + GPT GPT - + Mountpoint already in use. Please select another one. Le point de montage est déjà utilisé. Merci d'en sélectionner un autre. @@ -831,7 +824,7 @@ L'installateur se fermera et les changements seront perdus. DeviceInfoWidget - + 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. Le type de <strong>table de partitions</strong> sur le périphérique de stockage sélectionné.<br><br>Le seul moyen de changer le type de table de partitions est d'effacer et de recréer entièrement la table de partitions, ce qui détruit toutes les données sur le périphérique de stockage.<br>Cette installateur va conserver la table de partitions actuelle à moins de faire explicitement un autre choix.<br>Si vous n'êtes pas sûr, sur les systèmes modernes GPT est à privilégier. @@ -933,17 +926,22 @@ L'installateur se fermera et les changements seront perdus. Ta&ille: - + + MiB + Mio + + + Fi&le System: Sys&tème de fichiers: - + Flags: Drapeaux: - + Mountpoint already in use. Please select another one. Le point de montage est déjà utilisé. Merci d'en sélectionner un autre. @@ -971,7 +969,7 @@ L'installateur se fermera et les changements seront perdus. Confirmez la phrase de passe - + Please enter the same passphrase in both boxes. Merci d'entrer la même phrase de passe dans les deux champs. @@ -989,27 +987,27 @@ L'installateur se fermera et les changements seront perdus. Installer %1 sur le <strong>nouveau</strong> système de partition %2. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Configurer la <strong>nouvelle</strong> partition %2 avec le point de montage <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Installer %2 sur la partition système %3 <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Configurer la partition %3 <strong>%1</strong> avec le point de montage <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Installer le chargeur de démarrage sur <strong>%1</strong>. - + Setting up mount points. Configuration des points de montage. @@ -1027,18 +1025,33 @@ L'installateur se fermera et les changements seront perdus. &Redémarrer maintenant - + <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>Installation terminée.</h1><br/>%1 a été installé sur votre ordinateur.<br/>Vous pouvez redémarrer sur le nouveau système, ou continuer d'utiliser l'environnement actuel %2 . + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>Installation échouée</h1><br/>%1 n'a pas été installée sur cet ordinateur.<br/>Le message d'erreur était : %2. + FinishedViewStep - + Finish Terminer + + + Installation Complete + Installation terminée + + + + The installation of %1 is complete. + L'installation de %1 est terminée. + FormatPartitionJob @@ -1116,12 +1129,12 @@ L'installateur se fermera et les changements seront perdus. KeyboardPage - + Set keyboard model to %1.<br/> Configurer le modèle de clavier à %1.<br/> - + Set keyboard layout to %1/%2. Configurer la disposition clavier à %1/%2. @@ -1137,15 +1150,25 @@ L'installateur se fermera et les changements seront perdus. LCLocaleDialog - + System locale setting Paramètre régional - + 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>. Les paramètres régionaux systèmes affectent la langue et le jeu de caractère pour la ligne de commande et différents éléments d'interface.<br/>Le paramètre actuel est <strong>%1</strong>. + + + &Cancel + &Annuler + + + + &OK + &OK + LicensePage @@ -1228,12 +1251,12 @@ L'installateur se fermera et les changements seront perdus. LocalePage - + The system language will be set to %1. La langue du système sera réglée sur %1. - + The numbers and dates locale will be set to %1. Les nombres et les dates seront réglés sur %1. @@ -1254,12 +1277,12 @@ L'installateur se fermera et les changements seront perdus. &Modifier... - + Set timezone to %1/%2.<br/> Configurer le fuseau horaire à %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ L'installateur se fermera et les changements seront perdus. NetInstallPage - + Name Nom - + Description Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Installation par le réseau (Désactivée : impossible de récupérer leslistes de paquets, vérifiez la connexion réseau) @@ -1389,7 +1412,6 @@ L'installateur se fermera et les changements seront perdus. Quel nom souhaitez-vous utiliser pour la connexion ? - @@ -1563,7 +1585,7 @@ L'installateur se fermera et les changements seront perdus. Installer le chargeur de démarrage sur: - + Are you sure you want to create a new partition table on %1? Êtes-vous sûr de vouloir créer une nouvelle table de partitionnement sur %1 ? @@ -1586,82 +1608,82 @@ L'installateur se fermera et les changements seront perdus. Installer %1 <strong>à côté</strong>d'un autre système d'exploitation. - + <strong>Erase</strong> disk and install %1. <strong>Effacer</strong> le disque et installer %1. - + <strong>Replace</strong> a partition with %1. <strong>Remplacer</strong> une partition avec %1. - + <strong>Manual</strong> partitioning. Partitionnement <strong>manuel</strong>. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Installer %1 <strong>à côté</strong> d'un autre système d'exploitation sur le disque <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Effacer</strong> le disque <strong>%2</strong> (%3) et installer %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Remplacer</strong> une partition sur le disque <strong>%2</strong> (%3) avec %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). Partitionnement <strong>manuel</strong> sur le disque <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disque <strong>%1</strong> (%2) - + Current: Actuel : - + After: Après : - + No EFI system partition configured Aucune partition système EFI configurée - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. Une partition système EFI est nécessaire pour démarrer %1.<br/><br/>Pour configurer une partition système EFI, revenez en arrière et sélectionnez ou créez une partition FAT32 avec le drapeau <strong>esp</strong> activé et le point de montage <strong>%2</strong>.<br/><br/>Vous pouvez continuer sans configurer de partition système EFI mais votre système pourrait refuser de démarrer. - + EFI system partition flag not set Drapeau de partition système EFI non configuré - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. Une partition système EFI est nécessaire pour démarrer %1.<br/><br/>Une partition a été configurée avec le point de montage <strong>%2</strong> mais son drapeau <strong>esp</strong> n'est pas activé.<br/>Pour activer le drapeau, revenez en arrière et éditez la partition.<br/><br/>Vous pouvez continuer sans activer le drapeau mais votre système pourrait refuser de démarrer. - + Boot partition not encrypted Partition d'amorçage non chiffrée. - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Une partition d'amorçage distincte a été configurée avec une partition racine chiffrée, mais la partition d'amorçage n'est pas chiffrée. <br/> <br/> Il y a des problèmes de sécurité avec ce type d'installation, car des fichiers système importants sont conservés sur une partition non chiffrée <br/> Vous pouvez continuer si vous le souhaitez, mais le déverrouillage du système de fichiers se produira plus tard au démarrage du système. <br/> Pour chiffrer la partition d'amorçage, revenez en arrière et recréez-la, en sélectionnant <strong> Chiffrer </ strong> dans la partition Fenêtre de création. @@ -1680,22 +1702,22 @@ L'installateur se fermera et les changements seront perdus. Défaut - + unknown inconnu - + extended étendu - + unformatted non formaté - + swap swap @@ -1718,64 +1740,64 @@ L'installateur se fermera et les changements seront perdus. Sélectionnez ou installer %1.<br><font color="red">Attention: </font>ceci va effacer tous les fichiers sur la partition sélectionnée. - + The selected item does not appear to be a valid partition. L'objet sélectionné ne semble pas être une partition valide. - + %1 cannot be installed on empty space. Please select an existing partition. %1 ne peut pas être installé sur un espace vide. Merci de sélectionner une partition existante. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 ne peut pas être installé sur une partition étendue. Merci de sélectionner une partition primaire ou logique existante. - + %1 cannot be installed on this partition. %1 ne peut pas être installé sur cette partition. - + Data partition (%1) Partition de données (%1) - + Unknown system partition (%1) Partition système inconnue (%1) - + %1 system partition (%2) Partition système %1 (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>La partition %1 est trop petite pour %2. Merci de sélectionner une partition avec au moins %3 Gio de capacité. - + <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/>Une partition système EFI n'a pas pu être localisée sur ce système. Veuillez revenir en arrière et utiliser le partitionnement manuel pour configurer %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 va être installé sur %2.<br/><font color="red">Attention:</font> toutes les données sur la partition %2 seront perdues. - + The EFI system partition at %1 will be used for starting %2. La partition système EFI sur %1 sera utilisée pour démarrer %2. - + EFI system partition: Partition système EFI: @@ -1783,55 +1805,60 @@ L'installateur se fermera et les changements seront perdus. RequirementsChecker - + Gathering system information... Récupération des informations système... - + has at least %1 GB available drive space a au moins %1 Go d'espace disque disponible - + There is not enough drive space. At least %1 GB is required. Il n'y a pas assez d'espace disque. Au moins %1 Go sont requis. - + has at least %1 GB working memory a au moins %1 Go de mémoire vive - + The system does not have enough working memory. At least %1 GB is required. Le système n'a pas assez de mémoire vive. Au moins %1 Go sont requis. - + is plugged in to a power source est relié à une source de courant - + The system is not plugged in to a power source. Le système n'est pas relié à une source de courant. - + is connected to the Internet est connecté à Internet - + The system is not connected to the Internet. Le système n'est pas connecté à Internet. - + The installer is not running with administrator rights. L'installateur ne dispose pas des droits administrateur. + + + The screen is too small to display the installer. + L'écran est trop petit pour afficher l'installateur. + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ L'installateur se fermera et les changements seront perdus. SetPasswordJob - + Set password for user %1 Définir le mot de passe pour l'utilisateur %1 - + Setting password for user %1. Configuration du mot de passe pour l'utilisateur %1. - + Bad destination system path. Mauvaise destination pour le chemin système. - + rootMountPoint is %1 Le point de montage racine est %1 - + Cannot disable root account. Impossible de désactiver le compte root. - + passwd terminated with error code %1. passwd c'est arrêté avec le code d'erreur %1. - + Cannot set password for user %1. Impossible de créer le mot de passe pour l'utilisateur %1. - + usermod terminated with error code %1. usermod s'est terminé avec le code erreur %1. @@ -2236,22 +2263,27 @@ L'installateur se fermera et les changements seront perdus. &À propos - + <h1>Welcome to the %1 installer.</h1> <h1>Bienvenue dans l'installateur de %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + Bien dans l'installateur Calamares pour %1. + + + About %1 installer À propos de l'installateur %1 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>pour %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Merci à: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg et <a href="https://www.transifex.com/calamares/calamares/">l'équipe de traduction de Calamares</a>.<br/><br/>Le développement de <a href="http://calamares.io/">Calamares</a> est sponsorisé par <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + <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/>pour %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/>Merci à : Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg et <a href="https://www.transifex.com/calamares/calamares/">l'équipe de traducteurs de Calamares</a>.<br/><br/>Le développement de <a href="http://calamares.io/">Calamares</a>est sponsorisé par <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + %1 support Support de %1 diff --git a/lang/calamares_fr_CH.ts b/lang/calamares_fr_CH.ts index 955735f9a..c13bcf67f 100644 --- a/lang/calamares_fr_CH.ts +++ b/lang/calamares_fr_CH.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - - - - - Allocate drive space by dragging the divider below: - - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -215,32 +182,32 @@ Output: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path - + Working directory %1 for python job %2 is not readable. - + Bad main script file - + Main script file %1 for python job %2 is not readable. - + Boost.Python error in job "%1". @@ -248,64 +215,90 @@ Output: Calamares::ViewManager - + &Back - + &Next - - + + &Cancel - + + + Cancel installation without changing the system. + + + + Cancel installation? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now - + Go &back - - &Quit + + &Done - + + The installation is complete. Close the installer. + + + + Error - + Installation Failed @@ -336,12 +329,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer - + Show debug information @@ -362,7 +355,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -372,17 +365,17 @@ The installer will quit and all changes will be lost. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -395,35 +388,35 @@ The installer will quit and all changes will be lost. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -433,71 +426,71 @@ 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>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -523,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. @@ -550,6 +543,11 @@ The installer will quit and all changes will be lost. Create a Partition + + + MiB + + Partition &Type: @@ -586,32 +584,27 @@ The installer will quit and all changes will be lost. - - MB - - - - + En&crypt - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -824,7 +817,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -926,17 +919,22 @@ The installer will quit and all changes will be lost. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -964,7 +962,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -982,27 +980,27 @@ The installer will quit and all changes will be lost. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1020,18 +1018,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1109,12 +1122,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1130,15 +1143,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1221,12 +1244,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1247,12 +1270,12 @@ The installer will quit and all changes will be lost. - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1323,17 +1346,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1382,7 +1405,6 @@ The installer will quit and all changes will be lost. - @@ -1556,7 +1578,7 @@ The installer will quit and all changes will be lost. - + Are you sure you want to create a new partition table on %1? @@ -1579,82 +1601,82 @@ The installer will quit and all changes will be lost. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1673,22 +1695,22 @@ The installer will quit and all changes will be lost. - + unknown - + extended - + unformatted - + swap @@ -1711,64 +1733,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1776,55 +1798,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2060,42 +2087,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2229,22 +2256,27 @@ The installer will quit and all changes will be lost. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts index d7ebc4d94..8e0de1ee5 100644 --- a/lang/calamares_gl.ts +++ b/lang/calamares_gl.ts @@ -1,52 +1,19 @@ - - AlongsidePage - - - Choose partition to shrink: - Escolla a partición a acurtar - - - - Allocate drive space by dragging the divider below: - Reparta o espazo do disco arrastrando o divisor de abaixo - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Mediante esta operación, a partición <strong>%1<\strong> que contén %4 será acurtada a %2MB e unha nova partición de %3MB será creada para %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Non foi posible atopar unha partición de sistema de tipo EFI. Por favor, volva atrás e empregue a opción de particionado manual para crear unha en %1. - - - - The EFI system partition at %1 will be used for starting %2. - A partición EFI do sistema en %1 será usada para iniciar %2. - - - - EFI system partition: - Partición EFI do sistema: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. O <strong> entorno de arranque </strong> do sistema. <br><br> Os sistemas x86 antigos só soportan <strong> BIOS </strong>.<br> Os sistemas modernos empregan normalmente <strong> EFI </strong>, pero tamén poden arrincar como BIOS se funcionan no modo de compatibilidade. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Este sistema arrincou con <strong> EFI </strong> como entorno de arranque.<br><br> Para configurar o arranque dende un entorno EFI, este instalador debe configurar un cargador de arranque, como <strong>GRUB</strong> ou <strong>systemd-boot</strong> nunha <strong> Partición de Sistema EFI</strong>. Este proceso é automático, salvo que escolla particionamento manual. Nese caso deberá escoller unha existente ou crear unha pola súa conta. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Este sistema arrincou con <strong> BIOS </strong> como entorno de arranque.<br><br> Para configurar o arranque dende un entorno BIOS, este instalador debe configurar un cargador de arranque, como <strong>GRUB</strong>, ben ó comezo dunha partición ou no <strong>Master Boot Record</strong> preto do inicio da táboa de particións (recomendado). Este proceso é automático, salvo que escolla particionamento manual, nese caso deberá configuralo pola súa conta. @@ -104,18 +71,18 @@ Type: - + Tipo: none - + Non Interface: - + Interface @@ -222,32 +189,32 @@ Saída: Calamares::PythonJob - + Running %1 operation. Excutando a operación %1. - + Bad working directory path A ruta ó directorio de traballo é errónea - + Working directory %1 for python job %2 is not readable. O directorio de traballo %1 para o traballo de python %2 non é lexible - + Bad main script file Ficheiro de script principal erróneo - + Main script file %1 for python job %2 is not readable. O ficheiro principal de script %1 para a execución de python %2 non é lexible. - + Boost.Python error in job "%1". Boost.Python tivo un erro na tarefa "%1". @@ -255,65 +222,91 @@ Saída: Calamares::ViewManager - + &Back &Atrás - + &Next &Seguinte - - + + &Cancel &Cancelar - + + + Cancel installation without changing the system. + Cancela-la instalación sen cambia-lo sistema + + + Cancel installation? Cancelar a instalación? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Desexa realmente cancelar o proceso actual de instalación? O instalador pecharase e perderanse todos os cambios. - + + &Yes + &Si + + + + &No + &Non + + + + &Close + &Pechar + + + Continue with setup? Continuar coa posta en marcha? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> O %1 instalador está a piques de realizar cambios no seu disco para instalar %2.<br/><strong>Estes cambios non poderán desfacerse.</strong> - + &Install now &Instalar agora - + Go &back Ir &atrás - - &Quit - &Saír + + &Done + &Feito - + + The installation is complete. Close the installer. + Completouse a instalacion. Peche o instalador + + + Error Erro - + Installation Failed Erro na instalación @@ -344,12 +337,12 @@ O instalador pecharase e perderanse todos os cambios. CalamaresWindow - + %1 Installer Instalador de %1 - + Show debug information Mostrar informes de depuración @@ -370,7 +363,7 @@ O instalador pecharase e perderanse todos os cambios. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Este ordenador non satisfai os requerimentos mínimos ara a instalación de %1.<br/>A instalación non pode continuar. <a href="#details">Máis información...</a> @@ -380,17 +373,17 @@ O instalador pecharase e perderanse todos os cambios. Este ordenador non satisfai algúns dos requisitos recomendados para instalar %1.<br/> A instalación pode continuar, pero pode que algunhas características sexan desactivadas. - + This program will ask you some questions and set up %2 on your computer. Este programa faralle algunhas preguntas mentres prepara %2 no seu ordenador. - + For best results, please ensure that this computer: Para os mellores resultados, por favor, asegúrese que este ordenador: - + System requirements Requisitos do sistema @@ -403,35 +396,35 @@ O instalador pecharase e perderanse todos os cambios. Formulario - + After: Despois: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Particionado manual</strong><br/> Pode crear o redimensionar particións pola súa conta. - + Boot loader location: Localización do cargador de arranque: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 será acurtada a %2MB e unha nova partición de %3MB será creada para %4 - + Select storage de&vice: Seleccione o dispositivo de almacenamento: - - - - + + + + Current: Actual: @@ -441,71 +434,71 @@ O instalador pecharase e perderanse todos os cambios. Reutilizar %1 como partición home para %2 - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Seleccione unha partición para acurtar, logo empregue a barra para redimensionala</strong> - + <strong>Select a partition to install on</strong> <strong>Seleccione unha partición para instalar</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Non foi posible atopar unha partición de sistema de tipo EFI. Por favor, volva atrás e empregue a opción de particionado manual para crear unha en %1. - + The EFI system partition at %1 will be used for starting %2. A partición EFI do sistema en %1 será usada para iniciar %2. - + EFI system partition: Partición EFI do sistema: - + 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. Esta unidade de almacenamento non semella ter un sistema operativo instalado nela. Que desexa facer?<br/>Poderá revisar e confirmar as súas eleccións antes de que calquera cambio sexa feito na unidade de almacenamento. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Borrar disco</strong><br/>Esto <font color="red">eliminará</font> todos os datos gardados na unidade de almacenamento seleccionada. - + 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. A unidade de almacenamento ten %1 nela. Que desexa facer?<br/>Poderá revisar e confirmar a súa elección antes de que se aplique algún cambio á unidade. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instalar a carón</strong><br/>O instalador encollerá a partición para facerlle sitio a %1 - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Substituír a partición</strong><br/>Substitúe a partición con %1. - + This storage device already has 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. Esta unidade de almacenamento xa ten un sistema operativo instalado nel. Que desexa facer?<br/>Poderá revisar e confirmar as súas eleccións antes de que calquera cambio sexa feito na unidade de almacenamento - + This storage device has multiple operating systems 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. Esta unidade de almacenamento ten múltiples sistemas operativos instalados nela. Que desexa facer?<br/>Poderá revisar e confirmar as súas eleccións antes de que calquera cambio sexa feito na unidade de almacenamento. @@ -531,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. @@ -558,6 +551,11 @@ O instalador pecharase e perderanse todos os cambios. Create a Partition Crear partición + + + MiB + MiB + Partition &Type: @@ -594,34 +592,29 @@ O instalador pecharase e perderanse todos os cambios. &Tamaño: - - MB - MB - - - + En&crypt Encriptar - + Logical Lóxica - + Primary Primaria - + GPT GPT - + Mountpoint already in use. Please select another one. - + Punto de montaxe xa en uso. Faga o favor de escoller outro @@ -832,34 +825,34 @@ O instalador pecharase e perderanse todos os cambios. DeviceInfoWidget - + 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. - + O tipo de <strong>táboa de partición</strong>no dispositivo de almacenamento escollido.<br><br>O único xeito de cambia-lo tipo de partición é borrar e volver a crear a táboa de partición dende o comenzo, isto destrúe todolos datos no dispositivo de almacenamento. <br> Este instalador manterá a táboa de partición actúal agás que escolla outra cousa explicitamente. <br> Se non está seguro, en sistemas modernos é preferibel GPT. This device has a <strong>%1</strong> partition table. - + O dispositivo ten <strong>%1</strong> una táboa de partición. 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. - + Este é un dispositivo de tipo <strong>loop</strong>. <br><br> É un pseudo-dispositivo que non ten táboa de partición que permita acceder aos ficheiros como un dispositivo de bloques. Este,modo de configuración normalmente so contén un sistema de ficheiros individual. 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. - + Este instalador <strong>non pode detectar unha táboa de partición </strong>no sistema de almacenamento seleccionado. <br><br>O dispositivo non ten táboa de particion ou a táboa de partición está corrompida ou é dun tipo descoñecido.<br>Este instalador poder crear una táboa de partición nova por vóstede, ben automaticamente ou a través de páxina de particionamento a man. <br><br>This is the recommended partition table type for modern systems which start from an <strong>EFI</strong> boot environment. - + <br><br>Este é o tipo de táboa de partición recomendada para sistema modernos que empezan dende un sistema de arranque <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>Esta táboa de partición so é recomendabel en sistemas vellos que empezan dende un sistema de arranque <strong>BIOS</strong>. GPT é recomendabel na meirande parte dos outros casos.<br><br><strong>Atención:</strong>A táboa de partición MBR é un estándar obsoleto da época do MS-DOS.<br>So pódense crear 4 particións <em>primarias</em>, e desas 4, una pode ser unha partición<em>extensa</em>, que pode conter muitas particións <em>lóxicas</em>. @@ -875,17 +868,17 @@ O instalador pecharase e perderanse todos os cambios. Write LUKS configuration for Dracut to %1 - + Escribila configuración LUKS para Dracut en %1 Skip writing LUKS configuration for Dracut: "/" partition is not encrypted - + Saltando escribila configuración LUKS para Dracut: A partición "/" non está encriptada Failed to open %1 - + Fallou ao abrir %1 @@ -901,27 +894,27 @@ O instalador pecharase e perderanse todos os cambios. Edit Existing Partition - + Editar unha partición existente Content: - + Contido: &Keep - + &Gardar Format - + Formato Warning: Formatting the partition will erase all existing data. - + Atención: Dar formato á partición borrará tódolos datos existentes. @@ -934,19 +927,24 @@ O instalador pecharase e perderanse todos os cambios. &Tamaño: - + + MiB + MiB + + + Fi&le System: - + Sistema de Ficheiros: - + Flags: - + Bandeiras: - + Mountpoint already in use. Please select another one. - + Punto de montaxe xa en uso. Faga o favor de escoller outro. @@ -954,27 +952,27 @@ O instalador pecharase e perderanse todos os cambios. Form - + Formulario En&crypt system - + En&criptar sistema Passphrase - + Frase de contrasinal Confirm passphrase - + Confirme a frase de contrasinal - + Please enter the same passphrase in both boxes. - + Faga o favor de introducila a misma frase de contrasinal námbalas dúas caixas. @@ -982,37 +980,37 @@ O instalador pecharase e perderanse todos os cambios. Set partition information - + Poñela información da partición Install %1 on <strong>new</strong> %2 system partition. - + Instalar %1 nunha <strong>nova</strong> partición do sistema %2 - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Configure unha <strong>nova</strong> partición %2 con punto de montaxe <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Instalar %2 na partición do sistema %3 <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Configurala partición %3 <strong>%1</strong> con punto de montaxe <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Instalar o cargador de arranque en <strong>%1</strong>. - + Setting up mount points. - + Configuralos puntos de montaxe. @@ -1025,20 +1023,35 @@ O instalador pecharase e perderanse todos os cambios. &Restart now - + &Reiniciar agora. - + <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>Todo feito.</h1><br/>%1 foi instalado na súa computadora.<br/>Agora pode reiniciar no seu novo sistema ou continuar a usalo entorno Live %2. + + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>Fallou a instalación</h1><br/>%1 non se pudo instalar na sua computadora. <br/>A mensaxe de erro foi: %2. FinishedViewStep - + Finish - + Fin + + + + Installation Complete + Instalacion completa + + + + The installation of %1 is complete. + Completouse a instalación de %1 @@ -1046,22 +1059,22 @@ O instalador pecharase e perderanse todos os cambios. Format partition %1 (file system: %2, size: %3 MB) on %4. - + Formato da partición %1 (sistema de ficheiros: %2, tamaño: %3 MB) en %4. Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formato <strong>%3MB</strong> partición <strong>%1</strong> con sistema de ficheiros <strong>%2</strong>. Formatting partition %1 with file system %2. - + Dando formato a %1 con sistema de ficheiros %2. The installer failed to format partition %1 on disk '%2'. - + O instalador fallou cando formateaba a partición %1 no disco '%2'. @@ -1091,19 +1104,19 @@ O instalador pecharase e perderanse todos os cambios. Konsole not installed - + Konsole non está instalado Please install the kde konsole and try again! - + Faga o favor de instalar konsole (de kde) e probe de novo! Executing script: &nbsp;<code>%1</code> - + Executando o script: &nbsp; <code>%1</code> @@ -1117,14 +1130,14 @@ O instalador pecharase e perderanse todos os cambios. KeyboardPage - + Set keyboard model to %1.<br/> - + Seleccionado modelo de teclado a %1.<br/> - + Set keyboard layout to %1/%2. - + Seleccionada a disposición do teclado a %1/%2. @@ -1132,20 +1145,30 @@ O instalador pecharase e perderanse todos os cambios. Keyboard - + Teclado LCLocaleDialog - + System locale setting - + Configuración da localización - + 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>. - + A configuración de localización afecta a linguaxe e o conxunto de caracteres dalgúns elementos da interface de usuario de liña de comandos. <br/>A configuración actúal é <strong>%1</strong>. + + + + &Cancel + &Cancelar + + + + &OK + &Ok @@ -1158,33 +1181,33 @@ O instalador pecharase e perderanse todos os cambios. I accept the terms and conditions above. - + Acepto os termos e condicións anteriores. <h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms. - + <h1>Acordo de licencia</h1>Este proceso de configuración instalará programas privativos suxeito a termos de licencia. Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue. - + Faga o favor de revisalos Acordos de Licencia de Usuario Final (ALUF) seguintes. <br/>De non estar dacordo cos termos non se pode seguir co proceso de configuración. <h1>License Agreement</h1>This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience. - + <h1>Acordo de licencia</h1>Este proceso de configuración pode instalar programas privativos suxeito a termos de licencia para fornecer características adicionaís e mellorala experiencia do usuario. Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead. - + Faga o favor de revisalos Acordos de Licencia de Usuario Final (ALUF) seguintes. <br/>De non estar dacordo cos termos non se instalará o programa privativo e no seu lugar usaranse alternativas de código aberto. <strong>%1 driver</strong><br/>by %2 %1 is an untranslatable product name, example: Creative Audigy driver - + <strong>dispositivo %1</strong><br/>por %2 @@ -1229,12 +1252,12 @@ O instalador pecharase e perderanse todos os cambios. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1255,12 +1278,12 @@ O instalador pecharase e perderanse todos os cambios. - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1331,17 +1354,17 @@ O instalador pecharase e perderanse todos os cambios. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1390,7 +1413,6 @@ O instalador pecharase e perderanse todos os cambios. - @@ -1564,7 +1586,7 @@ O instalador pecharase e perderanse todos os cambios. - + Are you sure you want to create a new partition table on %1? @@ -1587,82 +1609,82 @@ O instalador pecharase e perderanse todos os cambios. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1681,22 +1703,22 @@ O instalador pecharase e perderanse todos os cambios. - + unknown - + extended - + unformatted - + swap @@ -1719,64 +1741,64 @@ O instalador pecharase e perderanse todos os cambios. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1784,55 +1806,60 @@ O instalador pecharase e perderanse todos os cambios. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2068,42 +2095,42 @@ O instalador pecharase e perderanse todos os cambios. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2237,22 +2264,27 @@ O instalador pecharase e perderanse todos os cambios. &Acerca de - + <h1>Welcome to the %1 installer.</h1> <h1>Benvido o instalador %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer Acerca do instalador %1 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support %1 axuda diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts index 1377b5f32..bcd5e8198 100644 --- a/lang/calamares_gu.ts +++ b/lang/calamares_gu.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - - - - - Allocate drive space by dragging the divider below: - - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -215,32 +182,32 @@ Output: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path - + Working directory %1 for python job %2 is not readable. - + Bad main script file - + Main script file %1 for python job %2 is not readable. - + Boost.Python error in job "%1". @@ -248,64 +215,90 @@ Output: Calamares::ViewManager - + &Back - + &Next - - + + &Cancel - + + + Cancel installation without changing the system. + + + + Cancel installation? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now - + Go &back - - &Quit + + &Done - + + The installation is complete. Close the installer. + + + + Error - + Installation Failed @@ -336,12 +329,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer - + Show debug information @@ -362,7 +355,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -372,17 +365,17 @@ The installer will quit and all changes will be lost. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -395,35 +388,35 @@ The installer will quit and all changes will be lost. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -433,71 +426,71 @@ 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>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -523,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. @@ -550,6 +543,11 @@ The installer will quit and all changes will be lost. Create a Partition + + + MiB + + Partition &Type: @@ -586,32 +584,27 @@ The installer will quit and all changes will be lost. - - MB - - - - + En&crypt - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -824,7 +817,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -926,17 +919,22 @@ The installer will quit and all changes will be lost. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -964,7 +962,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -982,27 +980,27 @@ The installer will quit and all changes will be lost. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1020,18 +1018,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1109,12 +1122,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1130,15 +1143,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1221,12 +1244,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1247,12 +1270,12 @@ The installer will quit and all changes will be lost. - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1323,17 +1346,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1382,7 +1405,6 @@ The installer will quit and all changes will be lost. - @@ -1556,7 +1578,7 @@ The installer will quit and all changes will be lost. - + Are you sure you want to create a new partition table on %1? @@ -1579,82 +1601,82 @@ The installer will quit and all changes will be lost. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1673,22 +1695,22 @@ The installer will quit and all changes will be lost. - + unknown - + extended - + unformatted - + swap @@ -1711,64 +1733,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1776,55 +1798,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2060,42 +2087,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2229,22 +2256,27 @@ The installer will quit and all changes will be lost. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts new file mode 100644 index 000000000..331444e27 --- /dev/null +++ b/lang/calamares_he.ts @@ -0,0 +1,2299 @@ + + + BootInfoWidget + + + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. + <strong>תצורת האתחול</strong> של מערכת זו. <br><br> מערכות x86 ישנות יותר תומכות אך ורק ב <strong>BIOS</strong>.<br> מערכות חדשות משתמשות בדרך כלל ב <strong>EFI</strong>, אך יכולות להיות מוצגות כ BIOS במידה והן מופעלות במצב תאימות לאחור. + + + + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. + מערכת זו הופעלה בתצורת אתחול <strong>EFI</strong>.<br><br> בכדי להגדיר הפעלה מתצורת אתחול EFI, על אשף ההתקנה להתקין מנהל אתחול מערכת, לדוגמה <strong>GRUB</strong> או <strong>systemd-boot</strong> על <strong>מחיצת מערכת EFI</strong>. פעולה זו היא אוטומטית, אלא אם כן תבחר להגדיר מחיצות באופן ידני, במקרה זה עליך לבחור זאת או להגדיר בעצמך. + + + + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. + מערכת זו הופעלה בתצורת אתחול <strong>BIOS</strong>.<br><br> בכדי להגדיר הפעלה מתצורת אתחול BIOS, על אשף ההתקנה להתקין מנהל אתחול מערכת, לדוגמה <strong>GRUB</strong>, בתחלית מחיצה או על ה <strong>Master Boot Record</strong> בצמוד להתחלה של טבלת המחיצות (מועדף). פעולה זו היא אוטומטית, אלא אם כן תבחר להגדיר מחיצות באופן ידני, במקרה זה עליך להגדיר זאת בעצמך. + + + + BootLoaderModel + + + Master Boot Record of %1 + Master Boot Record של %1 + + + + Boot Partition + מחיצת טעינת המערכת Boot + + + + System Partition + מחיצת מערכת + + + + Do not install a boot loader + אל תתקין מנהל אתחול מערכת, boot loader + + + + %1 (%2) + %1 (%2) + + + + Calamares::DebugWindow + + + Form + Form + + + + GlobalStorage + אחסון גלובלי + + + + JobQueue + JobQueue + + + + Modules + מודולים + + + + Type: + סוג: + + + + + none + ללא + + + + Interface: + ממשק: + + + + Tools + כלים + + + + Debug information + מידע על ניפוי שגיאות + + + + Calamares::ExecutionViewStep + + + Install + התקן + + + + Calamares::JobThread + + + Done + בוצע + + + + Calamares::ProcessJob + + + Run command %1 %2 + הרץ פקודה %1 %2 + + + + Running command %1 %2 + מריץ פקודה %1 %2 + + + + External command crashed + פקודה חיצונית קרסה + + + + Command %1 crashed. +Output: +%2 + פקודה %1 קרסה. +פלט: +%2 + + + + External command failed to start + הרצת פקודה חיצונית כשלה + + + + Command %1 failed to start. + הרצת פקודה %1 כשלה. + + + + Internal error when starting command + שגיאה פנימית בעת התחלת הרצת הפקודה + + + + Bad parameters for process job call. + פרמטרים לא תקינים עבור קריאת עיבוד פעולה. + + + + External command failed to finish + הרצת פקודה חיצונית לא הצליחה להסתיים + + + + Command %1 failed to finish in %2s. +Output: +%3 + פקודה %1 לא הצליחה להסתיים ב %2 שניות. +פלט: +%3 + + + + External command finished with errors + פקודה חיצונית הסתיימה עם שגיאות + + + + Command %1 finished with exit code %2. +Output: +%3 + פקודה %1 הסתיימה עם קוד יציאה %2. +פלט: +%3 + + + + Calamares::PythonJob + + + Running %1 operation. + מריץ פעולה %1. + + + + Bad working directory path + נתיב תיקיית עבודה לא תקין + + + + Working directory %1 for python job %2 is not readable. + תיקיית עבודה %1 עבור משימת python %2 לא קריאה. + + + + Bad main script file + קובץ תסריט הרצה ראשי לא תקין + + + + Main script file %1 for python job %2 is not readable. + קובץ תסריט הרצה ראשי %1 עבור משימת python %2 לא קריא. + + + + Boost.Python error in job "%1". + שגיאת Boost.Python במשימה "%1". + + + + Calamares::ViewManager + + + &Back + &קודם + + + + &Next + &הבא + + + + + &Cancel + &בטל + + + + + Cancel installation without changing the system. + בטל התקנה ללא ביצוע שינוי במערכת. + + + + Cancel installation? + בטל את ההתקנה? + + + + Do you really want to cancel the current install process? +The installer will quit and all changes will be lost. + האם אתה בטוח שברצונך לבטל את תהליך ההתקנה? +אשף ההתקנה ייסגר וכל השינויים יאבדו. + + + + &Yes + &כן + + + + &No + &לא + + + + &Close + &סגור + + + + Continue with setup? + המשך עם הליך ההתקנה? + + + + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> + אשף ההתקנה של %1 הולך לבצע שינויים בכונן שלך לטובת התקנת %2.<br/><strong>לא תוכל לבטל את השינויים הללו.</strong> + + + + &Install now + &התקן כעת + + + + Go &back + &אחורה + + + + &Done + &בוצע + + + + The installation is complete. Close the installer. + תהליך ההתקנה הושלם. אנא סגור את אשף ההתקנה. + + + + Error + שגיאה + + + + Installation Failed + ההתקנה נכשלה + + + + CalamaresPython::Helper + + + Unknown exception type + טיפוס חריגה אינו מוכר + + + + unparseable Python error + שגיאת Python לא ניתנת לניתוח + + + + unparseable Python traceback + עקבה לאחור של Python לא ניתנת לניתוח + + + + Unfetchable Python error. + שגיאת Python לא ניתנת לאחזור. + + + + CalamaresWindow + + + %1 Installer + אשף התקנה של %1 + + + + Show debug information + הצג מידע על ניפוי שגיאות + + + + CheckFileSystemJob + + + Checking file system on partition %1. + בודק את מערכת הקבצים על מחיצה %1. + + + + The file system check on partition %1 failed. + בדיקת מערכת הקבצים על מחיצה %1 נכשלה. + + + + CheckerWidget + + + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> + המחשב לא עומד ברף דרישות המינימום להתקנת %1. <br/>ההתקנה לא יכולה להמשיך. <a href="#details"> פרטים...</a> + + + + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. + המחשב לא עומד בחלק מרף דרישות המינימום להתקנת %1.<br/> ההתקנה יכולה להמשיך, אך חלק מהתכונות יכולות להיות מבוטלות. + + + + This program will ask you some questions and set up %2 on your computer. + אשף התקנה זה נכתב בלשון זכר אך מיועד לשני המינים. תוכנה זו תשאל אותך מספר שאלות ותגדיר את %2 על המחשב שלך. + + + + For best results, please ensure that this computer: + לקבלת התוצאות הטובות ביותר, אנא וודא כי מחשב זה: + + + + System requirements + דרישות מערכת + + + + ChoicePage + + + Form + Form + + + + After: + לאחר: + + + + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. + <strong>הגדרת מחיצות באופן ידני</strong><br/>תוכל ליצור או לשנות את גודל המחיצות בעצמך. + + + + Boot loader location: + מיקום מנהל אתחול המערכת: + + + + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. + %1 תוקטן ל %2 MB ומחיצה חדשה בגודל %3 MB תיווצר עבור %4. + + + + Select storage de&vice: + בחר ה&תקן אחסון: + + + + + + + Current: + נוכחי: + + + + Reuse %1 as home partition for %2. + השתמש ב %1 כמחיצת הבית, home, עבור %2. + + + + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> + <strong>בחר מחיצה לכיווץ, לאחר מכן גרור את הסרגל התחתון בכדי לשנות את גודלה</strong> + + + + <strong>Select a partition to install on</strong> + <strong>בחר מחיצה בכדי לבצע את ההתקנה עליה</strong> + + + + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. + מחיצת מערכת EFI לא נמצאה במערכת. אנא חזור והשתמש ביצירת מחיצות באופן ידני בכדי להגדיר את %1. + + + + The EFI system partition at %1 will be used for starting %2. + מחיצת מערכת EFI ב %1 תשמש עבור טעינת %2. + + + + EFI system partition: + מחיצת מערכת EFI: + + + + 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/> תוכל לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון. + + + + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. + <strong>מחק כונן</strong><br/> פעולה זו <font color="red">תמחק</font> את כל המידע השמור על התקן האחסון הנבחר. + + + + 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/> תוכל לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון. + + + + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. + <strong>התקן לצד</strong><br/> אשף ההתקנה יכווץ מחיצה בכדי לפנות מקום עבור %1. + + + + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. + <strong>החלף מחיצה</strong><br/> מבצע החלפה של המחיצה עם %1. + + + + This storage device already has 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/> תוכל לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון. + + + + This storage device has multiple operating systems 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/>תוכל לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון. + + + + ClearMountsJob + + + Clear mounts for partitioning operations on %1 + מחק נקודות עיגון עבור ביצוע פעולות של הגדרות מחיצה על %1. + + + + Clearing mounts for partitioning operations on %1. + מבצע מחיקה של נקודות עיגון עבור ביצוע פעולות של הגדרות מחיצה על %1. + + + + Cleared all mounts for %1 + בוצעה מחיקה עבור כל נקודות העיגון על %1. + + + + ClearTempMountsJob + + + Clear all temporary mounts. + מחק את כל נקודות העיגון הזמניות. + + + + Clearing all temporary mounts. + מבצע מחיקה של כל נקודות העיגון הזמניות. + + + + Cannot get list of temporary mounts. + לא ניתן לשלוף רשימה של כל נקודות העיגון הזמניות. + + + + Cleared all temporary mounts. + בוצעה מחיקה של כל נקודות העיגון הזמניות. + + + + CreatePartitionDialog + + + Create a Partition + צור מחיצה + + + + MiB + MiB + + + + Partition &Type: + &סוג מחיצה: + + + + &Primary + &ראשי + + + + E&xtended + מ&ורחב + + + + Fi&le System: + מ&ערכת קבצים + + + + Flags: + סימונים: + + + + &Mount Point: + נקודת &עיגון: + + + + Si&ze: + גו&דל: + + + + En&crypt + ה&צפן + + + + Logical + לוגי + + + + Primary + ראשי + + + + GPT + GPT + + + + Mountpoint already in use. Please select another one. + נקודת העיגון בשימוש. אנא בחר נקודת עיגון אחרת. + + + + CreatePartitionJob + + + Create new %2MB partition on %4 (%3) with file system %1. + צור מחיצה חדשה בגודל %2 MB על %4 (%3) עם מערכת קבצים %1. + + + + Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. + צור מחיצה חדשה בגודל <strong>%2 MB</strong> על <strong>%4</strong> (%3) עם מערכת קבצים <strong>%1</strong>. + + + + Creating new %1 partition on %2. + מגדיר מחיצה %1 חדשה על %2. + + + + The installer failed to create partition on disk '%1'. + אשף ההתקנה נכשל ביצירת מחיצה על כונן '%1'. + + + + Could not open device '%1'. + לא ניתן לפתוח את התקן '%1'. + + + + Could not open partition table. + לא ניתן לפתוח את טבלת המחיצות. + + + + The installer failed to create file system on partition %1. + אשף ההתקנה נכשל בעת יצירת מערכת הקבצים על מחיצה %1. + + + + The installer failed to update partition table on disk '%1'. + אשף ההתקנה נכשל בעת עדכון טבלת המחיצות על כונן '%1'. + + + + CreatePartitionTableDialog + + + Create Partition Table + צור טבלת מחיצות + + + + Creating a new partition table will delete all existing data on the disk. + יצירת טבלת מחיצות חדשה תמחק את כל המידע הקיים על הכונן. + + + + What kind of partition table do you want to create? + איזה סוג של טבלת מחיצות ברצונך ליצור? + + + + Master Boot Record (MBR) + Master Boot Record (MBR) + + + + GUID Partition Table (GPT) + GUID Partition Table (GPT) + + + + CreatePartitionTableJob + + + Create new %1 partition table on %2. + צור טבלת מחיצות %1 חדשה על %2. + + + + Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3). + צור טבלת מחיצות <strong>%1</strong> חדשה על <strong>%2</strong> (%3). + + + + Creating new %1 partition table on %2. + יוצר טבלת מחיצות %1 חדשה על %2. + + + + The installer failed to create a partition table on %1. + אשף ההתקנה נכשל בעת יצירת טבלת המחיצות על %1. + + + + Could not open device %1. + לא ניתן לפתוח את התקן %1. + + + + CreateUserJob + + + Create user %1 + צור משתמש %1 + + + + Create user <strong>%1</strong>. + צור משתמש <strong>%1</strong>. + + + + Creating user %1. + יוצר משתמש %1. + + + + Sudoers dir is not writable. + תיקיית מנהלי המערכת לא ניתנת לכתיבה. + + + + Cannot create sudoers file for writing. + לא ניתן ליצור את קובץ מנהלי המערכת לכתיבה. + + + + Cannot chmod sudoers file. + לא ניתן לשנות את מאפייני קובץ מנהלי המערכת. + + + + Cannot open groups file for reading. + לא ניתן לפתוח את קובץ הקבוצות לקריאה. + + + + Cannot create user %1. + לא ניתן ליצור משתמש %1. + + + + useradd terminated with error code %1. + פקודת יצירת המשתמש, useradd, נכשלה עם קוד יציאה %1. + + + + Cannot add user %1 to groups: %2. + לא ניתן להוסיף את המשתמש %1 לקבוצות: %2. + + + + usermod terminated with error code %1. + פקודת שינוי מאפייני המשתמש, usermod, נכשלה עם קוד יציאה %1. + + + + Cannot set home directory ownership for user %1. + לא ניתן להגדיר בעלות על תיקיית הבית עבור משתמש %1. + + + + chown terminated with error code %1. + פקודת שינוי בעלות, chown, נכשלה עם קוד יציאה %1. + + + + DeletePartitionJob + + + Delete partition %1. + מחק את מחיצה %1. + + + + Delete partition <strong>%1</strong>. + מחק את מחיצה <strong>%1</strong>. + + + + Deleting partition %1. + מבצע מחיקה של מחיצה %1. + + + + The installer failed to delete partition %1. + אשף ההתקנה נכשל בעת מחיקת מחיצה %1. + + + + Partition (%1) and device (%2) do not match. + מחיצה (%1) והתקן (%2) לא תואמים. + + + + Could not open device %1. + לא ניתן לפתוח את התקן %1. + + + + Could not open partition table. + לא ניתן לפתוח את טבלת המחיצות. + + + + DeviceInfoWidget + + + 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 הוא הסוג המועדף. + + + + This device has a <strong>%1</strong> partition table. + על התקן זה קיימת טבלת מחיצות <strong>%1</strong>. + + + + 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> זהו התקן מדמה ללא טבלת מחיצות אשר מאפשר גישה לקובץ כהתקן בלוק. תצורה מסוג זה בדרך כלל תכיל מערכת קבצים יחידה. + + + + 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> אשף התקנה זה יכול ליצור טבלת מחיצות חדשה עבורך אוטומטית או בדף הגדרת מחיצות באופן ידני. + + + + <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>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>, מתוכן, אחת יכולה להיות מוגדרת כמחיצה <em>מורחבת</em>, אשר יכולה להכיל מחיצות <em>לוגיות</em>. + + + + DeviceModel + + + %1 - %2 (%3) + %1 - %2 (%3) + + + + DracutLuksCfgJob + + + Write LUKS configuration for Dracut to %1 + רשום הגדרות הצפנה LUKS עבור Dracut אל %1 + + + + Skip writing LUKS configuration for Dracut: "/" partition is not encrypted + דלג רישום הגדרות הצפנה LUKS עבור Dracut: מחיצת "/" לא תוצפן. + + + + Failed to open %1 + נכשלה פתיחת %1. + + + + DummyCppJob + + + Dummy C++ Job + משימת דמה של C++ + + + + EditExistingPartitionDialog + + + Edit Existing Partition + ערוך מחיצה קיימת + + + + Content: + תכולה: + + + + &Keep + &השאר + + + + Format + אתחול + + + + Warning: Formatting the partition will erase all existing data. + אזהרה: אתחול המחיצה ימחק את כל המידע הקיים. + + + + &Mount Point: + &נקודת עיגון: + + + + Si&ze: + גו&דל: + + + + MiB + MiB + + + + Fi&le System: + מ&ערכת קבצים: + + + + Flags: + סימונים: + + + + Mountpoint already in use. Please select another one. + נקודת העיגון בשימוש. אנא בחר נקודת עיגון אחרת. + + + + EncryptWidget + + + Form + Form + + + + En&crypt system + ה&צפן את המערכת + + + + Passphrase + ביטוי אבטחה + + + + Confirm passphrase + אשר ביטוי אבטחה + + + + Please enter the same passphrase in both boxes. + אנא הכנס ביטוי אבטחה זהה בשני התאים. + + + + FillGlobalStorageJob + + + Set partition information + הגדר מידע עבור המחיצה + + + + Install %1 on <strong>new</strong> %2 system partition. + התקן %1 על מחיצת מערכת %2 <strong>חדשה</strong>. + + + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. + הגדר מחיצת מערכת %2 <strong>חדשה</strong>בעלת נקודת עיגון <strong>%1</strong>. + + + + Install %2 on %3 system partition <strong>%1</strong>. + התקן %2 על מחיצת מערכת %3 <strong>%1</strong>. + + + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. + התקן מחיצה %3 <strong>%1</strong> עם נקודת עיגון <strong>%2</strong>. + + + + Install boot loader on <strong>%1</strong>. + התקן מנהל אתחול מערכת על <strong>%1</strong>. + + + + Setting up mount points. + מגדיר נקודות עיגון. + + + + FinishedPage + + + Form + Form + + + + &Restart now + &אתחל כעת + + + + <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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>ההתקנה נכשלה</h1><br/>%1 לא הותקן על מחשבך.<br/> הודעת השגיאה: %2. + + + + FinishedViewStep + + + Finish + סיום + + + + Installation Complete + ההתקנה הושלמה + + + + The installation of %1 is complete. + ההתקנה של %1 הושלמה. + + + + FormatPartitionJob + + + Format partition %1 (file system: %2, size: %3 MB) on %4. + אתחל מחיצה %1 (מערכת קבצים: %2, גודל: %3 MB) על %4. + + + + Format <strong>%3MB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. + אתחול מחיצה <strong>%1</strong> בגודל <strong>%3 MB</strong> עם מערכת קבצים <strong>%2</strong>. + + + + Formatting partition %1 with file system %2. + מאתחל מחיצה %1 עם מערכת קבצים %2. + + + + The installer failed to format partition %1 on disk '%2'. + אשף ההתקנה נכשל בעת אתחול המחיצה %1 על כונן '%2'. + + + + Could not open device '%1'. + לא ניתן לפתוח את התקן '%1'. + + + + Could not open partition table. + לא ניתן לפתוח את טבלת המחיצות. + + + + The installer failed to create file system on partition %1. + אשף ההתקנה נכשל בעת יצירת מערכת הקבצים על מחיצה %1. + + + + The installer failed to update partition table on disk '%1'. + אשף ההתקנה נכשל בעת עדכון טבלת המחיצות על כונן '%1'. + + + + InteractiveTerminalPage + + + + + Konsole not installed + Konsole לא מותקן. + + + + + + Please install the kde konsole and try again! + אנא התקן את kde konsole ונסה שוב! + + + + Executing script: &nbsp;<code>%1</code> + מריץ תסריט הרצה: &nbsp; <code>%1</code> + + + + InteractiveTerminalViewStep + + + Script + תסריט הרצה + + + + KeyboardPage + + + Set keyboard model to %1.<br/> + הגדר את דגם המקלדת ל %1.<br/> + + + + Set keyboard layout to %1/%2. + הגדר את פריסת לוח המקשים ל %1/%2. + + + + KeyboardViewStep + + + Keyboard + מקלדת + + + + LCLocaleDialog + + + System locale setting + הגדרות מיקום המערכת + + + + 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>. + + + + &Cancel + &ביטול + + + + &OK + &אישור + + + + LicensePage + + + Form + Form + + + + I accept the terms and conditions above. + אני מאשר את התנאים וההתניות מעלה. + + + + <h1>License Agreement</h1>This setup procedure will install proprietary software that is subject to licensing terms. + <h1>הסכם רישיון</h1>אשף התקנה זה יבצע התקנה של תוכנות קנייניות אשר כפופות לתנאי רישיון. + + + + Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, the setup procedure cannot continue. + אנא סקור את הסכם משתמש הקצה (EULA) מעלה.<br/> במידה ואינך מסכים עם התנאים, תהליך ההתקנה יופסק. + + + + <h1>License Agreement</h1>This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience. + <h1>הסכם רישיון</h1>אשף התקנה זה יכול לבצע התקנה של תוכנות קנייניות אשר כפופות לתנאי רישיון בכדי לספק תכולות נוספות ולשדרג את חווית המשתמש. + + + + Please review the End User License Agreements (EULAs) above.<br/>If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead. + אנא סקור את הסכם משתמש הקצה (EULA) מעלה.<br/> במידה ואינך מסכים עם התנאים, תוכנות קנייניות לא יותקנו, ותוכנות חליפיות מבוססות קוד פתוח יותקנו במקומן. + + + + <strong>%1 driver</strong><br/>by %2 + %1 is an untranslatable product name, example: Creative Audigy driver + <strong>התקן %1</strong><br/> מאת %2 + + + + <strong>%1 graphics driver</strong><br/><font color="Grey">by %2</font> + %1 is usually a vendor name, example: Nvidia graphics driver + <strong>התקן תצוגה %1</strong><br/><font color="Grey"> מאת %2</font> + + + + <strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font> + <strong>תוסף לדפדפן %1</strong><br/><font color="Grey"> מאת %2</font> + + + + <strong>%1 codec</strong><br/><font color="Grey">by %2</font> + <strong>קידוד %1</strong><br/><font color="Grey"> מאת %2</font> + + + + <strong>%1 package</strong><br/><font color="Grey">by %2</font> + <strong>חבילה %1</strong><br/><font color="Grey"> מאת %2</font> + + + + <strong>%1</strong><br/><font color="Grey">by %2</font> + <strong>%1</strong><br/><font color="Grey">מאת %2</font> + + + + <a href="%1">view license agreement</a> + <a href="%1">צפה בהסכם הרשיון</a> + + + + LicenseViewStep + + + License + רשיון + + + + LocalePage + + + The system language will be set to %1. + שפת המערכת תוגדר להיות %1. + + + + The numbers and dates locale will be set to %1. + תבנית של המספרים והתאריכים של המיקום יוגדרו להיות %1. + + + + Region: + איזור: + + + + Zone: + מיקום: + + + + + &Change... + &החלף... + + + + Set timezone to %1/%2.<br/> + הגדרת אזור זמן ל %1/%2.<br/> + + + + %1 (%2) + Language (Country) + %1 (%2) + + + + LocaleViewStep + + + Loading location data... + טוען נתונים על המיקום... + + + + Location + מיקום + + + + MoveFileSystemJob + + + Move file system of partition %1. + העבר את מערכת הקבצים של מחיצה %1. + + + + Could not open file system on partition %1 for moving. + פתיחת מערכת הקבצים במחיצה %1 לטובת ההעברה נכשלה. + + + + Could not create target for moving file system on partition %1. + לא ניתן ליצור יעד עבור העברת מערכת הקבצים במחיצה %1. + + + + Moving of partition %1 failed, changes have been rolled back. + העברה של מחיצה %1 נכשלה, מבטל שינויים. + + + + Moving of partition %1 failed. Roll back of the changes have failed. + העברה של מחיצה %1 נכשלה, ביטול השינויים נכשל. + + + + Updating boot sector after the moving of partition %1 failed. + מעדכן את מקטע האתחול לאחר כשלון העברת מחיצה %1. + + + + The logical sector sizes in the source and target for copying are not the same. This is currently unsupported. + הגדלים הלוגיים של מקטעי המקור והיעד להעתקה אינם זהים. הנ"ל לא נתמך בגרסה זו. + + + + Source and target for copying do not overlap: Rollback is not required. + המקור והיעד להעתקה לא חופפים: ביטול שינויים לא נדרש. + + + + + Could not open device %1 to rollback copying. + פתיחת התקן %1 בכדי לבצע העתקה למצב הקודם נכשלה. + + + + NetInstallPage + + + Name + שם + + + + Description + תיאור + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) + התקנת רשת. (מנוטרלת: לא ניתן לאחזר רשימות של חבילות תוכנה, אנא בדוק את חיבורי הרשת) + + + + NetInstallViewStep + + + Package selection + בחירת חבילות + + + + Page_Keyboard + + + Form + Form + + + + Keyboard Model: + דגם מקלדת: + + + + Type here to test your keyboard + הקלד כאן בכדי לבדוק את המקלדת שלך + + + + Page_UserSetup + + + Form + Form + + + + What is your name? + מהו שמך? + + + + What name do you want to use to log in? + באיזה שם ברצונך להשתמש בעת כניסה למחשב? + + + + + + font-weight: normal + משקל-גופן: נורמלי + + + + <small>If more than one person will use this computer, you can set up multiple accounts after installation.</small> + <small>במידה ויותר מאדם אחד ישתמש במחשב זה, תוכל להגדיר משתמשים נוספים לאחר ההתקנה.</small> + + + + Choose a password to keep your account safe. + בחר סיסמה בכדי להגן על חשבונך. + + + + <small>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</small> + <small>הכנס את אותה הסיסמה פעמיים, בכדי שניתן יהיה לבדוק שגיאות הקלדה. סיסמה טובה אמורה להכיל שילוב של אותיות, מספרים וסימני פיסוק, להיות באורך שמונה תווים לפחות, ועליה להשתנות במרווחי זמן קבועים.</small> + + + + What is the name of this computer? + מהו שם מחשב זה? + + + + <small>This name will be used if you make the computer visible to others on a network.</small> + <small>שם זה יהיה בשימוש במידה ומחשב זה יוגדר להיות נראה על ידי עמדות אחרות ברשת.</small> + + + + Log in automatically without asking for the password. + התחבר באופן אוטומטי מבלי לבקש סיסמה. + + + + Use the same password for the administrator account. + השתמש באותה הסיסמה עבור חשבון המנהל. + + + + Choose a password for the administrator account. + בחר סיסמה עבור חשבון המנהל. + + + + <small>Enter the same password twice, so that it can be checked for typing errors.</small> + <small>הכנס את אותה הסיסמה פעמיים, בכדי שניתן יהיה לבדוק שגיאות הקלדה.</small> + + + + PartitionLabelsView + + + Root + מערכת הפעלה Root + + + + Home + בית Home + + + + Boot + טעינה Boot + + + + EFI system + מערכת EFI + + + + Swap + דפדוף, Swap + + + + New partition for %1 + מחיצה חדשה עבור %1 + + + + New partition + מחיצה חדשה + + + + %1 %2 + %1 %2 + + + + PartitionModel + + + + Free Space + זכרון פנוי + + + + + New partition + מחיצה חדשה + + + + Name + שם + + + + File System + מערכת קבצים + + + + Mount Point + נקודת עיגון + + + + Size + גודל + + + + PartitionPage + + + Form + Form + + + + Storage de&vice: + &התקן זכרון: + + + + &Revert All Changes + &בטל את כל השינויים + + + + New Partition &Table + &טבלת מחיצות חדשה + + + + &Create + &צור + + + + &Edit + &ערוך + + + + &Delete + &מחק + + + + Install boot &loader on: + התקן &מנהל אתחול מערכת על: + + + + Are you sure you want to create a new partition table on %1? + האם אתה בטוח שברצונך ליצור טבלת מחיצות חדשה על %1? + + + + PartitionViewStep + + + Gathering system information... + מלקט מידע אודות המערכת... + + + + Partitions + מחיצות + + + + Install %1 <strong>alongside</strong> another operating system. + התקן את %1 <strong>לצד</strong> מערכת הפעלה אחרת. + + + + <strong>Erase</strong> disk and install %1. + <strong>מחק</strong> את הכונן והתקן את %1. + + + + <strong>Replace</strong> a partition with %1. + <strong>החלף</strong> מחיצה עם %1. + + + + <strong>Manual</strong> partitioning. + מגדיר מחיצות באופן <strong>ידני</strong>. + + + + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). + התקן את %1 <strong>לצד</strong> מערכת הפעלה אחרת על כונן <strong>%2</strong> (%3). + + + + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. + <strong>מחק</strong> כונן <strong>%2</strong> (%3) והתקן %1. + + + + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. + <strong>החלף</strong> מחיצה על כונן <strong>%2</strong> (%3) עם %1. + + + + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). + מגדיר מחיצות באופן <strong>ידני</strong> על כונן <strong>%1</strong>(%2). + + + + Disk <strong>%1</strong> (%2) + כונן <strong>%1</strong> (%2) + + + + Current: + נוכחי: + + + + After: + לאחר: + + + + No EFI system partition configured + לא הוגדרה מחיצת מערכת EFI + + + + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. + מחיצת מערכת EFI נדרשת בשביל להפעיל את %1.<br/><br/> בכדי להגדיר מחיצת מערכת EFI, חזור ובחר או צור מערכת קבצים מסוג FAT32 עם סימון <strong>esp</strong> מופעל ונקודת עיגון <strong>%2</strong>.<br/><br/> ניתן להמשיך ללא הגדרת מחיצת מערכת EFI אך המערכת יכולה להיכשל בטעינה. + + + + EFI system partition flag not set + סימון מחיצת מערכת EFI לא מוגדר + + + + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. + מחיצת מערכת EFI נדרשת להפעלת %1.<br/><br/> מחיצה הוגדרה עם נקודת עיגון <strong>%2</strong> אך סימון <strong>esp</strong> לא הוגדר.<br/> בכדי לסמן את המחיצה, חזור וערוך את המחיצה.<br/><br/> תוכל להמשיך ללא ביצוע הסימון אך המערכת יכולה להיכשל בטעינה. + + + + Boot partition not encrypted + מחיצת טעינת המערכת Boot לא מוצפנת. + + + + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. + מחיצת טעינה, boot, נפרדת הוגדרה יחד עם מחיצת מערכת ההפעלה, root, מוצפנת, אך מחיצת הטעינה לא הוצפנה.<br/><br/> ישנן השלכות בטיחותיות עם התצורה שהוגדרה, מכיוון שקבצי מערכת חשובים נשמרים על מחיצה לא מוצפנת.<br/>תוכל להמשיך אם תרצה, אך שחרור מערכת הקבצים יתרחש מאוחר יותר כחלק מטעינת המערכת.<br/>בכדי להצפין את מחיצת הטעינה, חזור וצור אותה מחדש, על ידי בחירה ב <strong>הצפן</strong> בחלונית יצירת המחיצה. + + + + QObject + + + Default Keyboard Model + ברירת מחדל של דגם המקלדת + + + + + Default + ברירת מחדל + + + + unknown + לא מוכר/ת + + + + extended + מורחב/ת + + + + unformatted + לא מאותחל/ת + + + + swap + דפדוף, swap + + + + Unpartitioned space or unknown partition table + הזכרון לא מחולק למחיצות או טבלת מחיצות לא מוכרת + + + + ReplaceWidget + + + Form + Form + + + + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. + בחר מיקום התקנת %1.<br/><font color="red">אזהרה: </font> הפעולה תמחק את כל הקבצים במחיצה שנבחרה. + + + + The selected item does not appear to be a valid partition. + הפריט הנבחר איננו מחיצה תקינה. + + + + %1 cannot be installed on empty space. Please select an existing partition. + לא ניתן להתקין את %1 על זכרון ריק. אנא בחר מחיצה קיימת. + + + + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. + לא ניתן להתקין את %1 על מחיצה מורחבת. אנא בחר מחיצה ראשית או לוגית קיימת. + + + + %1 cannot be installed on this partition. + לא ניתן להתקין את %1 על מחיצה זו. + + + + Data partition (%1) + מחיצת מידע (%1) + + + + Unknown system partition (%1) + מחיצת מערכת (%1) לא מוכרת + + + + %1 system partition (%2) + %1 מחיצת מערכת (%2) + + + + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. + <strong>%4</strong><br/><br/> גודל המחיצה %1 קטן מדי עבור %2. אנא בחר מחיצה עם קיבולת בנפח %3 GiB לפחות. + + + + <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 לא נמצאה באף מקום על המערכת. חזור בבקשה והשתמש ביצירת מחיצות באופן ידני בכדי להגדיר את %1. + + + + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. + <strong>%3</strong><br/><br/>%1 יותקן על %2. <br/><font color="red">אזהרה: </font>כל המידע אשר קיים במחיצה %2 יאבד. + + + + The EFI system partition at %1 will be used for starting %2. + מחיצת מערכת EFI ב %1 תשמש עבור טעינת %2. + + + + EFI system partition: + מחיצת מערכת EFI: + + + + RequirementsChecker + + + Gathering system information... + מלקט מידע אודות המערכת... + + + + has at least %1 GB available drive space + קיים לפחות %1 GB של נפח אחסון + + + + There is not enough drive space. At least %1 GB is required. + נפח האחסון לא מספק. נדרש לפחות %1 GB. + + + + has at least %1 GB working memory + קיים לפחות %1 GB של זכרון פעולה + + + + The system does not have enough working memory. At least %1 GB is required. + כמות הזכרון הנדרשת לפעולה, לא מספיקה. נדרש לפחות %1 GB. + + + + is plugged in to a power source + מחובר לספק חשמל חיצוני + + + + The system is not plugged in to a power source. + המערכת לא מחוברת לספק חשמל חיצוני. + + + + is connected to the Internet + מחובר לאינטרנט + + + + The system is not connected to the Internet. + המערכת לא מחוברת לאינטרנט. + + + + The installer is not running with administrator rights. + אשף ההתקנה לא רץ עם הרשאות מנהל. + + + + The screen is too small to display the installer. + גודל המסך קטן מדי בכדי להציג את מנהל ההתקנה. + + + + ResizeFileSystemJob + + + Resize file system on partition %1. + שנה את גודל מערכת הקבצים במחיצה %1. + + + + Parted failed to resize filesystem. + Parted נכשלה לשנות את גודל מערכת הקבצים. + + + + Failed to resize filesystem. + שינוי גודל מערכת הקבצים נכשלה. + + + + ResizePartitionJob + + + Resize partition %1. + שנה גודל מחיצה %1. + + + + Resize <strong>%2MB</strong> partition <strong>%1</strong> to <strong>%3MB</strong>. + משנה את מחיצה <strong>%1</strong> מגודל <strong>%2 MB</strong> ל <strong>%3 MB</strong>. + + + + Resizing %2MB partition %1 to %3MB. + משנה את מחיצה %1 מ %2 MB ל %3 MB. + + + + + The installer failed to resize partition %1 on disk '%2'. + תהליך ההתקנה נכשל בשינוי גודל המחיצה %1 על כונן '%2'. + + + + Could not open device '%1'. + נכשלה פתיחת התקן '%1'. + + + + ScanningDialog + + + Scanning storage devices... + סורק התקני זכרון... + + + + Partitioning + מגדיר מחיצות + + + + SetHostNameJob + + + Set hostname %1 + הגדר שם עמדה %1 + + + + Set hostname <strong>%1</strong>. + הגדר שם עמדה <strong>%1</strong>. + + + + Setting hostname %1. + מגדיר את שם העמדה %1. + + + + + Internal Error + שגיאה פנימית + + + + + Cannot write hostname to target system + נכשלה כתיבת שם העמדה למערכת המטרה + + + + SetKeyboardLayoutJob + + + Set keyboard model to %1, layout to %2-%3 + הגדר דגם מקלדת ל %1, פריסת לוח מקשים ל %2-%3 + + + + Failed to write keyboard configuration for the virtual console. + נכשלה כתיבת הגדרת מקלדת למסוף הוירטואלי. + + + + + + Failed to write to %1 + נכשלה כתיבה ל %1 + + + + Failed to write keyboard configuration for X11. + נכשלה כתיבת הגדרת מקלדת עבור X11. + + + + Failed to write keyboard configuration to existing /etc/default directory. + נכשלה כתיבת הגדרת מקלדת לתיקיה קיימת /etc/default. + + + + SetPartFlagsJob + + + Set flags on partition %1. + הגדר סימונים על מחיצה %1. + + + + Set flags on %1MB %2 partition. + הגדר סימונים על מחיצה %2 בגודל %1 MB. + + + + Set flags on new partition. + הגדר סימונים על מחיצה חדשה. + + + + Clear flags on partition <strong>%1</strong>. + מחק סימונים על מחיצה <strong>%1</strong>. + + + + Clear flags on %1MB <strong>%2</strong> partition. + מחק סימונים על מחיצה <strong>%2</strong> בגודל %1 MB. + + + + Clear flags on new partition. + מחק סימונים על המחיצה החדשה. + + + + Flag partition <strong>%1</strong> as <strong>%2</strong>. + סמן מחיצה <strong>%1</strong> כ <strong>%2</strong>. + + + + Flag %1MB <strong>%2</strong> partition as <strong>%3</strong>. + סמן מחיצה <strong>%2</strong> בגודל %1 MB כ <strong>%3</strong>. + + + + Flag new partition as <strong>%1</strong>. + סמן מחיצה חדשה כ <strong>%1</strong>. + + + + Clearing flags on partition <strong>%1</strong>. + מוחק סימונים על מחיצה <strong>%1</strong>. + + + + Clearing flags on %1MB <strong>%2</strong> partition. + מוחק סימונים על מחיצה <strong>%2</strong> בגודל %1 MB. + + + + Clearing flags on new partition. + מוחק סימונים על מחיצה חדשה. + + + + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. + מגדיר סימונים <strong>%2</strong> על מחיצה <strong>%1</strong>. + + + + Setting flags <strong>%3</strong> on %1MB <strong>%2</strong> partition. + מגדיר סימונים <strong>%3</strong> על מחיצה <strong>%2</strong> בגודל %1 MB. + + + + Setting flags <strong>%1</strong> on new partition. + מגדיר סימונים <strong>%1</strong> על מחיצה חדשה. + + + + The installer failed to set flags on partition %1. + תהליך ההתקנה נכשל בעת הצבת סימונים במחיצה %1. + + + + Could not open device '%1'. + פתיחת כונן '%1' נכשלה. + + + + Could not open partition table on device '%1'. + פתיחת טבלת מחיצות על כונן '%1' נכשלה. + + + + Could not find partition '%1'. + לא נמצאה מחיצה '%1'. + + + + SetPartGeometryJob + + + Update geometry of partition %1. + עדכן גאומטריית מחיצה %1. + + + + Failed to change the geometry of the partition. + נכשל שינוי גאומטריית המחיצה. + + + + SetPasswordJob + + + Set password for user %1 + הגדר סיסמה עבור משתמש %1 + + + + Setting password for user %1. + מגדיר סיסמה עבור משתמש %1. + + + + Bad destination system path. + יעד נתיב המערכת לא תקין. + + + + rootMountPoint is %1 + עיגון מחיצת מערכת ההפעלה, rootMountPoint, היא %1 + + + + Cannot disable root account. + לא ניתן לנטרל את חשבון המנהל root. + + + + passwd terminated with error code %1. + passwd הסתיימה עם שגיאת קוד %1. + + + + Cannot set password for user %1. + לא ניתן להגדיר סיסמה עבור משתמש %1. + + + + usermod terminated with error code %1. + פקודת שינוי מאפייני המשתמש, usermod, נכשלה עם קוד יציאה %1. + + + + SetTimezoneJob + + + Set timezone to %1/%2 + הגדרת אזור זמן ל %1/%2 + + + + Cannot access selected timezone path. + לא ניתן לגשת לנתיב של אזור הזמן הנבחר. + + + + Bad path: %1 + נתיב לא תקין: %1 + + + + Cannot set timezone. + לא ניתן להגדיר את אזור הזמן. + + + + Link creation failed, target: %1; link name: %2 + נכשלה יצירת קיצור דרך, מיקום: %1; שם קיצור הדרך: %2 + + + + Cannot set timezone, + לא ניתן להגדיר את אזור הזמן, + + + + Cannot open /etc/timezone for writing + לא ניתן לפתוח את /etc/timezone לכתיבה + + + + SummaryPage + + + This is an overview of what will happen once you start the install procedure. + להלן סקירת המאורעות שיתרחשו עם תחילת תהליך ההתקנה. + + + + SummaryViewStep + + + Summary + סיכום + + + + UsersPage + + + Your username is too long. + שם המשתמש ארוך מדי. + + + + Your username contains invalid characters. Only lowercase letters and numbers are allowed. + שם העמדה מכיל ערכים לא תקינים. ניתן להשתמש אך ורק באותיות קטנות ומספרים. + + + + Your hostname is too short. + שם העמדה קצר מדי. + + + + Your hostname is too long. + שם העמדה ארוך מדי. + + + + Your hostname contains invalid characters. Only letters, numbers and dashes are allowed. + שם העמדה מכיל ערכים לא תקינים. אך ורק אותיות, מספרים ומקפים מורשים. + + + + + Your passwords do not match! + הסיסמאות לא תואמות! + + + + UsersViewStep + + + Users + משתמשים + + + + WelcomePage + + + Form + Form + + + + &Language: + &שפה: + + + + &Release notes + &הערות הפצה + + + + &Known issues + &בעיות נפוצות + + + + &Support + &תמיכה + + + + &About + &אודות + + + + <h1>Welcome to the %1 installer.</h1> + <h1>ברוכים הבאים להתקנת %1.</h1> + + + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>ברוכים הבאים להתקנת Calamares עבור %1.</h1> + + + + About %1 installer + אודות התקנת %1 + + + + <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> - משחררים תוכנה. + + + + %1 support + תמיכה ב - %1 + + + + WelcomeViewStep + + + Welcome + ברוכים הבאים + + + \ No newline at end of file diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts index fa0e4bdbe..4aac00ddc 100644 --- a/lang/calamares_hi.ts +++ b/lang/calamares_hi.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - संकुचन हेतु विभाजन चुनें - - - - Allocate drive space by dragging the divider below: - - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -215,32 +182,32 @@ Output: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path - + Working directory %1 for python job %2 is not readable. - + Bad main script file - + Main script file %1 for python job %2 is not readable. - + Boost.Python error in job "%1". @@ -248,64 +215,90 @@ Output: Calamares::ViewManager - + &Back - + &Next - - + + &Cancel - + + + Cancel installation without changing the system. + + + + Cancel installation? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now - + Go &back - - &Quit + + &Done - + + The installation is complete. Close the installer. + + + + Error - + Installation Failed @@ -336,12 +329,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer - + Show debug information @@ -362,7 +355,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -372,17 +365,17 @@ The installer will quit and all changes will be lost. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -395,35 +388,35 @@ The installer will quit and all changes will be lost. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -433,71 +426,71 @@ 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>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -523,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. @@ -550,6 +543,11 @@ The installer will quit and all changes will be lost. Create a Partition + + + MiB + + Partition &Type: @@ -586,32 +584,27 @@ The installer will quit and all changes will be lost. - - MB - - - - + En&crypt - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -824,7 +817,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -926,17 +919,22 @@ The installer will quit and all changes will be lost. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -964,7 +962,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -982,27 +980,27 @@ The installer will quit and all changes will be lost. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1020,18 +1018,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1109,12 +1122,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1130,15 +1143,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1221,12 +1244,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1247,12 +1270,12 @@ The installer will quit and all changes will be lost. - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1323,17 +1346,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1382,7 +1405,6 @@ The installer will quit and all changes will be lost. - @@ -1556,7 +1578,7 @@ The installer will quit and all changes will be lost. - + Are you sure you want to create a new partition table on %1? @@ -1579,82 +1601,82 @@ The installer will quit and all changes will be lost. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1673,22 +1695,22 @@ The installer will quit and all changes will be lost. - + unknown - + extended - + unformatted - + swap @@ -1711,64 +1733,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1776,55 +1798,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2060,42 +2087,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2229,22 +2256,27 @@ The installer will quit and all changes will be lost. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts index ab1d450a5..6d40a25d4 100644 --- a/lang/calamares_hr.ts +++ b/lang/calamares_hr.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Odaberi particiju za smanjivanje: - - - - Allocate drive space by dragging the divider below: - Dodijeli prostor na disku povlačeći razdjelnik koja se nalazi ispod: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Sa ovom operacijom, particija <strong>%1</strong> koja sadrži %4 će biti smanjena za %2MB i stvorit će se nova %3MB particija za %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - EFI particija ne postoji na ovom sustavu. Vratite se natrag i koristite ručno particioniranje da bi ste postavili %1. - - - - The EFI system partition at %1 will be used for starting %2. - EFI particija na %1 će se koristiti za pokretanje %2. - - - - EFI system partition: - EFI particija: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. <strong>Boot okruženje</strong> sustava.<br><br>Stariji x86 sustavi jedino podržavaju <strong>BIOS</strong>.<br>Noviji sustavi uglavnom koriste <strong>EFI</strong>, ali mogu podržavati i BIOS ako su pokrenuti u načinu kompatibilnosti. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Ovaj sustav koristi <strong>EFI</strong> okruženje.<br><br>Za konfiguriranje pokretanja iz EFI okruženja, ovaj instalacijski program mora uvesti boot učitavač, kao što je <strong>GRUB</strong> ili <strong>systemd-boot</strong> na <strong>EFI particiju</strong>. To se odvija automatski, osim ako ste odabrali ručno particioniranje. U tom slučaju to ćete morati odabrati ili stvoriti sami. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Ovaj sustav koristi <strong>BIOS</strong> okruženje.<br><br>Za konfiguriranje pokretanja iz BIOS okruženja, ovaj instalacijski program mora uvesti boot učitavač, kao što je <strong>GRUB</strong>, ili na početku particije ili na <strong>Master Boot Record</strong> blizu početka particijske tablice (preporučen način). To se odvija automatski, osim ako ste odabrali ručno particioniranje. U tom slučaju to ćete morati napraviti sami. @@ -221,32 +188,32 @@ Izlaz: Calamares::PythonJob - + Running %1 operation. Izvodim %1 operaciju. - + Bad working directory path Krivi put do radnog direktorija - + Working directory %1 for python job %2 is not readable. Radni direktorij %1 za python zadatak %2 nije čitljiv. - + Bad main script file Kriva glavna datoteka skripte - + Main script file %1 for python job %2 is not readable. Glavna skriptna datoteka %1 za python zadatak %2 nije čitljiva. - + Boost.Python error in job "%1". Boost.Python greška u zadatku "%1". @@ -254,65 +221,91 @@ Izlaz: Calamares::ViewManager - + &Back &Natrag - + &Next &Sljedeće - - + + &Cancel &Odustani - + + + Cancel installation without changing the system. + Odustanite od instalacije bez promjena na sustavu. + + + Cancel installation? Prekinuti instalaciju? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Stvarno želite prekinuti instalacijski proces? Instalacijski program će izaći i sve promjene će biti izgubljene. - + + &Yes + &Da + + + + &No + &Ne + + + + &Close + &Zatvori + + + Continue with setup? Nastaviti s postavljanjem? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 instalacijski program će napraviti promjene na disku kako bi instalirao %2.<br/><strong>Nećete moći vratiti te promjene.</strong> - + &Install now &Instaliraj sada - + Go &back Idi &natrag - - &Quit - &Izađi + + &Done + &Gotovo - + + The installation is complete. Close the installer. + Instalacija je završena. Zatvorite instalacijski program. + + + Error Greška - + Installation Failed Instalacija nije uspjela @@ -343,12 +336,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. CalamaresWindow - + %1 Installer %1 Instalacijski program - + Show debug information Prikaži debug informaciju @@ -369,7 +362,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Ovo računalo ne zadovoljava minimalne uvijete za instalaciju %1.<br/>Instalacija se ne može nastaviti.<a href="#details">Detalji...</a> @@ -379,17 +372,17 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Računalo ne zadovoljava neke od preporučenih uvjeta za instalaciju %1.<br/>Instalacija se može nastaviti, ali neke značajke možda neće biti dostupne. - + This program will ask you some questions and set up %2 on your computer. Ovaj program će vam postaviti neka pitanja i instalirati %2 na vaše računalo. - + For best results, please ensure that this computer: Za najbolje rezultate, pobrinite se da ovo računalo: - + System requirements Zahtjevi sustava @@ -402,35 +395,35 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Oblik - + After: Poslije: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Ručno particioniranje</strong><br/>Možete sami stvoriti ili promijeniti veličine particija. - + Boot loader location: Lokacija boot učitavača: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 će se smanjiti na %2MB i stvorit će se nova %3MB particija za %4. - + Select storage de&vice: Odaberi uređaj za spremanje: - - - - + + + + Current: Trenutni: @@ -440,71 +433,71 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Koristi %1 kao home particiju za %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Odaberite particiju za smanjivanje, te povlačenjem donjeg pokazivača odaberite promjenu veličine</strong> - + <strong>Select a partition to install on</strong> <strong>Odaberite particiju za instalaciju</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. EFI particija ne postoji na ovom sustavu. Vratite se natrag i koristite ručno particioniranje da bi ste postavili %1. - + The EFI system partition at %1 will be used for starting %2. EFI particija na %1 će se koristiti za pokretanje %2. - + EFI system partition: EFI particija: - + 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. Izgleda da na ovom disku nema operacijskog sustava. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Obriši disk</strong><br/>To će <font color="red">obrisati</font> sve podatke na odabranom disku. - + 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. Ovaj disk ima %1. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instaliraj uz postojeće</strong><br/>Instalacijski program će smanjiti particiju da bi napravio mjesto za %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Zamijeni particiju</strong><br/>Zamijenjuje particiju sa %1. - + This storage device already has 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. Ovaj disk već ima operacijski sustav. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku. - + This storage device has multiple operating systems 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. Ovaj disk ima više operacijskih sustava. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku. @@ -530,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. @@ -557,6 +550,11 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Create a Partition Stvori particiju + + + MiB + MiB + Partition &Type: @@ -593,32 +591,27 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Ve&ličina: - - MB - MB - - - + En&crypt Ši&friraj - + Logical Logično - + Primary Primarno - + GPT GPT - + Mountpoint already in use. Please select another one. Točka montiranja se već koristi. Odaberite drugu. @@ -831,7 +824,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. DeviceInfoWidget - + 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. Tip <strong>particijske tablice</strong> na odabranom disku.<br><br>Jedini način da bi ste promijenili tip particijske tablice je da obrišete i iznova stvorite particijsku tablicu. To će uništiiti sve podatke na disku.<br>Instalacijski program će zadržati postojeću particijsku tablicu osim ako ne odaberete drugačije.<br>Ako niste sigurni, na novijim sustavima GPT je preporučena particijska tablica. @@ -933,17 +926,22 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Ve&ličina: - + + MiB + MiB + + + Fi&le System: Da&totečni sustav: - + Flags: Oznake: - + Mountpoint already in use. Please select another one. Točka montiranja se već koristi. Odaberite drugu. @@ -971,7 +969,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Potvrdi lozinku - + Please enter the same passphrase in both boxes. Molimo unesite istu lozinku u oba polja. @@ -989,27 +987,27 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Instaliraj %1 na <strong>novu</strong> %2 sistemsku particiju. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Postavi <strong>novu</strong> %2 particiju s točkom montiranja <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Instaliraj %2 na %3 sistemsku particiju <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Postavi %3 particiju <strong>%1</strong> s točkom montiranja <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Instaliraj boot učitavač na <strong>%1</strong>. - + Setting up mount points. Postavljam točke montiranja. @@ -1027,18 +1025,33 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.&Ponovno pokreni sada - + <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>Gotovo.</h1><br/>%1 je instaliran na vaše računalo.<br/>Sada možete ponovno pokrenuti računalo ili nastaviti sa korištenjem %2 live okruženja. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>Instalacija nije uspijela</h1><br/>%1 nije instaliran na vaše računalo.<br/>Greška: %2. + FinishedViewStep - + Finish Završi + + + Installation Complete + Instalacija je završena + + + + The installation of %1 is complete. + Instalacija %1 je završena. + FormatPartitionJob @@ -1116,12 +1129,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. KeyboardPage - + Set keyboard model to %1.<br/> Postavi model tipkovnice na %1.<br/> - + Set keyboard layout to %1/%2. Postavi raspored tipkovnice na %1%2. @@ -1137,15 +1150,25 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. LCLocaleDialog - + System locale setting Postavke jezične sheme sustava - + 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>. Jezična shema sustava ima efekt na jezični i znakovni skup za neke komandno linijske elemente sučelja.<br/>Trenutačna postavka je <strong>%1</strong>. + + + &Cancel + &Odustani + + + + &OK + &OK + LicensePage @@ -1228,12 +1251,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. LocalePage - + The system language will be set to %1. Jezik sustava će se postaviti na %1. - + The numbers and dates locale will be set to %1. Jezična shema brojeva i datuma će se postaviti na %1. @@ -1254,12 +1277,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.&Promijeni... - + Set timezone to %1/%2.<br/> Postavi vremesku zonu na %1%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. NetInstallPage - + Name Ime - + Description Opis - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Mrežna instalacija. (Onemogućeno: Ne mogu dohvatiti listu paketa, provjerite da li ste spojeni na mrežu) @@ -1389,7 +1412,6 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Koje ime želite koristiti za prijavu? - @@ -1563,7 +1585,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Instaliraj boot &učitavač na: - + Are you sure you want to create a new partition table on %1? Jeste li sigurni da želite stvoriti novu particijsku tablicu na %1? @@ -1586,82 +1608,82 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Instaliraj %1 <strong>uz postojeći</strong> operacijski sustav. - + <strong>Erase</strong> disk and install %1. <strong>Obriši</strong> disk i instaliraj %1. - + <strong>Replace</strong> a partition with %1. <strong>Zamijeni</strong> particiju s %1. - + <strong>Manual</strong> partitioning. <strong>Ručno</strong> particioniranje. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Instaliraj %1 <strong>uz postojeći</strong> operacijski sustav na disku <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Obriši</strong> disk <strong>%2</strong> (%3) i instaliraj %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Zamijeni</strong> particiju na disku <strong>%2</strong> (%3) s %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Ručno</strong> particioniram disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disk <strong>%1</strong> (%2) - + Current: Trenutni: - + After: Poslije: - + No EFI system partition configured EFI particija nije konfigurirana - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. EFI particija je potrebna za pokretanje %1.<br/><br/>Da bi ste konfigurirali EFI particiju, idite natrag i odaberite ili stvorite FAT32 datotečni sustav s omogućenom <strong>esp</strong> oznakom i točkom montiranja <strong>%2</strong>.<br/><br/>Možete nastaviti bez postavljanja EFI particije, ali vaš sustav se možda neće moći pokrenuti. - + EFI system partition flag not set Oznaka EFI particije nije postavljena - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. EFI particija je potrebna za pokretanje %1.<br><br/>Particija je konfigurirana s točkom montiranja <strong>%2</strong> ali njezina <strong>esp</strong> oznaka nije postavljena.<br/>Za postavljanje oznake, vratite se i uredite postavke particije.<br/><br/>Možete nastaviti bez postavljanja oznake, ali vaš sustav se možda neće moći pokrenuti. - + Boot partition not encrypted Boot particija nije kriptirana - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Odvojena boot particija je postavljena zajedno s kriptiranom root particijom, ali boot particija nije kriptirana.<br/><br/>Zabrinuti smo za vašu sigurnost jer su važne datoteke sustava na nekriptiranoj particiji.<br/>Možete nastaviti ako želite, ali datotečni sustav će se otključati kasnije tijekom pokretanja sustava.<br/>Da bi ste kriptirali boot particiju, vratite se natrag i napravite ju, odabirom opcije <strong>Kriptiraj</strong> u prozoru za stvaranje prarticije. @@ -1680,22 +1702,22 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Zadano - + unknown nepoznato - + extended prošireno - + unformatted nije formatirano - + swap swap @@ -1718,64 +1740,64 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Odaberite gdje želite instalirati %1.<br/><font color="red">Upozorenje: </font>to će obrisati sve datoteke na odabranoj particiji. - + The selected item does not appear to be a valid partition. Odabrana stavka se ne ćini kao ispravna particija. - + %1 cannot be installed on empty space. Please select an existing partition. %1 ne može biti instaliran na prazni prostor. Odaberite postojeću particiju. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 se ne može instalirati na proširenu particiju. Odaberite postojeću primarnu ili logičku particiju. - + %1 cannot be installed on this partition. %1 se ne može instalirati na ovu particiju. - + Data partition (%1) Podatkovna particija (%1) - + Unknown system partition (%1) Nepoznata particija sustava (%1) - + %1 system partition (%2) %1 particija sustava (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>Particija %1 je premala za %2. Odaberite particiju kapaciteta od najmanje %3 GiB. - + <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 particijane postoji na ovom sustavu. Vratite se natrag i koristite ručno particioniranje za postavljane %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 će biti instaliran na %2.<br/><font color="red">Upozorenje: </font>svi podaci na particiji %2 će biti izgubljeni. - + The EFI system partition at %1 will be used for starting %2. EFI particija na %1 će se koristiti za pokretanje %2. - + EFI system partition: EFI particija: @@ -1783,55 +1805,60 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. RequirementsChecker - + Gathering system information... Skupljanje informacija o sustavu... - + has at least %1 GB available drive space ima barem %1 GB dostupne slobodne memorije na disku - + There is not enough drive space. At least %1 GB is required. Nema dovoljno prostora na disku. Potrebno je najmanje %1 GB. - + has at least %1 GB working memory ima barem %1 GB radne memorije - + The system does not have enough working memory. At least %1 GB is required. Ovaj sustav nema dovoljno radne memorije. Potrebno je najmanje %1 GB. - + is plugged in to a power source je spojeno na izvor struje - + The system is not plugged in to a power source. Ovaj sustav nije spojen na izvor struje. - + is connected to the Internet je spojeno na Internet - + The system is not connected to the Internet. Ovaj sustav nije spojen na internet. - + The installer is not running with administrator rights. Instalacijski program nije pokrenut sa administratorskim dozvolama. + + + The screen is too small to display the installer. + Zaslon je premalen za prikaz instalacijskog programa. + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. SetPasswordJob - + Set password for user %1 Postavi lozinku za korisnika %1 - + Setting password for user %1. Postavljam lozinku za korisnika %1. - + Bad destination system path. Loš odredišni put sustava. - + rootMountPoint is %1 rootTočkaMontiranja je %1 - + Cannot disable root account. Ne mogu onemogućiti root račun. - + passwd terminated with error code %1. passwd je prekinut s greškom %1. - + Cannot set password for user %1. Ne mogu postaviti lozinku za korisnika %1. - + usermod terminated with error code %1. usermod je prekinut s greškom %1. @@ -2236,22 +2263,27 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.&O programu - + <h1>Welcome to the %1 installer.</h1> <h1>Dobrodošli u %1 instalacijski program.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + Dobrodošli u Calamares instalacijski program za %1. + + + About %1 installer O %1 instalacijskom programu - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>for %3</strong><br/><br/>Autorska prava 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Hvala: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg i <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> razvoj je sponzoriran od <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + <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/>za %3</strong><br/><br/>Autorska prava 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Autorska prava 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Zahvale: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg i <a href="https://www.transifex.com/calamares/calamares/">Calamares timu za prevođenje</a>.<br/><br/><a href="http://calamares.io/">Calamares</a>sponzorira <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + %1 support %1 podrška diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts index 68877f4e6..32af46f3c 100644 --- a/lang/calamares_hu.ts +++ b/lang/calamares_hu.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Válaszd ki melyik partíció legyen átméretezve, zsugorítva: - - - - Allocate drive space by dragging the divider below: - Az alábbi osztósáv húzásával meghatározhatod a lefoglalandó meghajtó területet: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Ezzel a művelettel, a <strong>%1</strong> partíció, ami %4-et tartalmaz, %2MB-ra lesz zsugorítva és egy új %3MB partíció lesz létrehozva %5 számára. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Az EFI rendszerpartíció nem található a rendszerben. Kérlek, lépj vissza és állítsd be manuális partícionálással %1- et. - - - - The EFI system partition at %1 will be used for starting %2. - A %2 indításához az EFI rendszer partíciót használja a következőn: %1 - - - - EFI system partition: - EFI rendszer partíció: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. A rendszer <strong>indító környezete.<strong> <br><br>Régebbi x86 alapú rendszerek csak <strong>BIOS</strong><br>-t támogatják. A modern rendszerek gyakran <strong>EFI</strong>-t használnak, de lehet, hogy BIOS-ként látható ha kompatibilitási módban fut az indító környezet. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. A rendszer <strong>EFI</strong> indító környezettel lett indítva.<br><br>Annak érdekében, hogy az EFI környezetből indíthassunk a telepítőnek telepítenie kell a rendszerbetöltő alkalmazást pl. <strong>GRUB</strong> vagy <strong>systemd-boot</strong> az <strong>EFI Rendszer Partíción.</strong> Ez automatikus kivéve ha kézi partícionálást választottál ahol neked kell kiválasztani vagy létrehozni. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. A rendszer <strong>BIOS</strong> környezetből lett indítva. <br><br>Azért, hogy el lehessen indítani a rendszert egy BIOS környezetből a telepítőnek telepítenie kell egy indító környezetet mint pl. <strong>GRUB</strong>. Ez telepíthető a partíció elejére vagy a <strong>Master Boot Record</strong>-ba. javasolt a partíciós tábla elejére (javasolt). Ez automatikus kivéve ha te kézi partícionálást választottál ahol neked kell telepíteni. @@ -221,32 +188,32 @@ Kimenet: Calamares::PythonJob - + Running %1 operation. Futó %1 műveletek. - + Bad working directory path Rossz munkakönyvtár útvonal - + Working directory %1 for python job %2 is not readable. Munkakönyvtár %1 a python folyamathoz %2 nem olvasható. - + Bad main script file Rossz alap script fájl - + Main script file %1 for python job %2 is not readable. Alap script fájl %1 a python folyamathoz %2 nem olvasható. - + Boost.Python error in job "%1". Boost. Python hiba ebben a folyamatban "%1". @@ -254,65 +221,91 @@ Kimenet: Calamares::ViewManager - + &Back &Vissza - + &Next &Következő - - + + &Cancel &Mégse - + + + Cancel installation without changing the system. + Kilépés a telepítőből a rendszer megváltoztatása nélkül. + + + Cancel installation? Abbahagyod a telepítést? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Biztos abba szeretnéd hagyni a telepítést? Minden változtatás elveszik, ha kilépsz a telepítőből. - + + &Yes + &Igen + + + + &No + @Nem + + + + &Close + &Bezár + + + Continue with setup? Folytatod a telepítéssel? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> A %1 telepítő változtatásokat fog elvégezni, hogy telepítse a következőt: %2.<br/><strong>A változtatások visszavonhatatlanok lesznek.</strong> - + &Install now &Telepítés most - + Go &back Menj &vissza - - &Quit - &Kilépés + + &Done + &Befejez - + + The installation is complete. Close the installer. + A telepítés befejeződött, kattints a bezárásra. + + + Error Hiba - + Installation Failed Telepítés nem sikerült @@ -343,12 +336,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. CalamaresWindow - + %1 Installer %1 Telepítő - + Show debug information Hibakeresési információk mutatása @@ -369,7 +362,7 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Ez a számítógép nem felel meg a minimum követelményeknek a %1 telepítéséhez.<br/> Telepítés nem folytatható. <a href="#details">Részletek...</a> @@ -380,17 +373,17 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Ez a számítógép nem felel meg a minimum követelményeknek a %1 telepítéséhez.<br/>Telepítés folytatható de néhány tulajdonság valószínűleg nem lesz elérhető. - + This program will ask you some questions and set up %2 on your computer. Ez a program fel fog tenni néhány kérdést és %2 -t telepíti a számítógépre. - + For best results, please ensure that this computer: A legjobb eredményért győződjünk meg, hogy ez a számítógép: - + System requirements Rendszer követelmények @@ -403,35 +396,35 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Adatlap - + After: Utána: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Manuális partícionálás</strong><br/>Létrehozhat vagy átméretezhet partíciókat. - + Boot loader location: Rendszerbetöltő helye: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 lesz zsugorítva %2MB méretűre és egy új %3MB méretű partíció lesz létrehozva itt %4 - + Select storage de&vice: Válassz tároló eszközt: - - - - + + + + Current: Aktuális: @@ -441,71 +434,71 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l %1 partíció használata mint home partíció a %2 -n - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Válaszd ki a partíciót amit zsugorítani akarsz és egérrel méretezd át.</strong> - + <strong>Select a partition to install on</strong> <strong>Válaszd ki a telepítésre szánt partíciót </strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Nem található EFI partíció a rendszeren. Menj vissza a manuális partícionáláshoz és állíts be %1. - + The EFI system partition at %1 will be used for starting %2. A %1 EFI rendszer partíció lesz használva %2 indításához. - + EFI system partition: EFI rendszerpartíció: - + 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. Úgy tűnik ezen a tárolóeszközön nincs operációs rendszer. Mit szeretnél csinálni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Lemez törlése</strong><br/>Ez <font color="red">törölni</font> fogja a lemezen levő összes adatot. - + 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. Ezen a tárolóeszközön %1 található. Mit szeretnél tenni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Meglévő mellé telepíteni</strong><br/>A telepítő zsugorítani fogja a partíciót, hogy elférjen a %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>A partíció lecserélése</strong> a következővel: %1. - + This storage device already has 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. Ez a tárolóeszköz már tartalmaz egy operációs rendszert. Mit szeretnél tenni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön. - + This storage device has multiple operating systems 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. A tárolóeszközön több operációs rendszer található. Mit szeretnél tenni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön. @@ -531,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 @@ -558,6 +551,11 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Create a Partition Partíció Létrehozása + + + MiB + MiB + Partition &Type: @@ -594,32 +592,27 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Mé&ret: - - MB - MB - - - + En&crypt Titkosítás - + Logical Logikai - + Primary Elsődleges - + GPT GPT - + Mountpoint already in use. Please select another one. A csatolási pont már használatban van. Kérem, válassz másikat. @@ -832,7 +825,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l DeviceInfoWidget - + 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. A <strong>partíciós tábla</strong> típusa a kiválasztott tárolóeszközön.<br><br>Az egyetlen lehetőség a partíciós tábla változtatására ha töröljük és újra létrehozzuk a partíciós táblát, ami megsemmisít minden adatot a tárolóeszközön.<br>A telepítő megtartja az aktuális partíciós táblát ha csak másképp nem döntesz.<br>Ha nem vagy benne biztos a legtöbb modern rendszernél GPT az elterjedt. @@ -934,17 +927,22 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l &méret: - + + MiB + MiB + + + Fi&le System: &fájlrendszer - + Flags: Zászlók: - + Mountpoint already in use. Please select another one. A csatolási pont már használatban van. Kérem, válassz másikat. @@ -972,7 +970,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Jelszó megerősítés - + Please enter the same passphrase in both boxes. Írd be ugyanazt a jelmondatot mindkét dobozban. @@ -990,27 +988,27 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l %1 telepítése az <strong>új</strong> %2 partícióra. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. <strong>Új</strong> %2 partíció beállítása <strong>%1</strong> csatolási ponttal. - + Install %2 on %3 system partition <strong>%1</strong>. %2 telepítése %3 <strong>%1</strong> rendszer partícióra. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. %3 partíció beállítása <strong>%1</strong> <strong>%2</strong> csatolási ponttal. - + Install boot loader on <strong>%1</strong>. Rendszerbetöltő telepítése ide <strong>%1</strong>. - + Setting up mount points. Csatlakozási pontok létrehozása @@ -1028,18 +1026,33 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l $Újraindítás most - + <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>Sikeres művelet.</h1><br/>%1 telepítve lett a számítógépére.<br/>Újraindítás után folytathatod az %2 éles környezetben. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>A telepítés hibába ütközött.</h1><br/>%1 nem lett telepítve a számítógépre.<br/>A hibaüzenet: %2. + FinishedViewStep - + Finish Befejezés + + + Installation Complete + A telepítés befejeződött. + + + + The installation of %1 is complete. + A %1 telepítése elkészült. + FormatPartitionJob @@ -1117,12 +1130,12 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l KeyboardPage - + Set keyboard model to %1.<br/> Billentyűzet típus beállítása %1.<br/> - + Set keyboard layout to %1/%2. Billentyűzet kiosztás beállítása %1/%2. @@ -1138,15 +1151,25 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l LCLocaleDialog - + System locale setting Területi beállítások - + 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>. A nyelvi beállítás kihat a nyelvi és karakter beállításokra a parancssori elemeknél.<br/>A jelenlegi beállítás <strong>%1</strong>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1229,12 +1252,12 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l LocalePage - + The system language will be set to %1. A rendszer területi beállítása %1. - + The numbers and dates locale will be set to %1. A számok és dátumok területi beállítása %1. @@ -1255,12 +1278,12 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l &Változtat... - + Set timezone to %1/%2.<br/> Időzóna beállítása %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1331,17 +1354,17 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l NetInstallPage - + Name Név - + Description Leírás - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Hálózati telepítés. (Kikapcsolva: A csomagokat nem lehet letölteni, ellenőrizd a hálózati kapcsolatot) @@ -1390,7 +1413,6 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Milyen felhasználónévvel szeretnél bejelentkezni? - @@ -1564,7 +1586,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l &Rendszerbetöltő telepítése ide: - + Are you sure you want to create a new partition table on %1? Biztos vagy benne, hogy létrehozol egy új partíciós táblát itt %1 ? @@ -1587,82 +1609,82 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l %1 telepítése más operációs rendszer <strong>mellé</strong> . - + <strong>Erase</strong> disk and install %1. <strong>Lemez törlés</strong>és %1 telepítés. - + <strong>Replace</strong> a partition with %1. <strong>A partíció lecserélése</strong> a következővel: %1. - + <strong>Manual</strong> partitioning. <strong>Kézi</strong> partícionálás. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). %1 telepítése más operációs rendszer <strong>mellé</strong> a <strong>%2</strong> (%3) lemezen. - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>%2 lemez törlése</strong> (%3) és %1 telepítés. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>A partíció lecserélése</strong> a <strong>%2</strong> lemezen(%3) a következővel: %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Kézi</strong> telepítés a <strong>%1</strong> (%2) lemezen. - + Disk <strong>%1</strong> (%2) Lemez <strong>%1</strong> (%2) - + Current: Aktuális: - + After: Utána: - + No EFI system partition configured Nincs EFI rendszer partíció beállítva - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. EFI rendszerpartíciónak léteznie kell %1 indításához.<br/><br/> Az EFI rendszer beállításához lépj vissza és hozz létre FAT32 fájlrendszert <strong>esp</strong> zászlóval és <strong>%2</strong> csatolási ponttal beállítva.<br/><br/> Folytathatod a telepítést EFI rendszerpartíció létrehozása nélkül is, de lehet, hogy a rendszer nem indul majd. - + EFI system partition flag not set EFI partíciós zászló nincs beállítva - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. EFI rendszerpartíciónak léteznie kell %1 indításához.<br/><br/> A csatolási pont <strong>%2</strong> beállítása sikerült a partíción de a zászló nincs beállítva. A beálíltásához lépj vissza szerkeszteni a partíciót..<br/><br/> Folytathatod a telepítést zászló beállítása nélkül is, de lehet, hogy a rendszer nem indul el majd. - + Boot partition not encrypted Indító partíció nincs titkosítva - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Egy külön indító partíció lett beállítva egy titkosított root partícióval, de az indító partíció nincs titkosítva.br/><br/>Biztonsági aggályok merülnek fel ilyen beállítás mellet, mert fontos fájlok nem titkosított partíción vannak tárolva. <br/>Ha szeretnéd, folytathatod így, de a fájlrendszer zárolása meg fog történni az indítás után. <br/> Az indító partíció titkosításához lépj vissza és az újra létrehozáskor válaszd a <strong>Titkosít</strong> opciót. @@ -1681,22 +1703,22 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Alapértelmezett - + unknown ismeretlen - + extended kiterjesztett - + unformatted formázatlan - + swap Swap @@ -1719,64 +1741,64 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l Válaszd ki az telepítés helyét %1.<br/><font color="red">Figyelmeztetés: </font>minden fájl törölve lesz a kiválasztott partíción. - + The selected item does not appear to be a valid partition. A kiválasztott elem nem tűnik érvényes partíciónak. - + %1 cannot be installed on empty space. Please select an existing partition. %1 nem telepíthető, kérlek válassz egy létező partíciót. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 nem telepíthető a kiterjesztett partícióra. Kérlek, válassz egy létező elsődleges vagy logikai partíciót. - + %1 cannot be installed on this partition. Nem lehet telepíteni a következőt %1 erre a partícióra. - + Data partition (%1) Adat partíció (%1) - + Unknown system partition (%1) Ismeretlen rendszer partíció (%1) - + %1 system partition (%2) %1 rendszer partíció (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>A partíció %1 túl kicsi a következőhöz %2. Kérlek, válassz egy legalább %3 GB- os partíciót. - + <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/>Az EFI rendszerpartíció nem található a rendszerben. Kérlek, lépj vissza és állítsd be manuális partícionálással %1- et. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 installálva lesz a következőre: %2.<br/><font color="red">Figyelmeztetés: </font>a partíción %2 minden törölve lesz. - + The EFI system partition at %1 will be used for starting %2. A %2 indításához az EFI rendszer partíciót használja a következőn: %1 - + EFI system partition: EFI rendszer partíció: @@ -1784,55 +1806,60 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l RequirementsChecker - + Gathering system information... Rendszerinformációk gyűjtése... - + has at least %1 GB available drive space Legalább %1 GB lemezterület elérhető - + There is not enough drive space. At least %1 GB is required. Nincs elég lemezterület. Legalább %1GB szükséges. - + has at least %1 GB working memory Legalább %1 GB elérhető memória - + The system does not have enough working memory. At least %1 GB is required. A rendszernek nincs elég memóriája. Legalább %1 GB szükséges. - + is plugged in to a power source csatlakoztatva van külső áramforráshoz - + The system is not plugged in to a power source. A rendszer nincs csatlakoztatva külső áramforráshoz - + is connected to the Internet csatlakozik az internethez - + The system is not connected to the Internet. A rendszer nem csatlakozik az internethez. - + The installer is not running with administrator rights. A telepítő nem adminisztrátori jogokkal fut. + + + The screen is too small to display the installer. + A képernyő túl kicsi a telepítőnek. + ResizeFileSystemJob @@ -2068,42 +2095,42 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l SetPasswordJob - + Set password for user %1 %1 felhasználó jelszó beállítása - + Setting password for user %1. %1 felhasználói jelszó beállítása - + Bad destination system path. Rossz célrendszer elérési út - + rootMountPoint is %1 rootMountPoint is %1 - + Cannot disable root account. A root account- ot nem lehet inaktiválni. - + passwd terminated with error code %1. passwd megszakítva %1 hibakóddal. - + Cannot set password for user %1. Nem lehet a %1 felhasználó jelszavát beállítani. - + usermod terminated with error code %1. usermod megszakítva %1 hibakóddal. @@ -2237,23 +2264,28 @@ Telepítés nem folytatható. <a href="#details">Részletek...&l &Névjegy - + <h1>Welcome to the %1 installer.</h1> <h1>Üdvözlet a %1 telepítőben.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Üdvözlet a Calamares %1 telepítőjében.</h1> + + + About %1 installer A %1 telepítőről - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>for %3</strong><br/><br/>Minden jog fenntartva 2014-2017 Teo Mrnjavac <teo@kde.org><br/>;Köszönet: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini and Rohan Garg és a <a href="https://www.transifex.com/calamares/calamares/" Calamares Fordító Csapat/a>. -<br/><br/><a href="http://calamares.io/">Calamares</a> fejlesztés támogatói:<br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + <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/>for %3</strong><br/><br/>Minden jog fenntartva 2014-2017 Teo Mrnjavac <teo@kde.org>;<br/>Minden jog fenntartva 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Köszönet: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, Pier Luigi Fiorini and Rohan Garg és a <a href="https://www.transifex.com/calamares/calamares/" Calamares Fordító Csapat/a>. +<br/><a href="http://calamares.io/">Calamares</a> fejlesztés támogatói:<br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + %1 support %1 támogatás diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index 910ef1b7c..53831e57b 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Pilih partisi untuk diiris: - - - - Allocate drive space by dragging the divider below: - Alokasikan ruang penyimpanan dengan menyeret pembatas di bawah: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Dengan operasi ini, partisi <b>%1</b> yang berisi %4 akan disusutkan menjadi %2MB dan sebuah partisi %3MB baru akan dibuat untuk %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Partisi sistem EFI tidak ditemukan di sistem ini. Silakan kembali dan gunakan pemartisian manual untuk menyetel %1. - - - - The EFI system partition at %1 will be used for starting %2. - Sistem partisi EFI pada %1 akan digunakan untuk memulai %2. - - - - EFI system partition: - Partisi sistem EFI: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. <strong>Lingkungan boot</strong> pada sistem ini.<br><br>Sistem x86 kuno hanya mendukung <strong>BIOS</strong>.<br>Sistem moderen biasanya menggunakan <strong>EFI</strong>, tapi mungkin juga tampak sebagai BIOS jika dimulai dalam mode kompatibilitas. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Sistem ini telah dimulai dengan lingkungan boot <strong>EFI</strong>.<br><br>Untuk mengkonfigurasi startup dari lingkungan EFI, pemasang ini seharusnya memaparkan sebuah aplikasi boot loader, seperti <strong>GRUB</strong> atau <strong>systemd-boot</strong> pada sebuah <strong>EFI System Partition</strong>. Ini adalah otomatis, kecuali kalau kamu memilih pemartisian manual, dalam beberapa kasus kamu harus memilihnya atau menciptakannya pada milikmu. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Sistem ini dimulai dengan sebuah lingkungan boot <strong>BIOS</strong>.<br><br>Untuk mengkonfigurasi startup dari sebuah lingkungan BIOS, pemasang ini seharusnya memasang sebuah boot loader, seperti <strong>GRUB</strong>, baik di awal partisi atau pada <strong>Master Boot Record</strong> di dekat awalan tabel partisi (yang disukai). Ini adalah otomatis, kecuali kalau kamu memilih pemartisian manual, dalam beberapa kasus kamu harus menyetelnya pada milikmu. @@ -221,32 +188,32 @@ Keluaran: Calamares::PythonJob - + Running %1 operation. Menjalankan %1 operasi. - + Bad working directory path Jalur lokasi direktori tidak berjalan baik - + Working directory %1 for python job %2 is not readable. Direktori kerja %1 untuk penugasan python %2 tidak dapat dibaca. - + Bad main script file Berkas skrip utama buruk - + Main script file %1 for python job %2 is not readable. Berkas skrip utama %1 untuk penugasan python %2 tidak dapat dibaca. - + Boost.Python error in job "%1". Boost.Python mogok dalam penugasan "%1". @@ -254,65 +221,91 @@ Keluaran: Calamares::ViewManager - + &Back &Kembali - + &Next &Berikutnya - - + + &Cancel &Batal - + + + Cancel installation without changing the system. + Batal pemasangan tanpa mengubah sistem yang ada. + + + Cancel installation? Batalkan pemasangan? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Apakah Anda benar-benar ingin membatalkan proses pemasangan ini? Pemasangan akan ditutup dan semua perubahan akan hilang. - + + &Yes + &Ya + + + + &No + &Tidak + + + + &Close + &Tutup + + + Continue with setup? Lanjutkan dengan setelan ini? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Pemasang %1 akan membuat perubahan ke disk Anda untuk memasang %2.<br/><strong>Anda tidak dapat membatalkan perubahan tersebut.</strong> - + &Install now &Pasang sekarang - + Go &back &Kembali - - &Quit - &Keluar + + &Done + &Kelar - + + The installation is complete. Close the installer. + Pemasangan sudah lengkap. Tutup pemasang. + + + Error Kesalahan - + Installation Failed Pemasangan Gagal @@ -343,12 +336,12 @@ Pemasangan akan ditutup dan semua perubahan akan hilang. CalamaresWindow - + %1 Installer Pemasang %1 - + Show debug information Tampilkan informasi debug @@ -369,7 +362,7 @@ Pemasangan akan ditutup dan semua perubahan akan hilang. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Komputer ini tidak memenuhi syarat minimum untuk memasang %1. Pemasang tidak dapat dilanjutkan. <a href=" @@ -381,17 +374,17 @@ Pemasang tidak dapat dilanjutkan. <a href=" Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. - + This program will ask you some questions and set up %2 on your computer. Program ini akan mengajukan beberapa pertanyaan dan menyetel %2 pada komputer Anda. - + For best results, please ensure that this computer: Untuk hasil terbaik, mohon pastikan bahwa komputer ini: - + System requirements Kebutuhan sistem @@ -404,35 +397,35 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Isian - + After: Setelah: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Pemartisian manual</strong><br/>Anda bisa membuat atau mengubah ukuran partisi. - + Boot loader location: Lokasi Boot loader: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 akan disusutkan menjadi %2MB dan partisi baru %3MB akan dibuat untuk %4. - + Select storage de&vice: Pilih perangkat penyimpanan: - - - - + + + + Current: Saat ini: @@ -442,71 +435,71 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Gunakan kembali %1 sebagai partisi home untuk %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Pilih sebuah partisi untuk diiris, kemudian seret bilah di bawah untuk mengubah ukuran</strong> - + <strong>Select a partition to install on</strong> <strong>Pilih sebuah partisi untuk memasang</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Sebuah partisi sistem EFI tidak ditemukan pada sistem ini. Silakan kembali dan gunakan pemartisian manual untuk mengeset %1. - + The EFI system partition at %1 will be used for starting %2. Partisi sistem EFI di %1 akan digunakan untuk memulai %2. - + EFI system partition: Partisi sistem EFI: - + 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. Tampaknya media penyimpanan ini tidak mengandung sistem operasi. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Hapus disk</strong><br/>Aksi ini akan <font color="red">menghapus</font> semua berkas yang ada pada media penyimpanan terpilih. - + 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. Media penyimpanan ini mengandung %1. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Pasang berdampingan dengan</strong><br/>Pemasang akan mengiris sebuah partisi untuk memberi ruang bagi %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Ganti sebuah partisi</strong><br/> Ganti partisi dengan %1. - + This storage device already has 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. Media penyimpanan ini telah mengandung sistem operasi. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan. - + This storage device has multiple operating systems 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. Media penyimpanan ini telah mengandung beberapa sistem operasi. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan. @@ -532,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. @@ -559,6 +552,11 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Create a Partition Buat Partisi + + + MiB + MiB + Partition &Type: @@ -595,32 +593,27 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Uku&ran: - - MB - MB - - - + En&crypt Enkripsi - + Logical Logikal - + Primary Utama - + GPT GPT - + Mountpoint already in use. Please select another one. Titik-kait sudah digunakan. Silakan pilih yang lainnya. @@ -833,7 +826,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. DeviceInfoWidget - + 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. Tipe dari <strong>tabel partisi</strong> pada perangkat penyimpanan terpilih.<br><br>Satu-satunya cara untuk mengubah tabel partisi adalah dengan menyetip dan menciptakan ulang tabel partisi dari awal, yang melenyapkan semua data pada perangkat penyimpanan.<br>Pemasang ini akan menjaga tabel partisi saat ini kecuali kamu secara gamblang memilih sebaliknya.<br>Jika tidak yakin, pada sistem GPT modern lebih disukai. @@ -935,17 +928,22 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Uku&ran: - + + MiB + MiB + + + Fi&le System: Sis&tem Berkas: - + Flags: Bendera: - + Mountpoint already in use. Please select another one. Titik-kait sudah digunakan. Silakan pilih yang lainnya. @@ -973,7 +971,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Konfirmasi kata sandi - + Please enter the same passphrase in both boxes. Silakan masukkan kata sandi yang sama di kedua kotak. @@ -991,27 +989,27 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Pasang %1 pada partisi sistem %2 <strong>baru</strong> - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Setel partisi %2 <strong>baru</strong> dengan tempat kait <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Pasang %2 pada sistem partisi %3 <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Setel partisi %3 <strong>%1</strong> dengan tempat kait <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Pasang boot loader di <strong>%1</strong>. - + Setting up mount points. Menyetel tempat kait. @@ -1029,18 +1027,33 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Mulai ulang seka&rang - + <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>Selesai.</h1><br>%1 sudah terpasang di komputer Anda.<br/>Anda dapat memulai ulang ke sistem baru atau lanjut menggunakan lingkungan Live %2. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>Pemasangan Gagal</h1><br/>%1 tidak bisa dipasang pada komputermu.<br/>Pesan galatnya adalah: %2. + FinishedViewStep - + Finish Selesai + + + Installation Complete + Pemasangan Lengkap + + + + The installation of %1 is complete. + Pemasangan %1 telah lengkap. + FormatPartitionJob @@ -1118,12 +1131,12 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. KeyboardPage - + Set keyboard model to %1.<br/> Setel model papan ketik ke %1.<br/> - + Set keyboard layout to %1/%2. Setel tata letak papan ketik ke %1/%2. @@ -1139,15 +1152,25 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. LCLocaleDialog - + System locale setting Setelan lokal sistem - + 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>. Pengaturan system locale berpengaruh pada bahasa dan karakter pada beberapa elemen antarmuka Command Line. <br/>Pengaturan saat ini adalah <strong>%1</strong>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1230,12 +1253,12 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. LocalePage - + The system language will be set to %1. Bahasa sistem akan disetel ke %1. - + The numbers and dates locale will be set to %1. Nomor dan tanggal lokal akan disetel ke %1. @@ -1256,12 +1279,12 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.&Ubah... - + Set timezone to %1/%2.<br/> Setel zona waktu ke %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1332,17 +1355,17 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. NetInstallPage - + Name Nama - + Description Deskripsi - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Pemasangan Jaringan. (Dinonfungsikan: Tak mampu menarik daftar paket, periksa sambungan jaringanmu) @@ -1391,7 +1414,6 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Nama apa yang ingin Anda gunakan untuk log in? - @@ -1565,7 +1587,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Pasang boot %loader pada: - + Are you sure you want to create a new partition table on %1? Apakah Anda yakin ingin membuat tabel partisi baru pada %1? @@ -1588,82 +1610,82 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Pasang %1 <strong>berdampingan</strong> dengan sistem operasi lain. - + <strong>Erase</strong> disk and install %1. <strong>Hapus</strong> diska dan pasang %1. - + <strong>Replace</strong> a partition with %1. <strong>Ganti</strong> partisi dengan %1. - + <strong>Manual</strong> partitioning. Partisi <strong>manual</strong>. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Pasang %1 <strong>berdampingan</strong> dengan sistem operasi lain di disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Hapus</strong> diska <strong>%2</strong> (%3) dan pasang %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Ganti</strong> partisi pada diska <strong>%2</strong> (%3) dengan %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Partisi Manual</strong> pada diska <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disk <strong>%1</strong> (%2) - + Current: Saat ini: - + After: Sesudah: - + No EFI system partition configured Tiada partisi sistem EFI terkonfigurasi - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. Sebuah partisi sistem EFI perlu memulai %1.<br/><br/>Untuk mengkonfigurasi sebuah partisi sistem EFI, pergi mundur dan pilih atau ciptakan sebuah filesystem FAT32 dengan bendera <strong>esp</strong> yang difungsikan dan titik kait <strong>%2</strong>.<br/><br/>Kamu bisa melanjutkan tanpa menyetel sebuah partisi sistem EFI tapi sistemmu mungkin gagal memulai. - + EFI system partition flag not set Bendera partisi sistem EFI tidak disetel - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. Sebuah partisi sistem EFI perlu memulai %1.<br/><br/>Sebuah partisi telah dikonfigurasi dengan titik kait <strong>%2</strong> tapi bendera <strong>esp</strong> tersebut tidak disetel.<br/>Untuk mengeset bendera, pergi mundur dan editlah partisi.<br/><br/>Kamu bisa melanjutkan tanpa menyetel bendera tapi sistemmu mungkin gagal memulai. - + Boot partition not encrypted Partisi boot tidak dienkripsi - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Sebuah partisi tersendiri telah terset bersama dengan sebuah partisi root terenkripsi, tapi partisi boot tidak terenkripsi.<br/><br/>Ada kekhawatiran keamanan dengan jenis setup ini, karena file sistem penting tetap pada partisi tak terenkripsi.<br/>Kamu bisa melanjutkan jika kamu menghendaki, tapi filesystem unlocking akan terjadi nanti selama memulai sistem.<br/>Untuk mengenkripsi partisi boot, pergi mundur dan menciptakannya ulang, memilih <strong>Encrypt</strong> di jendela penciptaan partisi. @@ -1682,22 +1704,22 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Standar - + unknown tidak diketahui: - + extended extended - + unformatted tidak terformat: - + swap swap @@ -1720,64 +1742,64 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Pilih tempat pemasangan %1.<br/><font color="red">Peringatan: </font>hal ini akan menghapus semua berkas di partisi terpilih. - + The selected item does not appear to be a valid partition. Item yang dipilih tidak tampak seperti partisi yang valid. - + %1 cannot be installed on empty space. Please select an existing partition. %1 tidak dapat dipasang di ruang kosong. Mohon pilih partisi yang tersedia. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 tidak bisa dipasang pada Partisi Extended. Mohon pilih Partisi Primary atau Logical yang tersedia. - + %1 cannot be installed on this partition. %1 tidak dapat dipasang di partisi ini. - + Data partition (%1) Partisi data (%1) - + Unknown system partition (%1) Partisi sistem tidak dikenal (%1) - + %1 system partition (%2) Partisi sistem %1 (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>Partisi %1 teralu kecil untuk %2. Mohon pilih partisi dengan kapasitas minimal %3 GiB. - + <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/>Tidak ditemui adanya Partisi EFI pada sistem ini. Mohon kembali dan gunakan Pemartisi Manual untuk set up %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 akan dipasang pada %2.<br/><font color="red">Peringatan: </font>seluruh data %2 akan hilang. - + The EFI system partition at %1 will be used for starting %2. Partisi EFI pada %1 akan digunakan untuk memulai %2. - + EFI system partition: Partisi sistem EFI: @@ -1785,55 +1807,60 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. RequirementsChecker - + Gathering system information... Mengumpulkan informasi sistem... - + has at least %1 GB available drive space memiliki paling sedikit %1 GB ruang drive tersedia - + There is not enough drive space. At least %1 GB is required. Ruang drive tidak cukup. Butuh minial %1 GB. - + has at least %1 GB working memory memiliki paling sedikit %1 GB memori bekerja - + The system does not have enough working memory. At least %1 GB is required. Sistem ini tidak memiliki memori yang cukup. Butuh minial %1 GB. - + is plugged in to a power source terhubung dengan sumber listrik - + The system is not plugged in to a power source. Sistem tidak terhubung dengan sumber listrik. - + is connected to the Internet terkoneksi dengan internet - + The system is not connected to the Internet. Sistem tidak terkoneksi dengan internet. - + The installer is not running with administrator rights. Pemasang tidak dijalankan dengan kewenangan administrator. + + + The screen is too small to display the installer. + Layar terlalu kecil untuk menampilkan pemasang. + ResizeFileSystemJob @@ -2069,42 +2096,42 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. SetPasswordJob - + Set password for user %1 Setel sandi untuk pengguna %1 - + Setting password for user %1. Mengatur sandi untuk pengguna %1. - + Bad destination system path. Jalur lokasi sistem tujuan buruk. - + rootMountPoint is %1 rootMountPoint adalah %1 - + Cannot disable root account. Tak bisa menonfungsikan akun root. - + passwd terminated with error code %1. passwd terhenti dengan kode galat %1. - + Cannot set password for user %1. Tidak dapat menyetel sandi untuk pengguna %1. - + usermod terminated with error code %1. usermod dihentikan dengan kode kesalahan %1. @@ -2238,22 +2265,27 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.&Tentang - + <h1>Welcome to the %1 installer.</h1> <h1>Selamat datang di pemasang %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Selamat datang di Calamares pemasang untuk %1.</h1> + + + About %1 installer Tentang pemasang %1 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>untuk %3</strong><br/><br/>Hak Cipta 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Terimakasih kepada: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg dan <a href="https://www.transifex.com/calamares/calamares/">regu penerjemah Calamares</a>.<br/><br/>Pengembangan <a href="http://calamares.io/">Calamares</a> disponsori oleh <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + <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. + %1<br/><strong>%2<br/>untuk %3</strong><br/><br/>Hak Cipta 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Hak Cipta 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Terimakasih kepada: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg dan <a href="https://www.transifex.com/calamares/calamares/">regu penerjemah Calamares</a>.<br/><br/>Pengembangan <a href="http://calamares.io/">Calamares</a> disponsori oleh<br/> <a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + %1 support Dukungan %1 diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts index e22817297..bab0ad264 100644 --- a/lang/calamares_is.ts +++ b/lang/calamares_is.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Veldu disksneið sem þú vilt minnka: - - - - Allocate drive space by dragging the divider below: - Úthlutaðu diskplássi með því að draga til aðgreininn hér fyrir neðan: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Með þessari aðgerð, mun disksneiðin <strong>%1</strong> sem inniheldur %4 verða minnkuð í %2MB og ný %3MB disksneið verður gerð fyrir %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - EFI kerfisdisksneið er hvergi að finna á þessu kerfi. Farðu til baka og notaðu handvirka skiptingu til að setja upp %1. - - - - The EFI system partition at %1 will be used for starting %2. - EFI kerfisdisksneið á %1 mun verða notuð til að ræsa %2. - - - - EFI system partition: - EFI kerfisdisksneið: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -221,32 +188,32 @@ Frálag: Calamares::PythonJob - + Running %1 operation. Keyri %1 aðgerð. - + Bad working directory path Röng slóð á vinnumöppu - + Working directory %1 for python job %2 is not readable. Vinnslumappa %1 fyrir python-verkið %2 er ekki lesanleg. - + Bad main script file Röng aðal-skriftuskrá - + Main script file %1 for python job %2 is not readable. Aðal-skriftuskrá %1 fyrir python-verkið %2 er ekki lesanleg. - + Boost.Python error in job "%1". Boost.Python villa í verkinu "%1". @@ -254,65 +221,91 @@ Frálag: Calamares::ViewManager - + &Back &Til baka - + &Next &Næst - - + + &Cancel &Hætta við - + + + Cancel installation without changing the system. + Hætta við uppsetningu ánþess að breyta kerfinu. + + + Cancel installation? Hætta við uppsetningu? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Viltu virkilega að hætta við núverandi uppsetningarferli? Uppsetningarforritið mun hætta og allar breytingar tapast. - + + &Yes + &Já + + + + &No + &Nei + + + + &Close + &Loka + + + Continue with setup? Halda áfram með uppsetningu? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 uppsetningarforritið er um það bil að gera breytingar á diskinum til að setja upp %2.<br/><strong>Þú munt ekki geta afturkallað þessar breytingar.</strong> - + &Install now Setja &inn núna - + Go &back Fara til &baka - - &Quit - &Hætta + + &Done + &Búið - + + The installation is complete. Close the installer. + Uppsetning er lokið. Lokaðu uppsetningarforritinu. + + + Error Villa - + Installation Failed Uppsetning mistókst @@ -343,12 +336,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. CalamaresWindow - + %1 Installer %1 uppsetningarforrit - + Show debug information Birta villuleitarupplýsingar @@ -369,7 +362,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Þessi tölva uppfyllir ekki lágmarkskröfur um uppsetningu %1.<br/>Uppsetningin getur ekki haldið áfram. <a href="#details">Upplýsingar...</a> @@ -379,17 +372,17 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Þessi tölva uppfyllir ekki lágmarkskröfur um uppsetningu %1.<br/>Uppsetningin getur haldið áfram, en sumir eiginleikar gætu verið óvirk. - + This program will ask you some questions and set up %2 on your computer. Þetta forrit mun spyrja þig nokkurra spurninga og setja upp %2 á tölvunni þinni. - + For best results, please ensure that this computer: Fyrir bestu niðurstöður, skaltu tryggja að þessi tölva: - + System requirements Kerfiskröfur @@ -402,35 +395,35 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Eyðublað - + After: Eftir: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Handvirk disksneiðing</strong><br/>Þú getur búið til eða breytt stærð disksneiða sjálf(ur). - + Boot loader location: Staðsetning ræsistjóra - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 verður minnkuð í %2MB og ný %3MB disksneið verður búin til fyrir %4. - + Select storage de&vice: Veldu geymslu tæ&ki: - - - - + + + + Current: Núverandi: @@ -440,71 +433,71 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Endurnota %1 sem heimasvæðis disksneið fyrir %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Veldu disksneið til að minnka, dragðu síðan botnstikuna til að breyta stærðinni</strong> - + <strong>Select a partition to install on</strong> <strong>Veldu disksneið til að setja upp á </strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. EFI kerfisdisksneið á %1 mun verða notuð til að ræsa %2. - + EFI system partition: EFI kerfisdisksneið: - + 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. Þetta geymslu tæki hefur mörg stýrikerfi á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Eyða disk</strong><br/>Þetta mun <font color="red">eyða</font> öllum gögnum á þessu valdna geymslu tæki. - + 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. Þetta geymslu tæki hefur %1 á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Setja upp samhliða</strong><br/>Uppsetningarforritið mun minnka disksneið til að búa til pláss fyrir %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Skipta út disksneið</strong><br/>Skiptir disksneið út með %1. - + This storage device already has 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. Þetta geymslu tæki hefur stýrikerfi á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki. - + This storage device has multiple operating systems 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. Þetta geymslu tæki hefur mörg stýrikerfi á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki. @@ -524,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. @@ -557,6 +550,11 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Create a Partition Búa til disksneið + + + MiB + MiB + Partition &Type: @@ -593,32 +591,27 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. St&ærð: - - MB - MB - - - + En&crypt &Dulrita - + Logical Rökleg - + Primary Aðal - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -831,7 +824,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. DeviceInfoWidget - + 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. @@ -933,17 +926,22 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. St&ærð: - + + MiB + MiB + + + Fi&le System: Skráaker&fi: - + Flags: Flögg: - + Mountpoint already in use. Please select another one. Tengipunktur er þegar í notkun. Veldu einhvern annan. @@ -971,7 +969,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Staðfesta lykilorð - + Please enter the same passphrase in both boxes. Vinsamlegast sláðu inn sama lykilorðið í báða kassana. @@ -989,27 +987,27 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Setja upp %1 á <strong>nýja</strong> %2 disk sneiðingu. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Setja upp <strong>nýtt</strong> %2 snið með tengipunkti <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Setja upp %2 á %3 disk sneiðingu <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Setja upp %3 snið <strong>%1</strong> með tengipunkti <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Setja ræsistjórann upp á <strong>%1</strong>. - + Setting up mount points. Set upp tengipunkta. @@ -1027,18 +1025,33 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. &Endurræsa núna - + <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>Allt klárt.</h1><br/>%1 hefur verið sett upp á tölvunni þinni.<br/>Þú getur nú endurræst í nýja kerfið, eða halda áfram að nota %2 Lifandi umhverfi. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish Ljúka + + + Installation Complete + Uppsetningu lokið + + + + The installation of %1 is complete. + Uppsetningu af %1 er lokið. + FormatPartitionJob @@ -1116,12 +1129,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1137,15 +1150,25 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. LCLocaleDialog - + System locale setting Staðfærsla kerfisins stilling - + 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>. + + + &Cancel + &Hætta við + + + + &OK + &Í lagi + LicensePage @@ -1228,12 +1251,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. LocalePage - + The system language will be set to %1. Tungumál kerfisins verður sett sem %1. - + The numbers and dates locale will be set to %1. @@ -1254,12 +1277,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. &Breyta... - + Set timezone to %1/%2.<br/> Setja tímabelti sem %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. NetInstallPage - + Name Heiti - + Description Lýsing - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1389,7 +1412,6 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Hvaða nafn vilt þú vilt nota til að skrá þig inn? - @@ -1563,7 +1585,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Setja upp ræsistjóran á: - + Are you sure you want to create a new partition table on %1? Ertu viss um að þú viljir búa til nýja disksneið á %1? @@ -1586,82 +1608,82 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Setja upp %1 <strong>ásamt</strong> ásamt öðru stýrikerfi. - + <strong>Erase</strong> disk and install %1. <strong>Eyða</strong> disk og setja upp %1. - + <strong>Replace</strong> a partition with %1. <strong>Skipta út</strong> disksneið með %1. - + <strong>Manual</strong> partitioning. <strong>Handvirk</strong> disksneiðaskipting. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Uppsetning %1 <strong>með</strong> öðru stýrikerfi á disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Eyða</strong> disk <strong>%2</strong> (%3) og setja upp %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Skipta út</strong> disksneið á diski <strong>%2</strong> (%3) með %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Handvirk</strong> disksneiðaskipting á diski <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Diskur <strong>%1</strong> (%2) - + Current: Núverandi: - + After: Eftir: - + No EFI system partition configured Ekkert EFI kerfisdisksneið stillt - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1680,22 +1702,22 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Sjálfgefið - + unknown óþekkt - + extended útvíkkuð - + unformatted ekki forsniðin - + swap swap diskminni @@ -1718,64 +1740,64 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Veldu hvar á að setja upp %1.<br/><font color="red">Aðvörun: </font>þetta mun eyða öllum skrám á valinni disksneið. - + The selected item does not appear to be a valid partition. Valið atriði virðist ekki vera gild disksneið. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. %1 er hægt að setja upp á þessari disksneið. - + Data partition (%1) Gagnadisksneið (%1) - + Unknown system partition (%1) Óþekkt kerfisdisksneið (%1) - + %1 system partition (%2) %1 kerfisdisksneið (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>Disksneið %1 er of lítil fyrir %2. Vinsamlegast veldu disksneið með að lámark %3 GiB. - + <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. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 mun vera sett upp á %2.<br/><font color="red">Aðvörun: </font>öll gögn á disksneið %2 mun verða eytt. - + The EFI system partition at %1 will be used for starting %2. EFI kerfis stýring á %1 mun vera notuð til að byrja %2. - + EFI system partition: EFI kerfisdisksneið: @@ -1783,55 +1805,60 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. RequirementsChecker - + Gathering system information... Söfnun kerfis upplýsingar... - + has at least %1 GB available drive space hefur að minnsta kosti %1 GB laus á harðadisk - + There is not enough drive space. At least %1 GB is required. Það er ekki nóg diskapláss. Að minnsta kosti %1 GB eru þörf. - + has at least %1 GB working memory hefur að minnsta kosti %1 GB vinnsluminni - + The system does not have enough working memory. At least %1 GB is required. Kerfið hefur ekki nóg vinnsluminni. Að minnsta kosti %1 GB er krafist. - + is plugged in to a power source er í sambandi við aflgjafa - + The system is not plugged in to a power source. Kerfið er ekki í sambandi við aflgjafa. - + is connected to the Internet er tengd við Internetið - + The system is not connected to the Internet. Kerfið er ekki tengd við internetið. - + The installer is not running with administrator rights. Uppsetningarforritið er ekki keyrandi með kerfisstjóraheimildum. + + + The screen is too small to display the installer. + Skjárinn er of lítill til að birta uppsetningarforritið. + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. SetPasswordJob - + Set password for user %1 Gerðu lykilorð fyrir notanda %1 - + Setting password for user %1. Geri lykilorð fyrir notanda %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. Ekki er hægt að aftengja kerfisstjóra reikning. - + passwd terminated with error code %1. - + Cannot set password for user %1. Get ekki sett lykilorð fyrir notanda %1. - + usermod terminated with error code %1. usermod endaði með villu kóðann %1. @@ -2176,12 +2203,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. @@ -2236,22 +2263,27 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. &Um - + <h1>Welcome to the %1 installer.</h1> <h1>Velkomin í %1 uppsetningarforritið.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Velkomin(n) til Calamares uppsetningar fyrir %1</h1> + + + About %1 installer Um %1 uppsetningarforrrit - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Þakkir til: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini og Rohan Garg.<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 hugbúnað. + + <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. + - + %1 support %1 stuðningur diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts index abb09b377..18d89b0db 100644 --- a/lang/calamares_it_IT.ts +++ b/lang/calamares_it_IT.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Scegliere la partizione da ridurre: - - - - Allocate drive space by dragging the divider below: - Assegnare spazio su disco trascinando il separatore sottostante: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Con questa operazione, la partizione <strong>%1</strong> che contiene %4 verrà ridotta a %2MB e verrà creata una nuova partizione su %5 da %3MB. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Non è stato possibile trovare alcuna partizione EFI su questo sistema. Torna indietro e usa il partizionamento manuale per configurarla %1. - - - - The EFI system partition at %1 will be used for starting %2. - La partizione EFI a %1 verrà usata per avviare %2. - - - - EFI system partition: - Partizione EFI di sistema: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - L'<strong>ambiente di avvio - boot</strong> di questo sistema. <br><br>I vecchi sistemi x86 supportano solo <strong>BIOS</strong>. <bt>I sistemi moderni normalmente usano <strong>EFI</strong> ma possono anche usare BIOS se l'avvio viene eseguito in modalità compatibile. + L'<strong>ambiente di avvio</strong> di questo sistema. <br><br>I vecchi sistemi x86 supportano solo <strong>BIOS</strong>. <bt>I sistemi moderni normalmente usano <strong>EFI</strong> ma possono anche usare BIOS se l'avvio viene eseguito in modalità compatibile. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Il sistema è stato avviato con un ambiente di boot <strong>EFI</strong>.<br><br>Per configurare l'avvio da un ambiente EFI, il programma d'installazione deve inserire un boot loader come <strong>GRUB</strong> o <strong>systemd-boot</strong> su una <strong>EFI System Partition</strong>. Ciò avviene automaticamente, a meno che non si scelga il partizionamento manuale che permette di scegliere un proprio boot loader personale. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. ll sistema è stato avviato con un ambiente di boot <strong>BIOS</strong>.<br><br>Per configurare l'avvio da un ambiente BIOS, il programma d'installazione deve installare un boot loader come <strong>GRUB</strong> all'inizio di una partizione o nel <strong>Master Boot Record</strong> vicino all'origine della tabella delle partizioni (preferito). Ciò avviene automaticamente, a meno che non si scelga il partizionamento manuale che permette di fare una configurazione personale. @@ -221,32 +188,32 @@ Output: Calamares::PythonJob - + Running %1 operation. Operazione %1 in esecuzione. - + Bad working directory path Il percorso della cartella corrente non è corretto - + Working directory %1 for python job %2 is not readable. La cartella corrente %1 per l'attività di Python %2 non è accessibile. - + Bad main script file File dello script principale non valido - + Main script file %1 for python job %2 is not readable. Il file principale dello script %1 per l'attività di python %2 non è accessibile. - + Boost.Python error in job "%1". Errore da Boost.Python nell'operazione "%1". @@ -254,65 +221,91 @@ Output: Calamares::ViewManager - + &Back &Indietro - + &Next &Avanti - - + + &Cancel &Annulla - + + + Cancel installation without changing the system. + + + + Cancel installation? Annullare l'installazione? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Si vuole davvero annullare l'installazione in corso? Il programma d'installazione sarà terminato e tutte le modifiche andranno perse. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? Procedere con la configurazione? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Il programma d'nstallazione %1 sta per eseguire delle modifiche al tuo disco per poter installare %2.<br/><strong> Non sarà possibile annullare tali modifiche.</strong> - + &Install now &Installa adesso - + Go &back &Indietro - - &Quit - &Esci + + &Done + - + + The installation is complete. Close the installer. + + + + Error Errore - + Installation Failed Installazione non riuscita @@ -343,12 +336,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno CalamaresWindow - + %1 Installer %1 Programma di installazione - + Show debug information Mostra le informazioni di debug @@ -369,7 +362,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Questo computer non soddisfa i requisiti minimi per installare %1. <br/>L'installazione non può proseguire. <a href="#details">Dettagli...</a> @@ -379,17 +372,17 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Questo computer non soddisfa alcuni requisiti consigliati per l'installazione di %1. <br/>L'installazione può proseguire ma alcune funzionalità potrebbero non essere disponibili. - + This program will ask you some questions and set up %2 on your computer. Questo programma chiederà alcune informazioni e configurerà %2 sul computer. - + For best results, please ensure that this computer: Per ottenere prestazioni ottimali, assicurarsi che questo computer: - + System requirements Requisiti di sistema @@ -402,35 +395,35 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Modulo - + After: Dopo: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Partizionamento manuale</strong><br/>Si possono creare o ridimensionare le partizioni manualmente. - + Boot loader location: Posizionamento del boot loader: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 sarà ridotta a %2MB e una nuova partizione di %3MB sarà creata per %4. - + Select storage de&vice: Selezionare un dispositivo di me&moria: - - - - + + + + Current: Corrente: @@ -440,71 +433,71 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Riutilizzare %1 come partizione home per &2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Selezionare una partizione da ridurre, trascina la barra inferiore per ridimensionare</strong> - + <strong>Select a partition to install on</strong> <strong>Selezionare la partizione sulla quale si vuole installare</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Impossibile trovare una partizione EFI di sistema. Si prega di tornare indietro ed effettuare un partizionamento manuale per configurare %1. - + The EFI system partition at %1 will be used for starting %2. La partizione EFI di sistema su %1 sarà usata per avviare %2. - + EFI system partition: Partizione EFI di sistema: - + 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. Questo dispositivo di memoria non sembra contenere alcun sistema operativo. Come si vuole procedere?<br/>Si potranno comunque rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Cancellare disco</strong><br/>Questo <font color="red">cancellerà</font> tutti i dati attualmente presenti sul dispositivo di memoria. - + 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. Questo dispositivo di memoria ha %1. Come si vuole procedere?<br/>Si potranno comunque rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Installare a fianco</strong><br/>Il programma di installazione ridurrà una partizione per dare spazio a %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Sostituire una partizione</strong><br/>Sostituisce una partizione con %1. - + This storage device already has 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. Questo dispositivo di memoria contenere già un sistema operativo. Come si vuole procedere?<br/>Si potranno comunque rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo. - + This storage device has multiple operating systems 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. Questo dispositivo di memoria contenere diversi sistemi operativi. Come si vuole procedere?<br/>Comunque si potranno rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo. @@ -530,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. @@ -557,6 +550,11 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Create a Partition Creare una partizione + + + MiB + + Partition &Type: @@ -593,32 +591,27 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno &Dimensione: - - MB - MB - - - + En&crypt Cr&iptare - + Logical Logica - + Primary Primaria - + GPT GPT - + Mountpoint already in use. Please select another one. Il punto di mount è già in uso. Sceglierne un altro. @@ -831,7 +824,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno DeviceInfoWidget - + 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. Il tipo di <strong>tabella delle partizioni</strong> attualmente presente sul dispositivo di memoria selezionato.<br><br>L'unico modo per cambiare il tipo di tabella delle partizioni è quello di cancellarla e ricrearla da capo, distruggendo tutti i dati sul dispositivo.<br>Il programma di installazione conserverà l'attuale tabella a meno che no si scelga diversamente.<br>Se non si è sicuri, sui sistemi moderni si preferisce GPT. @@ -933,17 +926,22 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Di&mensione: - + + MiB + + + + Fi&le System: Fi&le System: - + Flags: Flag: - + Mountpoint already in use. Please select another one. Il punto di mount è già in uso. Sceglierne un altro. @@ -971,7 +969,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Confermare frase di accesso - + Please enter the same passphrase in both boxes. Si prega di immettere la stessa frase di accesso in entrambi i riquadri. @@ -989,27 +987,27 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Installare %1 sulla <strong>nuova</strong> partizione di sistema %2. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Impostare la <strong>nuova</strong> %2 partizione con punto di mount <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Installare %2 sulla partizione di sistema %3 <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Impostare la partizione %3 <strong>%1</strong> con punto di montaggio <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Installare il boot loader su <strong>%1</strong>. - + Setting up mount points. Impostazione dei punti di mount. @@ -1027,18 +1025,33 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno &Riavviare ora - + <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>Tutto fatto.</ h1><br/>%1 è stato installato sul computer.<br/>Ora è possibile riavviare il sistema, o continuare a utilizzare l'ambiente Live di %2 . + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish Termina + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1116,12 +1129,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno KeyboardPage - + Set keyboard model to %1.<br/> Impostare il modello di tastiera a %1.<br/> - + Set keyboard layout to %1/%2. Impostare il layout della tastiera a %1%2. @@ -1137,15 +1150,25 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno LCLocaleDialog - + System locale setting Impostazioni di localizzazione del sistema - + 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>. Le impostazioni di localizzazione del sistema influenzano la lingua e il set di caratteri per alcuni elementi di interfaccia da linea di comando. <br/>L'impostazione attuale è <strong>%1</strong>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno LocalePage - + The system language will be set to %1. La lingua di sistema sarà impostata a %1. - + The numbers and dates locale will be set to %1. I numeri e le date locali saranno impostati a %1. @@ -1254,12 +1277,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno &Cambia... - + Set timezone to %1/%2.<br/> Imposta il fuso orario a %1%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno NetInstallPage - + Name Nome - + Description Descrizione - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Installazione di rete. (Disabilitata: impossibile recuperare le liste dei pacchetti, controllare la connessione di rete) @@ -1389,7 +1412,6 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Quale nome usare per l'autenticazione? - @@ -1563,7 +1585,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Installare il boot &loader su: - + Are you sure you want to create a new partition table on %1? Si è sicuri di voler creare una nuova tabella delle partizioni su %1? @@ -1586,82 +1608,82 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Installare %1 <strong>a fianco</strong> di un altro sistema operativo. - + <strong>Erase</strong> disk and install %1. <strong>Cancellare</strong> il disco e installare %1. - + <strong>Replace</strong> a partition with %1. <strong>Sostituire</strong> una partizione con %1. - + <strong>Manual</strong> partitioning. Partizionamento <strong>manuale</strong>. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Installare %1 <strong>a fianco</strong> di un altro sistema operativo sul disco<strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Cancellare</strong> il disco <strong>%2</strong> (%3) e installa %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Sostituire</strong> una partizione sul disco <strong>%2</strong> (%3) con %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). Partizionamento <strong>manuale</strong> sul disco <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disco <strong>%1</strong> (%2) - + Current: Corrente: - + After: Dopo: - + No EFI system partition configured Nessuna partizione EFI di sistema è configurata - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. Una partizione EFI di sistema è necessaria per avviare %1.<br/><br/>Per configurare una partizione EFI di sistema, tornare indietro e selezionare o creare un filesystem FAT32 con il flag <strong>esp</strong> abilitato e un punto di mount <strong>%2</strong>.<br/><br/>Si può continuare senza configurare una partizione EFI ma il sistema rischia di non avviarsi. - + EFI system partition flag not set Il flag della partizione EFI di sistema non è impostato. - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. Una partizione EFI di sistema è necessaria per avviare %1.<br/><br/>Una partizione è stata configurata con punto di mount <strong>%2</strong> ma il relativo flag <strong>esp</strong> non è impostato.<br/>Per impostare il flag, tornare indietro e modificare la partizione.<br/><br/>Si può continuare senza impostare il flag ma il sistema rischia di non avviarsi. - + Boot partition not encrypted Partizione di avvio non criptata - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. E' stata configurata una partizione di avvio non criptata assieme ad una partizione root criptata. <br/><br/>Ci sono problemi di sicurezza con questo tipo di configurazione perchè dei file di sistema importanti sono tenuti su una partizione non criptata.<br/>Si può continuare se lo si desidera ma dopo ci sarà lo sblocco del file system, durante l'avvio del sistema.<br/>Per criptare la partizione di avvio, tornare indietro e ricrearla, selezionando <strong>Criptare</strong> nella finestra di creazione della partizione. @@ -1680,22 +1702,22 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Default - + unknown sconosciuto - + extended estesa - + unformatted non formattata - + swap swap @@ -1718,64 +1740,64 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Selezionare dove installare %1.<br/><font color="red">Attenzione: </font>questo eliminerà tutti i file dalla partizione selezionata. - + The selected item does not appear to be a valid partition. L'elemento selezionato non sembra essere una partizione valida. - + %1 cannot be installed on empty space. Please select an existing partition. %1 non può essere installato su spazio non partizionato. Si prega di selezionare una partizione esistente. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 non può essere installato su una partizione estesa. Si prega di selezionare una partizione primaria o logica esistente. - + %1 cannot be installed on this partition. %1 non può essere installato su questa partizione. - + Data partition (%1) Partizione dati (%1) - + Unknown system partition (%1) Partizione di sistema sconosciuta (%1) - + %1 system partition (%2) %1 partizione di sistema (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>La partizione %1 è troppo piccola per %2. Si prega di selezionare una partizione con capacità di almeno %3 GiB. - + <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/>Nessuna partizione EFI di sistema rilevata. Si prega di tornare indietro e usare il partizionamento manuale per configurare %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 sarà installato su %2.<br/><font color="red">Attenzione: </font>tutti i dati sulla partizione %2 saranno persi. - + The EFI system partition at %1 will be used for starting %2. La partizione EFI di sistema a %1 sarà usata per avviare %2. - + EFI system partition: Partizione EFI di sistema: @@ -1783,55 +1805,60 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno RequirementsChecker - + Gathering system information... Raccolta delle informazioni di sistema... - + has at least %1 GB available drive space ha almeno %1 GB di spazio disponibile - + There is not enough drive space. At least %1 GB is required. Non c'è spazio sufficiente sul dispositivo. E' richiesto almeno %1 GB. - + has at least %1 GB working memory ha almeno %1 GB di memoria - + The system does not have enough working memory. At least %1 GB is required. Il sistema non dispone di sufficiente memoria. E' richiesto almeno %1 GB. - + is plugged in to a power source è collegato a una presa di alimentazione - + The system is not plugged in to a power source. Il sistema non è collegato a una presa di alimentazione. - + is connected to the Internet è connesso a Internet - + The system is not connected to the Internet. Il sistema non è connesso a internet. - + The installer is not running with administrator rights. Il programma di installazione non è stato avviato con i diritti di amministrazione. + + + The screen is too small to display the installer. + Schermo troppo piccolo per mostrare il programma d'installazione. + ResizeFileSystemJob @@ -2056,53 +2083,53 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Update geometry of partition %1. - + Aggiornare la struttura della partizione %1. Failed to change the geometry of the partition. - + Impossibile cambiare la struttura della partizione. SetPasswordJob - + Set password for user %1 Impostare la password per l'utente %1 - + Setting password for user %1. Impostare la password per l'utente %1. - + Bad destination system path. Percorso di destinazione del sistema errato. - + rootMountPoint is %1 punto di mount per root è %1 - + Cannot disable root account. Impossibile disabilitare l'account di root. - + passwd terminated with error code %1. passwd è terminato con codice di errore %1. - + Cannot set password for user %1. Impossibile impostare la password per l'utente %1. - + usermod terminated with error code %1. usermod si è chiuso con codice di errore %1. @@ -2132,7 +2159,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno Link creation failed, target: %1; link name: %2 - + Impossibile creare il link, destinazione: %1; nome del link: %2 @@ -2236,22 +2263,27 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno &Informazioni su - + <h1>Welcome to the %1 installer.</h1> <h1>Benvenuto nel programma d'installazione di %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Benvenuti nel programma di installazione Calamares per %1.</h1> + + + About %1 installer Informazioni sul programma di installazione %1 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Grazie a: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg e ai <a href="https://www.transifex.com/calamares/calamares/">traduttori di Calamares</a>.<br/><br/>Lo sviluppo di <a href="http://calamares.io/">Calamares</a> è sponsorizzato da <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + <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. + - + %1 support supporto %1 diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts index 9b908f07e..320cfa3b0 100644 --- a/lang/calamares_ja.ts +++ b/lang/calamares_ja.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - 縮小するパーティションを選択してください : - - - - Allocate drive space by dragging the divider below: - 下の仕切りをドラッグし、ドライブの空き容量を割り当ててください: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - この操作によって、%4 を含むパーティション <strong>%1</strong>が %2MB に縮小し、%5 のための新しい %3MBのパーティションが作成されます。 - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - システムにEFIシステムパーティションが存在しません。%1 のセットアップのため、元に戻り、手動パーティショニングを使用してください。 - - - - The EFI system partition at %1 will be used for starting %2. - %1 上の EFI システムパーテイションは %2 の開始時に使用します。 - - - - EFI system partition: - EFI システムパーティション: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. このシステムの <strong>ブート環境。</strong><br><br>古いx86システムは<strong>BIOS</strong>のみサポートしています。<br>最近のシステムは通常<strong>EFI</strong>を使用しますが、互換モードが起動できる場合はBIOSが現れる場合もあります。 - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. このシステムは<strong>EFI</strong> ブート環境で起動しました。<br><br>EFI環境からの起動について設定するためには、<strong>EFI システムパーティション</strong>に <strong>GRUB</strong> あるいは <strong>systemd-boot</strong> といったブートローダーアプリケーションを配置しなければなりません。手動によるパーティショニングを選択する場合、EFI システムパーティションを選択あるいは作成しなければなりません。そうでない場合は、この操作は自動的に行われます。 - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. このシステムは <strong>BIOS</strong> ブート環境で起動しました。<br><br> BIOS環境からの起動について設定するためには、パーティションの開始位置あるいはパーティションテーブルの開始位置の近く(推奨)にある<strong>マスターブートレコード</strong>に <strong>GRUB</strong> のようなブートローダーをインストールしなければなりません。手動によるパーティショニングを選択する場合はユーザー自身で設定しなければなりません。そうでない場合は、この操作は自動的に行われます。 @@ -221,32 +188,32 @@ Output: Calamares::PythonJob - + Running %1 operation. %1 操作を実行中。 - + Bad working directory path 不正なワーキングディレクトリパス - + Working directory %1 for python job %2 is not readable. python ジョブ %2 において作業ディレクトリ %1 が読み込めません。 - + Bad main script file 不正なメインスクリプトファイル - + Main script file %1 for python job %2 is not readable. python ジョブ %2 におけるメインスクリプトファイル %1 が読み込めません。 - + Boost.Python error in job "%1". ジョブ "%1" での Boost.Python エラー。 @@ -254,65 +221,91 @@ Output: Calamares::ViewManager - + &Back 戻る（&B） - + &Next 次へ（&N） - - + + &Cancel 中止（&C） - + + + Cancel installation without changing the system. + システムを変更しないでインストールを中止します。 + + + Cancel installation? インストールを中止しますか? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. 本当に現在の作業を中止しますか？ すべての変更が取り消されます。 - + + &Yes + はい（&Y） + + + + &No + いいえ（&N） + + + + &Close + 閉じる（&C） + + + Continue with setup? セットアップを続行しますか? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 インストーラーは %2 をインストールするためにディスクの内容を変更しようとします。<br/><strong>これらの変更は取り消しできなくなります。</strong> - + &Install now 今すぐインストール（&I） - + Go &back 戻る（&B） - - &Quit - 終了（&Q） + + &Done + 実行（&D） - + + The installation is complete. Close the installer. + インストールが完了しました。インストーラーを閉じます。 + + + Error エラー - + Installation Failed インストールに失敗 @@ -343,12 +336,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer %1 インストーラー - + Show debug information デバッグ情報を表示 @@ -369,7 +362,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> このコンピュータは %1 をインストールするための最低要件を満たしていません。<br/>インストールは続行できません。<a href="#details">詳細...</a> @@ -379,17 +372,17 @@ The installer will quit and all changes will be lost. このコンピュータは、 %1 をインストールするための推奨条件をいくつか満たしていません。<br/>インストールは続行しますが、一部の機能が無効になる場合があります。 - + This program will ask you some questions and set up %2 on your computer. このプログラムはあなたにいくつか質問をして、コンピュータ上で %2 を設定します。 - + For best results, please ensure that this computer: 良好な結果を得るために、このコンピュータについて以下の項目を確認してください： - + System requirements システム要件 @@ -402,35 +395,35 @@ The installer will quit and all changes will be lost. フォーム - + After: 後: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>手動パーティション</strong><br/>パーティションの作成、あるいはサイズ変更を行うことができます。 - + Boot loader location: ブートローダーの場所: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 は %2 MB に縮小され、新しい %3 MB のパーティションが %4 のために作成されます。 - + Select storage de&vice: ストレージデバイスを選択（&V）: - - - - + + + + Current: 現在: @@ -440,71 +433,71 @@ The installer will quit and all changes will be lost. %1 を %2 のホームパーティションとして再利用する - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>縮小するパーティションを選択し、下のバーをドラッグしてサイズを変更して下さい</strong> - + <strong>Select a partition to install on</strong> <strong>インストールするパーティションの選択</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. システムにEFIシステムパーティションが存在しません。%1 のセットアップのため、元に戻り、手動パーティショニングを使用してください。 - + The EFI system partition at %1 will be used for starting %2. %1 上のEFIシステムパーテイションは %2 のスタートに使用されます。 - + EFI system partition: EFI システムパーティション: - + 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/>ストレージデバイスに対する変更が実施される前に、変更点をレビューし、確認することができます。 - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>ディスクの消去</strong><br/>選択したストレージデバイス上のデータがすべて <font color="red">削除</font>されます。 - + 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/>ストレージデバイスに対する変更が実施される前に、変更点をレビューし、確認することができます。 - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>共存してインストール</strong><br/>インストーラは %1 用の空きスペースを確保するため、パーティションを縮小します。 - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>パーティションの置換</strong><br/>パーティションを %1 に置き換えます。 - + This storage device already has 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/>ストレージデバイスに対する変更が実施される前に、変更点をレビューし、確認することができます。 - + This storage device has multiple operating systems 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 />ストレージデバイスに対する変更が実施される前に、変更点をレビューし、確認することができます。 @@ -530,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. すべての一時的なマウントを解除しました。 @@ -557,6 +550,11 @@ The installer will quit and all changes will be lost. Create a Partition パーティションの生成 + + + MiB + MiB + Partition &Type: @@ -593,32 +591,27 @@ The installer will quit and all changes will be lost. サイズ（&Z） - - MB - MB - - - + En&crypt 暗号化（&C） - + Logical 論理 - + Primary プライマリ - + GPT GPT - + Mountpoint already in use. Please select another one. マウントポイントは既に使用されています。他を選択してください。 @@ -831,7 +824,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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> このインストーラーは、他の種類へ明示的に変更ししない限り、現在のパーティションテーブルが保持されます。よくわからない場合、最近のシステムではGPTが推奨されます。 @@ -900,7 +893,7 @@ The installer will quit and all changes will be lost. Edit Existing Partition - 既存のパーティションの編集 + パーティションの編集 @@ -933,17 +926,22 @@ The installer will quit and all changes will be lost. サイズ（&Z）: - + + MiB + MiB + + + Fi&le System: ファイルシステム（&L） - + Flags: フラグ: - + Mountpoint already in use. Please select another one. マウントポイントは既に使用されています。他を選択してください。 @@ -971,7 +969,7 @@ The installer will quit and all changes will be lost. パスフレーズの確認 - + Please enter the same passphrase in both boxes. 両方のボックスに同じパスフレーズを入力してください。 @@ -989,27 +987,27 @@ The installer will quit and all changes will be lost. <strong>新しい</strong> %2 システムパーティションに %1 をインストール。 - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. マウントポイント <strong>%1</strong> に <strong>新しい</strong> %2 パーティションをセットアップ。 - + Install %2 on %3 system partition <strong>%1</strong>. %3 システムパーティション <strong>%1</strong> に%2 をインストール。 - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. パーティション <strong>%1</strong> マウントポイント <strong>%2</strong> に %3 をセットアップ。 - + Install boot loader on <strong>%1</strong>. <strong>%1</strong> にブートローダーをインストール - + Setting up mount points. マウントポイントの設定。 @@ -1027,18 +1025,34 @@ The installer will quit and all changes will be lost. 今すぐ再起動（&R） - + <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 Live環境を使用し続けることができます。 + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>インストールに失敗しました</h1><br/>%1 はコンピュータにインストールされませんでした。<br/>エラーメッセージ: %2. + FinishedViewStep - + Finish 終了 + + + Installation Complete + インストールが完了 + + + + + The installation of %1 is complete. + %1 のインストールは完了です。 + FormatPartitionJob @@ -1116,12 +1130,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> キーボードのモデルを %1 に設定。<br/> - + Set keyboard layout to %1/%2. キーボードのレイアウトを %1/%2 に設定。 @@ -1137,15 +1151,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting システムのロケールの設定 - + 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>. + + + &Cancel + 中止（&C） + + + + &OK + 了解（&O） + LicensePage @@ -1228,12 +1252,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. システムの言語が %1 に設定されます。 - + The numbers and dates locale will be set to %1. 数字と日付のロケールが %1 に設定されます。 @@ -1254,12 +1278,12 @@ The installer will quit and all changes will be lost. 変更（&C）... - + Set timezone to %1/%2.<br/> タイムゾーンを %1/%2 に設定。<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1354,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name 名前 - + Description 説明 - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) ネットワークインストール。(無効: パッケージリストを取得できません。ネットワーク接続を確認してください。) @@ -1389,7 +1413,6 @@ The installer will quit and all changes will be lost. ログインの際、どの名前を使用しますか? - @@ -1563,7 +1586,7 @@ The installer will quit and all changes will be lost. ブートローダーインストール先 （&L）: - + Are you sure you want to create a new partition table on %1? ％1 上で新しいパーティションテーブルを作成します。よろしいですか？ @@ -1586,82 +1609,82 @@ The installer will quit and all changes will be lost. 他のオペレーティングシステムに<strong>共存して</strong> %1 をインストール。 - + <strong>Erase</strong> disk and install %1. ディスクを<strong>消去</strong>し %1 をインストール。 - + <strong>Replace</strong> a partition with %1. パーティションを %1 に<strong>置き換える。</strong> - + <strong>Manual</strong> partitioning. <strong>手動</strong>でパーティションを設定する。 - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). ディスク <strong>%2</strong> (%3) 上ののオペレーティングシステムと<strong>共存</strong>して %1 をインストール。 - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. ディスク <strong>%2</strong> (%3) を<strong>消去して</strong> %1 をインストール。 - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. ディスク <strong>%2</strong> (%3) 上のパーティションを %1 に<strong>置き換える。</strong> - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). ディスク <strong>%1</strong> (%2) 上で <strong>手動で</strong>パーティショニングする。 - + Disk <strong>%1</strong> (%2) ディスク <strong>%1</strong> (%2) - + Current: 現在: - + After: 変更後: - + No EFI system partition configured EFI システムパーティションが設定されていません - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. %1 を起動するためにはEFI システムパ ーティションが必要です。<br/><br/> EFI システムパーティションを設定するためには、元に戻って、マウントポイント<strong>%2</strong>で<strong>esp</strong>フラグを設定したFAT32ファイルシステムを選択するか作成します。<br/><br/>EFI システムパ ーティションの設定をせずに続行することはできますが、その場合はシステムの起動に失敗することになるかもしれません。 - + EFI system partition flag not set EFI システムパーティションのフラグが設定されていません - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. %1 を起動するためにはEFI システムパ ーティションが必要です。<br/><br/>パーティションはマウントポイント<strong>%2</strong>に設定されていますが、<strong>esp</strong> フラグが設定されていません。<br/>フラグを設定するには、元に戻ってパーティションを編集してください。<br/><br/>フラグの設定をせずに続けることはできますが、その場合、システムの起動に失敗することになるかもしれません。 - + Boot partition not encrypted ブートパーティションが暗号化されていません - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. ブートパーティションは暗号化されたルートパーティションとともにセットアップされましたが、ブートパーティションは暗号化されていません。<br/><br/>重要なシステムファイルが暗号化されていないパーティションに残されているため、このようなセットアップは安全上の懸念があります。<br/>セットアップを続行することはできますが、後でシステムの起動中にファイルシステムが解除されるおそれがあります。<br/>ブートパーティションを暗号化させるには、前の画面に戻って、再度パーティションを作成し、パーティション作成ウィンドウ内で<strong>Encrypt</strong>（暗号化）を選択してください。 @@ -1680,22 +1703,22 @@ The installer will quit and all changes will be lost. デフォルト - + unknown 不明 - + extended 拡張 - + unformatted 未フォーマット - + swap スワップ @@ -1718,64 +1741,64 @@ The installer will quit and all changes will be lost. %1 をインストールする場所を選択します。<br/><font color="red">警告: </font>選択したパーティション内のすべてのファイルが削除されます。 - + The selected item does not appear to be a valid partition. 選択した項目は有効なパーティションではないようです。 - + %1 cannot be installed on empty space. Please select an existing partition. %1 は空き領域にインストールすることはできません。既存のパーティションを選択してください。 - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 は拡張パーティションにインストールできません。既存のプライマリまたは論理パーティションを選択してください。 - + %1 cannot be installed on this partition. %1 はこのパーティションにインストールできません。 - + Data partition (%1) データパーティション (%1) - + Unknown system partition (%1) 不明なシステムパーティション (%1) - + %1 system partition (%2) %1 システムパーティション (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>パーティション %1 は、%2 には小さすぎます。少なくとも %3 GB 以上のパーティションを選択してください。 - + <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 システムパーティションがシステムに見つかりません。%1 を設定するために一旦戻って手動パーティショニングを使用してください。 - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 は %2 にインストールされます。<br/><font color="red">警告: </font>パーティション %2 のすべてのデータは失われます。 - + The EFI system partition at %1 will be used for starting %2. %1 上の EFI システムパーティションは %2 開始時に使用されます。 - + EFI system partition: EFI システムパーティション: @@ -1783,55 +1806,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... システム情報を取得中... - + has at least %1 GB available drive space 最低 %1 GBのディスク空き領域があること - + There is not enough drive space. At least %1 GB is required. 十分なドライブ容量がありません。少なくとも %1 GB 必要です。 - + has at least %1 GB working memory 最低 %1 GB のワーキングメモリーがあること - + The system does not have enough working memory. At least %1 GB is required. システムには十分なワーキングメモリがありません。少なくとも %1 GB 必要です。 - + is plugged in to a power source 電源が接続されていること - + The system is not plugged in to a power source. システムに電源が接続されていません。 - + is connected to the Internet インターネットに接続されていること - + The system is not connected to the Internet. システムはインターネットに接続されていません。 - + The installer is not running with administrator rights. インストーラーは管理者権限で実行されていません。 + + + The screen is too small to display the installer. + インストーラーを表示するためには、画面が小さすぎます。 + ResizeFileSystemJob @@ -2067,42 +2095,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 ユーザ %1 のパスワード設定 - + Setting password for user %1. ユーザ %1 のパスワード設定中。 - + Bad destination system path. 不正なシステムパス。 - + rootMountPoint is %1 root のマウントポイントは %1 。 - + Cannot disable root account. rootアカウントを使用することができません。 - + passwd terminated with error code %1. passwd がエラーコード %1 のため終了しました。 - + Cannot set password for user %1. ユーザ %1 のパスワードは設定できませんでした。 - + usermod terminated with error code %1. エラーコード %1 によりusermodが停止しました。 @@ -2236,22 +2264,27 @@ The installer will quit and all changes will be lost. 説明（&A） - + <h1>Welcome to the %1 installer.</h1> <h1>%1 インストーラーへようこそ。</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>%1 Calamares インストーラーにようこそ</h1> + + + About %1 installer %1 インストーラーについて - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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/>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. - + %1 support %1 サポート diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts index d073df2de..f8ffbe402 100644 --- a/lang/calamares_kk.ts +++ b/lang/calamares_kk.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - - - - - Allocate drive space by dragging the divider below: - - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -75,7 +42,7 @@ %1 (%2) - + %1 (%2) @@ -119,12 +86,12 @@ Tools - + Саймандар Debug information - + Жөндеу ақпараты @@ -132,7 +99,7 @@ Install - + Орнату @@ -140,7 +107,7 @@ Done - + Дайын @@ -215,32 +182,32 @@ Output: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path - + Working directory %1 for python job %2 is not readable. - + Bad main script file - + Main script file %1 for python job %2 is not readable. - + Boost.Python error in job "%1". @@ -248,64 +215,90 @@ Output: Calamares::ViewManager - + &Back - + А&ртқа - + &Next - + &Алға - - + + &Cancel + Ба&с тарту + + + + + Cancel installation without changing the system. - + Cancel installation? - + Орнатудан бас тарту керек пе? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now - + Go &back - - &Quit + + &Done - + + The installation is complete. Close the installer. + + + + Error - + Installation Failed @@ -336,12 +329,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer - + Show debug information @@ -362,7 +355,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -372,17 +365,17 @@ The installer will quit and all changes will be lost. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -395,35 +388,35 @@ The installer will quit and all changes will be lost. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -433,71 +426,71 @@ 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>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -523,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. @@ -550,6 +543,11 @@ The installer will quit and all changes will be lost. Create a Partition + + + MiB + + Partition &Type: @@ -586,32 +584,27 @@ The installer will quit and all changes will be lost. - - MB - - - - + En&crypt - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -824,7 +817,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -926,17 +919,22 @@ The installer will quit and all changes will be lost. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -964,7 +962,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -982,27 +980,27 @@ The installer will quit and all changes will be lost. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1020,18 +1018,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1109,12 +1122,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1130,15 +1143,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1221,12 +1244,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1247,12 +1270,12 @@ The installer will quit and all changes will be lost. - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1323,17 +1346,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1382,7 +1405,6 @@ The installer will quit and all changes will be lost. - @@ -1556,7 +1578,7 @@ The installer will quit and all changes will be lost. - + Are you sure you want to create a new partition table on %1? @@ -1579,82 +1601,82 @@ The installer will quit and all changes will be lost. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1673,22 +1695,22 @@ The installer will quit and all changes will be lost. - + unknown - + extended - + unformatted - + swap @@ -1711,64 +1733,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1776,55 +1798,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2060,42 +2087,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2229,22 +2256,27 @@ The installer will quit and all changes will be lost. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support %1 қолдауы diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts index f6a70a719..a69a9ee43 100644 --- a/lang/calamares_lo.ts +++ b/lang/calamares_lo.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - - - - - Allocate drive space by dragging the divider below: - - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -215,32 +182,32 @@ Output: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path - + Working directory %1 for python job %2 is not readable. - + Bad main script file - + Main script file %1 for python job %2 is not readable. - + Boost.Python error in job "%1". @@ -248,64 +215,90 @@ Output: Calamares::ViewManager - + &Back - + &Next - - + + &Cancel - + + + Cancel installation without changing the system. + + + + Cancel installation? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now - + Go &back - - &Quit + + &Done - + + The installation is complete. Close the installer. + + + + Error - + Installation Failed @@ -336,12 +329,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer - + Show debug information @@ -362,7 +355,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -372,17 +365,17 @@ The installer will quit and all changes will be lost. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -395,35 +388,35 @@ The installer will quit and all changes will be lost. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -433,71 +426,71 @@ 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>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -523,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. @@ -550,6 +543,11 @@ The installer will quit and all changes will be lost. Create a Partition + + + MiB + + Partition &Type: @@ -586,32 +584,27 @@ The installer will quit and all changes will be lost. - - MB - - - - + En&crypt - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -824,7 +817,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -926,17 +919,22 @@ The installer will quit and all changes will be lost. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -964,7 +962,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -982,27 +980,27 @@ The installer will quit and all changes will be lost. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1020,18 +1018,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1109,12 +1122,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1130,15 +1143,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1221,12 +1244,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1247,12 +1270,12 @@ The installer will quit and all changes will be lost. - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1323,17 +1346,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1382,7 +1405,6 @@ The installer will quit and all changes will be lost. - @@ -1556,7 +1578,7 @@ The installer will quit and all changes will be lost. - + Are you sure you want to create a new partition table on %1? @@ -1579,82 +1601,82 @@ The installer will quit and all changes will be lost. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1673,22 +1695,22 @@ The installer will quit and all changes will be lost. - + unknown - + extended - + unformatted - + swap @@ -1711,64 +1733,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1776,55 +1798,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2060,42 +2087,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2229,22 +2256,27 @@ The installer will quit and all changes will be lost. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts index 52aadc0d2..47f0f9263 100644 --- a/lang/calamares_lt.ts +++ b/lang/calamares_lt.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Pasirinkite skaidinį, kurį mažinsite: - - - - Allocate drive space by dragging the divider below: - Paskirstykite diską, traukdami paskirstytoją apačioje: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Po šios operacijos, skaidinys <strong>%1</strong> kuriame yra %4 bus sumažintas iki %2MB ir bus sukurtas naujas %3MB skaidinys sistemai %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Šioje sistemoje niekur nepavyko rasti EFI skaidinio. Prašome grįžti ir naudoti rankinį skaidymą, kad nustatytumėte %1. - - - - The EFI system partition at %1 will be used for starting %2. - %2 paleidimui bus naudojamas EFI sistemos skaidinys, esantis %1. - - - - EFI system partition: - EFI sistemos skaidinys: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. Šios sistemos <strong>paleidimo aplinka</strong>.<br><br>Senesnės x86 sistemos palaiko tik <strong>BIOS</strong>.<br>Šiuolaikinės sistemos, dažniausiai, naudoja <strong>EFI</strong>, tačiau, jeigu jos yra paleistos suderinamumo veiksenoje, taip pat gali būti rodomos kaip BIOS. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Ši sistema buvo paleista su <strong>EFI</strong> paleidimo aplinka.<br><br>Tam, kad sukonfigūruotų paleidimą iš EFI aplinkos, ši diegimo programa, <strong>EFI sistemos skaidinyje</strong>, privalo išskleisti paleidyklės programą, kaip, pavyzdžiui, <strong>GRUB</strong> ar <strong>systemd-boot</strong>. Tai vyks automatiškai, nebent pasirinksite rankinį skaidymą ir tokiu atveju patys turėsite pasirinkti arba sukurti skaidinį. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Ši sistema buvo paleista su <strong>BIOS</strong> paleidimo aplinka.<br><br>Tam, kad sukonfigūruotų paleidimą iš BIOS aplinkos, ši diegimo programa, arba skaidinio pradžioje, arba <strong>Paleidimo įraše (MBR)</strong>, šalia skaidinių lentelės pradžios (pageidautina), privalo įdiegti paleidyklę, kaip, pavyzdžiui, <strong>GRUB</strong>. Tai vyks automatiškai, nebent pasirinksite rankinį skaidymą ir tokiu atveju, viską turėsite nusistatyti patys. @@ -221,32 +188,32 @@ Išvestis: Calamares::PythonJob - + Running %1 operation. Vykdoma %1 operacija. - + Bad working directory path Netinkama darbinio katalogo vieta - + Working directory %1 for python job %2 is not readable. Darbinis %1 python katalogas dėl %2 užduoties yra neskaitomas - + Bad main script file Prastas pagrindinio skripto failas - + Main script file %1 for python job %2 is not readable. Pagrindinis skriptas %1 dėl python %2 užduoties yra neskaitomas - + Boost.Python error in job "%1". Boost.Python klaida darbe "%1". @@ -254,65 +221,91 @@ Išvestis: Calamares::ViewManager - + &Back &Atgal - + &Next &Toliau - - + + &Cancel A&tšaukti - + + + Cancel installation without changing the system. + Atsisakyti diegimo, nieko nekeisti sistemoje. + + + Cancel installation? Atšaukti diegimą? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Ar tikrai norite atšaukti dabartinio diegimo procesą? Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. - + + &Yes + &Taip + + + + &No + &Ne + + + + &Close + &Užverti + + + Continue with setup? Tęsti sąranką? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 diegimo programa, siekdama įdiegti %2, ketina atlikti pakeitimus diske.<br/><strong>Negalėsite atšaukti šių pakeitimų.</strong> - + &Install now Į&diegti dabar - + Go &back &Grįžti - - &Quit - &Baigti + + &Done + A&tlikta - + + The installation is complete. Close the installer. + Diegimas užbaigtas. Užverkite diegimo programą. + + + Error Klaida - + Installation Failed Diegimas nepavyko @@ -343,12 +336,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. CalamaresWindow - + %1 Installer %1 diegimo programa - + Show debug information Rodyti derinimo informaciją @@ -369,7 +362,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Šis kompiuteris netenkina minimalių %1 diegimo reikalavimų.<br/>Diegimas negali būti tęsiamas. <a href="#details">Išsamiau...</a> @@ -379,17 +372,17 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Šis kompiuteris netenkina kai kurių %1 diegimui rekomenduojamų reikalavimų.<br/>Diegti galite, bet kai kurios funkcijos gali būti išjungtos. - + This program will ask you some questions and set up %2 on your computer. Programa užduos klausimus ir padės įsidiegti %2. - + For best results, please ensure that this computer: Norėdami pasiekti geriausių rezultatų, įsitikinkite kad šis kompiuteris: - + System requirements Sistemos reikalavimai @@ -402,35 +395,35 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Forma - + After: Po: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Rankinis skaidymas</strong><br/>Galite patys kurti ar keisti skaidinių dydžius. - + Boot loader location: Paleidyklės vieta: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 bus sumažintas iki %2MB ir naujas %3MB skaidinys bus sukurtas sistemai %4. - + Select storage de&vice: Pasirinkite atminties įr&enginį: - - - - + + + + Current: Dabartinis: @@ -440,71 +433,71 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Pakartotinai naudoti %1 kaip namų skaidinį, skirtą %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Pasirinkite, kurį skaidinį sumažinti, o tuomet vilkite juostą, kad pakeistumėte skaidinio dydį</strong> - + <strong>Select a partition to install on</strong> <strong>Pasirinkite kuriame skaidinyje įdiegti</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Šioje sistemoje niekur nepavyko rasti EFI skaidinio. Prašome grįžti ir naudoti rankinį skaidymą, kad nustatytumėte %1. - + The EFI system partition at %1 will be used for starting %2. %2 paleidimui bus naudojamas EFI sistemos skaidinys, esantis ties %1. - + EFI system partition: EFI sistemos skaidinys: - + 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. Atrodo, kad šiame įrenginyje nėra operacinės sistemos. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Ištrinti diską</strong><br/>Tai <font color="red">ištrins</font> visus, pasirinktame atminties įrenginyje, esančius duomenis. - + 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. Šiame atminties įrenginyje jau yra %1. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Įdiegti šalia</strong><br/>Diegimo programa sumažins skaidinį, kad atlaisvintų vietą sistemai %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Pakeisti skaidinį</strong><br/>Pakeičia skaidinį ir įrašo %1. - + This storage device already has 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. Šiame atminties įrenginyje jau yra operacinė sistema. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus. - + This storage device has multiple operating systems 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. Šiame atminties įrenginyje jau yra kelios operacinės sistemos. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus. @@ -530,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. @@ -557,6 +550,11 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Create a Partition Sukurti skaidinį + + + MiB + MiB + Partition &Type: @@ -593,32 +591,27 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. D&ydis: - - MB - MB - - - + En&crypt Užši&fruoti - + Logical Loginė - + Primary Pagrindinė - + GPT GPT - + Mountpoint already in use. Please select another one. Prijungimo taškas jau yra naudojamas. Prašome pasirinkti kitą. @@ -831,7 +824,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. DeviceInfoWidget - + 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. Pasirinktame atminties įrenginyje esančios, <strong>skaidinių lentelės</strong> tipas.<br><br>Vienintelis būdas kaip galima pakeisti skaidinių lentelės tipą yra ištrinti ir iš naujo sukurti skaidinių lentelę, kas savo ruožtu ištrina visus atminties įrenginyje esančius duomenis.<br>Ši diegimo programa paliks esamą skaidinių lentelę, nebent aiškiai pasirinksite kitaip.<br>Jeigu nesate tikri, šiuolaikinėse sistemose pirmenybė yra teikiama GPT tipui. @@ -915,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. @@ -933,17 +926,22 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Dy&dis: - + + MiB + MiB + + + Fi&le System: Fai&lų sistema: - + Flags: Vėliavėlės: - + Mountpoint already in use. Please select another one. Prijungimo taškas jau yra naudojamas. Prašome pasirinkti kitą. @@ -971,7 +969,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Patvirtinkite slaptafrazę - + Please enter the same passphrase in both boxes. Prašome abiejuose langeliuose įrašyti tą pačią slaptafrazę. @@ -989,27 +987,27 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Įdiegti %1 <strong>naujame</strong> %2 sistemos skaidinyje. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Nustatyti <strong>naują</strong> %2 skaidinį su prijungimo tašku <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Diegti %2 sistemą, %3 sistemos skaidinyje <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Nustatyti %3 skaidinį <strong>%1</strong> su prijungimo tašku <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Diegti paleidyklę skaidinyje <strong>%1</strong>. - + Setting up mount points. Nustatomi prijungimo taškai. @@ -1027,40 +1025,55 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. &Paleisti iš naujo dabar - + <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. + + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>Diegimas nepavyko</h1><br/>%1 nebuvo įdiegta jūsų kompiuteryje.<br/>Klaidos pranešimas buvo: %2. FinishedViewStep - + Finish Pabaiga + + + Installation Complete + Diegimas užbaigtas + + + + The installation of %1 is complete. + %1 diegimas yra užbaigtas. + FormatPartitionJob 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. @@ -1116,12 +1129,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. KeyboardPage - + Set keyboard model to %1.<br/> Nustatyti klaviatūros modelį kaip %1.<br/> - + Set keyboard layout to %1/%2. Nustatyti klaviatūros išdėstymą kaip %1/%2. @@ -1137,15 +1150,25 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. LCLocaleDialog - + System locale setting Sistemos lokalės nustatymas - + 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>. Sistemos lokalės nustatymas įtakoja, kai kurių komandų eilutės naudotojo sąsajos elementų, kalbos ir simbolių rinkinį.<br/>Dabar yra nustatyta <strong>%1</strong>. + + + &Cancel + &Atsisakyti + + + + &OK + &Gerai + LicensePage @@ -1157,7 +1180,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. @@ -1214,7 +1237,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> @@ -1228,12 +1251,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. LocalePage - + The system language will be set to %1. Sistemos kalba bus nustatyta į %1. - + The numbers and dates locale will be set to %1. Skaičių ir datų lokalė bus nustatyta į %1. @@ -1254,12 +1277,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. K&eisti... - + Set timezone to %1/%2.<br/> Nustatyti laiko juostą kaip %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. NetInstallPage - + Name Pavadinimas - + Description Aprašas - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Tinklo diegimas. (Išjungta: Nepavyksta gauti paketų sąrašus, patikrinkite savo tinklo ryšį) @@ -1389,7 +1412,6 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Kokį vardą norite naudoti prisijungimui? - @@ -1550,12 +1572,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. &Edit - &Redaguoti + &Keisti &Delete - &Trinti + Ša&linti @@ -1563,7 +1585,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Įdiegti pa&leidyklę skaidinyje: - + Are you sure you want to create a new partition table on %1? Ar tikrai %1 norite sukurti naują skaidinių lentelę? @@ -1586,82 +1608,82 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Diegti %1 <strong>šalia</strong> kitos operacinės sistemos. - + <strong>Erase</strong> disk and install %1. <strong>Ištrinti</strong> diską ir diegti %1. - + <strong>Replace</strong> a partition with %1. <strong>Pakeisti</strong> skaidinį, įrašant %1. - + <strong>Manual</strong> partitioning. <strong>Rankinis</strong> skaidymas. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Įdiegti %1 <strong>šalia</strong> kitos operacinės sistemos diske <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Ištrinti</strong> diską <strong>%2</strong> (%3) ir diegti %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Pakeisti</strong> skaidinį diske <strong>%2</strong> (%3), įrašant %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Rankinis</strong> skaidymas diske <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Diskas <strong>%1</strong> (%2) - + Current: Dabartinis: - + After: Po: - + No EFI system partition configured Nėra sukonfigūruoto EFI sistemos skaidinio - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. EFI sistemos skaidinys yra būtinas, norint paleisti %1.<br/><br/>Tam, kad sukonfigūruotumėte EFI sistemos skaidinį, grįžkite atgal ir pasirinkite arba sukurkite FAT32 failų sistemą su įjungta <strong>esp</strong> vėliavėle ir <strong>%2</strong> prijungimo tašku.<br/><br/>Jūs galite tęsti ir nenustatę EFI sistemos skaidinio, tačiau tokiu atveju, gali nepavykti paleisti jūsų sistemos. - + EFI system partition flag not set Nenustatyta EFI sistemos skaidinio vėliavėlė - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. EFI sistemos skaidinys yra būtinas, norint paleisti %1.<br/><br/>Skaidinys buvo sukonfigūruotas su prijungimo tašku <strong>%2</strong>, tačiau jo <strong>esp</strong> vėliavėlė yra nenustatyta.<br/>Tam, kad nustatytumėte vėliavėlę, grįžkite atgal ir redaguokite skaidinį.<br/><br/>Jūs galite tęsti ir nenustatę vėliavėlės, tačiau tokiu atveju, gali nepavykti paleisti jūsų sistemos. - + Boot partition not encrypted Paleidimo skaidinys nėra užšifruotas - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Kartu su užšifruotu šaknies skaidiniu, buvo nustatytas atskiras paleidimo skaidinys, tačiau paleidimo skaidinys nėra užšifruotas.<br/><br/>Dėl tokios sąrankos iškyla tam tikrų saugumo klausimų, kadangi svarbūs sisteminiai failai yra laikomi neužšifruotame skaidinyje.<br/>Jeigu norite, galite tęsti, tačiau failų sistemos atrakinimas įvyks vėliau, sistemos paleidimo metu.<br/>Norėdami užšifruoti paleidimo skaidinį, grįžkite atgal ir sukurkite jį iš naujo bei skaidinių kūrimo lange pažymėkite parinktį <strong>Užšifruoti</strong>. @@ -1680,22 +1702,22 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Numatytasis - + unknown nežinoma - + extended išplėsta - + unformatted nesutvarkyta - + swap sukeitimų (swap) @@ -1718,64 +1740,64 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Pasirinkite, kur norėtumėte įdiegti %1.<br/><font color="red">Įspėjimas: </font>tai ištrins visus, pasirinktame skaidinyje esančius, failus. - + The selected item does not appear to be a valid partition. Pasirinktas elementas neatrodo kaip teisingas skaidinys. - + %1 cannot be installed on empty space. Please select an existing partition. %1 negali būti įdiegta laisvoje vietoje. Prašome pasirinkti esamą skaidinį. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 negali būti įdiegta išplėstame skaidinyje. Prašome pasirinkti esamą pirminį ar loginį skaidinį. - + %1 cannot be installed on this partition. %1 negali būti įdiegta šiame skaidinyje. - + Data partition (%1) Duomenų skaidinys (%1) - + Unknown system partition (%1) Nežinomas sistemos skaidinys (%1) - + %1 system partition (%2) %1 sistemos skaidinys (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>Skaidinys %1 yra pernelyg mažas sistemai %2. Prašome pasirinkti skaidinį, kurio dydis siektų bent %3 GiB. - + <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/>Šioje sistemoje niekur nepavyko rasti EFI skaidinio. Prašome grįžti ir naudoti rankinį skaidymą, kad nustatytumėte %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 sistema bus įdiegta skaidinyje %2.<br/><font color="red">Įspėjimas: </font>visi duomenys skaidinyje %2 bus prarasti. - + The EFI system partition at %1 will be used for starting %2. %2 paleidimui bus naudojamas EFI sistemos skaidinys, esantis %1. - + EFI system partition: EFI sistemos skaidinys: @@ -1783,55 +1805,60 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. RequirementsChecker - + Gathering system information... Renkama sistemos informacija... - + has at least %1 GB available drive space turi bent %1 GB laisvos vietos diske - + There is not enough drive space. At least %1 GB is required. Neužtenka vietos diske. Reikia bent %1 GB. - + has at least %1 GB working memory turi bent %1 GB darbinės atminties - + The system does not have enough working memory. At least %1 GB is required. Sistemai neužtenka darbinės atminties. Reikia bent %1 GB. - + is plugged in to a power source prijungta prie maitinimo šaltinio - + The system is not plugged in to a power source. Sistema nėra prijungta prie maitinimo šaltinio. - + is connected to the Internet prijungta prie Interneto - + The system is not connected to the Internet. Sistema nėra prijungta prie Interneto. - + The installer is not running with administrator rights. Diegimo programa yra vykdoma be administratoriaus teisių. + + + The screen is too small to display the installer. + Ekranas yra per mažas, kad būtų parodyta diegimo programa. + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. SetPasswordJob - + Set password for user %1 Nustatyti naudotojo %1 slaptažodį - + Setting password for user %1. Nustatomas slaptažodis naudotojui %1. - + Bad destination system path. Neteisingas paskirties sistemos kelias. - + rootMountPoint is %1 šaknies prijungimo vieta yra %1 - + Cannot disable root account. Nepavyksta išjungti administratoriaus (root) paskyros. - + passwd terminated with error code %1. komanda passwd nutraukė darbą dėl klaidos kodo %1. - + Cannot set password for user %1. Nepavyko nustatyti slaptažodžio naudotojui %1. - + usermod terminated with error code %1. komanda usermod nutraukė darbą dėl klaidos kodo %1. @@ -2236,22 +2263,27 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. &Apie - + <h1>Welcome to the %1 installer.</h1> <h1>Jus sveikina %1 diegimo programa.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Jus sveikina Calamares diegimo programa, skirta %1 sistemai.</h1> + + + About %1 installer Apie %1 diegimo programą - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>sistemai %3</strong><br/><br/>Autorių teisės 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Dėkojame: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg ir <a href="https://www.transifex.com/calamares/calamares/">Calamares vertėjų komandai</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> kūrimą remia <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Išlaisvinanti programinė įranga. + + <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/>sistemai %3</strong><br/><br/>Autorių teisės 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Autorių teisės 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Dėkojame: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg ir <a href="https://www.transifex.com/calamares/calamares/">Calamares vertėjų komandai</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> kūrimą remia <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Išlaisvinanti programinė įranga. - + %1 support %1 palaikymas diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts index d7daa889a..0fdff01e4 100644 --- a/lang/calamares_mr.ts +++ b/lang/calamares_mr.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - - - - - Allocate drive space by dragging the divider below: - - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -215,32 +182,32 @@ Output: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path - + Working directory %1 for python job %2 is not readable. - + Bad main script file - + Main script file %1 for python job %2 is not readable. - + Boost.Python error in job "%1". @@ -248,64 +215,90 @@ Output: Calamares::ViewManager - + &Back - + &Next - - + + &Cancel - + + + Cancel installation without changing the system. + + + + Cancel installation? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now - + Go &back - - &Quit + + &Done - + + The installation is complete. Close the installer. + + + + Error - + Installation Failed @@ -336,12 +329,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer - + Show debug information @@ -362,7 +355,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -372,17 +365,17 @@ The installer will quit and all changes will be lost. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -395,35 +388,35 @@ The installer will quit and all changes will be lost. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -433,71 +426,71 @@ 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>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -523,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. @@ -550,6 +543,11 @@ The installer will quit and all changes will be lost. Create a Partition + + + MiB + + Partition &Type: @@ -586,32 +584,27 @@ The installer will quit and all changes will be lost. - - MB - - - - + En&crypt - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -824,7 +817,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -926,17 +919,22 @@ The installer will quit and all changes will be lost. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -964,7 +962,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -982,27 +980,27 @@ The installer will quit and all changes will be lost. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1020,18 +1018,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1109,12 +1122,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1130,15 +1143,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1221,12 +1244,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1247,12 +1270,12 @@ The installer will quit and all changes will be lost. - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1323,17 +1346,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1382,7 +1405,6 @@ The installer will quit and all changes will be lost. - @@ -1556,7 +1578,7 @@ The installer will quit and all changes will be lost. - + Are you sure you want to create a new partition table on %1? @@ -1579,82 +1601,82 @@ The installer will quit and all changes will be lost. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1673,22 +1695,22 @@ The installer will quit and all changes will be lost. - + unknown - + extended - + unformatted - + swap @@ -1711,64 +1733,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1776,55 +1798,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2060,42 +2087,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2229,22 +2256,27 @@ The installer will quit and all changes will be lost. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts index 9cc960361..653e83df8 100644 --- a/lang/calamares_nb.ts +++ b/lang/calamares_nb.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Velg en partisjon som skal krympes - - - - Allocate drive space by dragging the divider below: - Fordel diskplass ved å flytte skillelinjen nedenfor: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Med denne handlingen vil partisjon <b>%1</b> som inneholder %4 bli krympet til %2MB og en ny partisjon på %3MB vil bli opprettet for %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -221,32 +188,32 @@ Output: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path Feil filsti til arbeidsmappe - + Working directory %1 for python job %2 is not readable. Arbeidsmappe %1 for python oppgave %2 er ikke lesbar. - + Bad main script file Ugyldig hovedskriptfil - + Main script file %1 for python job %2 is not readable. Hovedskriptfil %1 for python oppgave %2 er ikke lesbar. - + Boost.Python error in job "%1". Boost.Python feil i oppgave "%1". @@ -254,65 +221,91 @@ Output: Calamares::ViewManager - + &Back &Tilbake - + &Next &Neste - - + + &Cancel &Avbryt - + + + Cancel installation without changing the system. + + + + Cancel installation? Avbryte installasjon? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Vil du virkelig avbryte installasjonen? Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? Fortsette å sette opp? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 vil nå gjøre endringer på harddisken, for å installere %2. <br/><strong>Du vil ikke kunne omgjøre disse endringene.</strong> - + &Install now &Installer nå - + Go &back Gå &tilbake - - &Quit - &Avslutt + + &Done + - + + The installation is complete. Close the installer. + + + + Error Feil - + Installation Failed Installasjon feilet @@ -343,12 +336,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. CalamaresWindow - + %1 Installer %1 Installasjonsprogram - + Show debug information Vis feilrettingsinformasjon @@ -369,7 +362,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -379,17 +372,17 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -402,35 +395,35 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -440,71 +433,71 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -530,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. @@ -557,6 +550,11 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.Create a Partition Opprett en partisjon + + + MiB + + Partition &Type: @@ -593,32 +591,27 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.St&ørrelse: - - MB - MB - - - + En&crypt - + Logical Logisk - + Primary Primær - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -831,7 +824,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. DeviceInfoWidget - + 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. @@ -933,17 +926,22 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -971,7 +969,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + Please enter the same passphrase in both boxes. @@ -989,27 +987,27 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1027,18 +1025,33 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + <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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1116,12 +1129,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1137,15 +1150,25 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1254,12 +1277,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1330,17 +1353,17 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1389,7 +1412,6 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - @@ -1563,7 +1585,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + Are you sure you want to create a new partition table on %1? @@ -1586,82 +1608,82 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1680,22 +1702,22 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + unknown - + extended - + unformatted - + swap @@ -1718,64 +1740,64 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1783,55 +1805,60 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2236,22 +2263,27 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts index 5d9667ccd..246f086e7 100644 --- a/lang/calamares_nl.ts +++ b/lang/calamares_nl.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Kies een partitie om te verkleinen: - - - - Allocate drive space by dragging the divider below: - Reserveer schijfruimte door de balkjes hieronder te verslepen: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Tijdens deze bewerking zal partitie <strong>%1</strong>, die %4 bevat, verkleind worden tot %2MB en zal een nieuwe %3MB partitie aangemaakt worden voor %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Er werd geen EFI systeempartitie gevonden op dit systeem. Gelieve terug te gaan en manueel te partitioneren om %1 in te stellen. - - - - The EFI system partition at %1 will be used for starting %2. - De EFI systeempartitie op %1 zal gebruikt worden om %2 te starten. - - - - EFI system partition: - EFI systeempartitie: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. De <strong>opstartomgeving</strong> van dit systeem.<br><br>Oudere x86-systemen ondersteunen enkel <strong>BIOS</strong>.<br>Moderne systemen gebruiken meestal <strong>EFI</strong>, maar kunnen ook als BIOS verschijnen als in compatibiliteitsmodus opgestart werd. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Dit systeem werd opgestart met een <strong>EFI</strong>-opstartomgeving.<br><br>Om het opstarten vanaf een EFI-omgeving te configureren moet dit installatieprogramma een bootloader instellen, zoals <strong>GRUB</strong> of <strong>systemd-boot</strong> op een <strong>EFI-systeempartitie</strong>. Dit gebeurt automatisch, tenzij je voor manueel partitioneren kiest, waar je het moet aanvinken of het zelf aanmaken. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Dit systeem werd opgestart met een <strong>BIOS</strong>-opstartomgeving.<br><br>Om het opstarten vanaf een BIOS-omgeving te configureren moet dit installatieprogramma een bootloader installeren, zoals <strong>GRUB</strong>, ofwel op het begin van een partitie ofwel op de <strong>Master Boot Record</strong> bij het begin van de partitietabel (bij voorkeur). Dit gebeurt automatisch, tenzij je voor manueel partitioneren kiest, waar je het zelf moet aanmaken. @@ -221,32 +188,32 @@ Uitvoer: Calamares::PythonJob - + Running %1 operation. Bewerking %1 uitvoeren. - + Bad working directory path Ongeldig pad voor huidige map - + Working directory %1 for python job %2 is not readable. Werkmap %1 voor python taak %2 onleesbaar. - + Bad main script file Onjuist hoofdscriptbestand - + Main script file %1 for python job %2 is not readable. Hoofdscriptbestand %1 voor python taak %2 onleesbaar. - + Boost.Python error in job "%1". Boost.Python fout in taak "%1". @@ -254,65 +221,91 @@ Uitvoer: Calamares::ViewManager - + &Back &Terug - + &Next &Volgende - - + + &Cancel &Afbreken - + + + Cancel installation without changing the system. + Installatie afbreken zonder aanpassingen aan het systeem. + + + Cancel installation? Installatie afbreken? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Wil je het huidige installatieproces echt afbreken? Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. - + + &Yes + &ja + + + + &No + &Nee + + + + &Close + &Sluiten + + + Continue with setup? Doorgaan met installatie? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Het %1 installatieprogramma zal nu aanpassingen maken aan je schijf om %2 te installeren.<br/><strong>Deze veranderingen kunnen niet ongedaan gemaakt worden.</strong> - + &Install now Nu &installeren - + Go &back Ga &terug - - &Quit - &Afsluiten + + &Done + Voltooi&d - + + The installation is complete. Close the installer. + De installatie is voltooid. Sluit het installatie-programma. + + + Error Fout - + Installation Failed Installatie Mislukt @@ -343,12 +336,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. CalamaresWindow - + %1 Installer %1 Installatieprogramma - + Show debug information Toon debug informatie @@ -369,7 +362,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Deze computer voldoet niet aan de minimumvereisten om %1 te installeren.<br/>De installatie kan niet doorgaan. <a href="#details">Details...</a> @@ -379,17 +372,17 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Deze computer voldoet niet aan enkele van de aanbevolen specificaties om %1 te installeren.<br/>De installatie kan doorgaan, maar sommige functies kunnen uitgeschakeld zijn. - + This program will ask you some questions and set up %2 on your computer. Dit programma stelt je enkele vragen en installeert %2 op jouw computer. - + For best results, please ensure that this computer: Voor de beste resultaten is het aangeraden dat deze computer: - + System requirements Systeemvereisten @@ -402,35 +395,35 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Formulier - + After: Na: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Handmatig partitioneren</strong><br/>Je maakt of wijzigt zelf de partities. - + Boot loader location: Bootloader locatie: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 zal verkleind worden tot %2MB en een nieuwe %3MB partitie zal worden aangemaakt voor %4. - + Select storage de&vice: Selecteer &opslagmedium: - - - - + + + + Current: Huidig: @@ -440,71 +433,71 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Hergebruik %1 als home-partitie voor %2 - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Selecteer een partitie om te verkleinen, en sleep vervolgens de onderste balk om het formaat te wijzigen</strong> - + <strong>Select a partition to install on</strong> <strong>Selecteer een partitie om op te installeren</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Er werd geen EFI systeempartitie gevonden op dit systeem. Gelieve terug te gaan en manueel te partitioneren om %1 in te stellen. - + The EFI system partition at %1 will be used for starting %2. De EFI systeempartitie op %1 zal gebruikt worden om %2 te starten. - + EFI system partition: EFI systeempartitie: - + 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. Dit opslagmedium lijkt geen besturingssysteem te bevatten. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Wis schijf</strong><br/>Dit zal alle huidige gegevens op de geselecteerd opslagmedium <font color="red">verwijderen</font>. - + 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. Dit opslagmedium bevat %1. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Installeer ernaast</strong><br/>Het installatieprogramma zal een partitie verkleinen om plaats te maken voor %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Vervang een partitie</strong><br/>Vervangt een partitie met %1. - + This storage device already has 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. Dit opslagmedium bevat reeds een besturingssysteem. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd. - + This storage device has multiple operating systems 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. Dit opslagmedium bevat meerdere besturingssystemen. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd. @@ -530,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. @@ -557,6 +550,11 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Create a Partition Maak partitie + + + MiB + MiB + Partition &Type: @@ -593,32 +591,27 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. &Grootte: - - MB - MB - - - + En&crypt &Versleutelen - + Logical Logisch - + Primary Primair - + GPT GPT - + Mountpoint already in use. Please select another one. Aankoppelpunt reeds in gebruik. Gelieve een andere te kiezen. @@ -831,7 +824,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. DeviceInfoWidget - + 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. Het type van <strong>partitietabel</strong> op het geselecteerde opslagmedium.<br><br>Om het type partitietabel te wijzigen, dien je deze te verwijderen en opnieuw aan te maken, wat alle gegevens op het opslagmedium vernietigt.<br>Het installatieprogramma zal de huidige partitietabel behouden tenzij je expliciet anders verkiest.<br>Bij twijfel wordt aangeraden GPT te gebruiken op moderne systemen. @@ -933,17 +926,22 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. &Grootte: - + + MiB + MiB + + + Fi&le System: Bestands&systeem - + Flags: Vlaggen: - + Mountpoint already in use. Please select another one. Aankoppelpunt reeds in gebruik. Gelieve een andere te kiezen. @@ -971,7 +969,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Bevestig wachtwoordzin - + Please enter the same passphrase in both boxes. Gelieve in beide velden dezelfde wachtwoordzin in te vullen. @@ -989,27 +987,27 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Installeer %1 op <strong>nieuwe</strong> %2 systeempartitie. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Maak <strong>nieuwe</strong> %2 partitie met aankoppelpunt <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Installeer %2 op %3 systeempartitie <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Stel %3 partitie <strong>%1</strong> in met aankoppelpunt <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Installeer bootloader op <strong>%1</strong>. - + Setting up mount points. Aankoppelpunten instellen. @@ -1027,18 +1025,33 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. &Nu herstarten - + <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>Klaar.</h1><br/>%1 is op je computer geïnstalleerd.<br/>Je mag je nieuwe systeem nu herstarten of de %2 Live omgeving blijven gebruiken. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>Installatie Mislukt</h1><br/>%1 werd niet op de computer geïnstalleerd. <br/>De foutboodschap was: %2 + FinishedViewStep - + Finish Beëindigen + + + Installation Complete + Installatie Afgerond. + + + + The installation of %1 is complete. + De installatie van %1 is afgerond. + FormatPartitionJob @@ -1116,12 +1129,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. KeyboardPage - + Set keyboard model to %1.<br/> Instellen toetsenbord model naar %1.<br/> - + Set keyboard layout to %1/%2. Instellen toetsenbord lay-out naar %1/%2. @@ -1137,15 +1150,25 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. LCLocaleDialog - + System locale setting Landinstellingen - + 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>. De landinstellingen bepalen de taal en het tekenset voor sommige opdrachtregelelementen.<br/>De huidige instelling is <strong>%1</strong>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. LocalePage - + The system language will be set to %1. De taal van het systeem zal worden ingesteld op %1. - + The numbers and dates locale will be set to %1. De getal- en datumnotatie worden ingesteld op %1. @@ -1254,12 +1277,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. &Aanpassen - + Set timezone to %1/%2.<br/> Instellen tijdzone naar %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. NetInstallPage - + Name Naam - + Description Beschrijving - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Netwerkinstallatie. (Uitgeschakeld: kon de pakketlijsten niet binnenhalen, controleer de netwerkconnectie) @@ -1389,7 +1412,6 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Welke naam wil je gebruiken om in te loggen? - @@ -1563,7 +1585,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Installeer boot&loader op: - + Are you sure you want to create a new partition table on %1? Weet u zeker dat u een nieuwe partitie tabel wil maken op %1? @@ -1586,82 +1608,82 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Installeer %1 <strong>naast</strong> een ander besturingssysteem. - + <strong>Erase</strong> disk and install %1. <strong>Wis</strong> schijf en installeer %1. - + <strong>Replace</strong> a partition with %1. <strong>Vervang</strong> een partitie met %1. - + <strong>Manual</strong> partitioning. <strong>Handmatig</strong> partitioneren. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Installeer %1 <strong>naast</strong> een ander besturingssysteem op schijf <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Wis</strong> schijf <strong>%2</strong> (%3) en installeer %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Vervang</strong> een partitie op schijf <strong>%2</strong> (%3) met %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Handmatig</strong> partitioneren van schijf <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Schijf <strong>%1</strong> (%2) - + Current: Huidig: - + After: Na: - + No EFI system partition configured Geen EFI systeempartitie geconfigureerd - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. Een EFI systeempartitie is vereist om %1 te starten.<br/><br/>Om een EFI systeempartitie in te stellen, ga terug en selecteer of maak een FAT32 bestandssysteem met de <strong>esp</strong>-vlag aangevinkt en aankoppelpunt <strong>%2</strong>.<br/><br/>Je kan verdergaan zonder een EFI systeempartitie, maar mogelijk start je systeem dan niet op. - + EFI system partition flag not set EFI-systeem partitievlag niet ingesteld. - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. Een EFI systeempartitie is vereist om %1 op te starten.<br/><br/>Een partitie is ingesteld met aankoppelpunt <strong>%2</strong>, maar de de <strong>esp</strong>-vlag is niet aangevinkt.<br/>Om deze vlag aan te vinken, ga terug en pas de partitie aan.<br/><br/>Je kan verdergaan zonder deze vlag, maar mogelijk start je systeem dan niet op. - + Boot partition not encrypted Bootpartitie niet versleuteld - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Een aparte bootpartitie was ingesteld samen met een versleutelde rootpartitie, maar de bootpartitie zelf is niet versleuteld.<br/><br/>Dit is niet volledig veilig, aangezien belangrijke systeembestanden bewaard worden op een niet-versleutelde partitie.<br/>Je kan doorgaan als je wil, maar het ontgrendelen van bestandssystemen zal tijdens het opstarten later plaatsvinden.<br/>Om de bootpartitie toch te versleutelen: keer terug en maak de bootpartitie opnieuw, waarbij je <strong>Versleutelen</strong> aanvinkt in het venster partitie aanmaken. @@ -1680,22 +1702,22 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Standaard - + unknown onbekend - + extended uitgebreid - + unformatted niet-geformateerd - + swap wisselgeheugen @@ -1718,64 +1740,64 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Kies waar %1 te installeren. <br/><font color="red">Opgelet: </font>dit zal alle bestanden op de geselecteerde partitie wissen. - + The selected item does not appear to be a valid partition. Het geselecteerde item is geen geldige partitie. - + %1 cannot be installed on empty space. Please select an existing partition. %1 kan niet worden geïnstalleerd op lege ruimte. Kies een bestaande partitie. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 kan niet op een uitgebreide partitie geïnstalleerd worden. Kies een bestaande primaire of logische partitie. - + %1 cannot be installed on this partition. %1 kan niet op deze partitie geïnstalleerd worden. - + Data partition (%1) Gegevenspartitie (%1) - + Unknown system partition (%1) Onbekende systeempartitie (%1) - + %1 system partition (%2) %1 systeempartitie (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>Partitie %1 is te klein voor %2. Gelieve een partitie te selecteren met een capaciteit van minstens %3 GiB. - + <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/>Er werd geen EFI systeempartite gevonden op dit systeem. Gelieve terug te keren en manueel te partitioneren om %1 in te stellen. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 zal geïnstalleerd worden op %2.<br/><font color="red">Opgelet: </font>alle gegevens op partitie %2 zullen verloren gaan. - + The EFI system partition at %1 will be used for starting %2. De EFI systeempartitie op %1 zal gebruikt worden om %2 te starten. - + EFI system partition: EFI systeempartitie: @@ -1783,55 +1805,60 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. RequirementsChecker - + Gathering system information... Systeeminformatie verzamelen... - + has at least %1 GB available drive space tenminste %1 GB vrije schijfruimte heeft - + There is not enough drive space. At least %1 GB is required. Er is onvoldoende vrije schijfruimte. Tenminste %1 GB is vereist. - + has at least %1 GB working memory tenminste %1 GB werkgeheugen heeft - + The system does not have enough working memory. At least %1 GB is required. Dit systeem heeft onvoldoende werkgeheugen. Tenminste %1 GB is vereist. - + is plugged in to a power source aangesloten is op netstroom - + The system is not plugged in to a power source. Dit systeem is niet aangesloten op netstroom. - + is connected to the Internet verbonden is met het Internet - + The system is not connected to the Internet. Dit systeem is niet verbonden met het Internet. - + The installer is not running with administrator rights. Het installatieprogramma draait zonder administratorrechten. + + + The screen is too small to display the installer. + Het schem is te klein on het installatieprogramma te vertonen. + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. SetPasswordJob - + Set password for user %1 Instellen wachtwoord voor gebruiker %1 - + Setting password for user %1. Wachtwoord instellen voor gebruiker %1. - + Bad destination system path. Onjuiste bestemming systeempad. - + rootMountPoint is %1 - rootAankoppelpunt is %1 + rootMountPoint is %1 - + Cannot disable root account. Kan root account niet uitschakelen. - + passwd terminated with error code %1. passwd is afgesloten met foutcode %1. - + Cannot set password for user %1. Kan het wachtwoord niet instellen voor gebruiker %1 - + usermod terminated with error code %1. usermod beëindigd met foutcode %1. @@ -2236,22 +2263,27 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. &Over - + <h1>Welcome to the %1 installer.</h1> <h1>Welkom in het %1 installatieprogramma.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Welkom in het Calamares installatieprogramma voor %1.</h1> + + + About %1 installer Over het %1 installatieprogramma - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>voor %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Met dank aan: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg en het <a href="https://www.transifex.com/calamares/calamares/">Calamares vertaalteam</a>.<br/><br/>De ontwikkeling van <a href="http://calamares.io/">Calamares</a> is gesponsord door <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + <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/>voor %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/>Met dank aan: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg en het <a href="https://www.transifex.com/calamares/calamares/">Calamares vertaalteam</a>.<br/><br/>De ontwikkeling van <a href="http://calamares.io/">Calamares</a> wordt gesponsord door <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + %1 support %1 ondersteuning diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts index 340bb9b4c..806c28a7a 100644 --- a/lang/calamares_pl.ts +++ b/lang/calamares_pl.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Wybierz partycję do zmniejszenia: - - - - Allocate drive space by dragging the divider below: - Przydziel przestrzeń na dysku poprzez przeciągnięcie poniżej suwaka: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Po zakończeniu tej operacji, partycja <strong>%1</strong>, która zawiera %4, będzie zmniejszona do %2MB, a nowa partycja %3MB zostanie utworzona dla %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Nigdzie w tym systemie nie można odnaleźć partycji systemowej EFI. Prosimy się cofnąć i użyć ręcznego partycjonowania dysku do ustawienia %1. - - - - The EFI system partition at %1 will be used for starting %2. - Partycja systemowa EFI na %1 będzie użyta do uruchamiania %2. - - - - EFI system partition: - Partycja systemowa EFI: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. <strong>Środowisko uruchomieniowe</strong> systemu.<br><br>Starsze systemy x86 obsługują tylko <strong>BIOS</strong>.<br>Nowoczesne systemy zwykle używają <strong>EFI</strong>, lecz możliwe jest również ukazanie się BIOS, jeśli działa w trybie kompatybilnym. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Ten system został uruchomiony w środowisku rozruchowym <strong>EFI</strong>.<br><br>Aby skonfigurować uruchomienie ze środowiska EFI, instalator musi wdrożyć aplikację programu rozruchowego, takiego jak <strong>GRUB</strong> lub <strong>systemd-boot</strong> na <strong>Partycji Systemu EFI</strong>. Jest to automatyczne, chyba że wybierasz ręczne partycjonowanie, a w takim przypadku musisz wybrać ją lub utworzyć osobiście. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Ten system został uruchomiony w środowisku rozruchowym <strong>BIOS</strong>.<br><br>Aby skonfigurować uruchomienie ze środowiska BIOS, instalator musi zainstalować program rozruchowy, taki jak <strong>GRUB</strong> na początku partycji lub w <strong>Głównym Sektorze Rozruchowym</strong> blisko początku tablicy partycji (preferowane). Jest to automatyczne, chyba że wybierasz ręczne partycjonowanie, a w takim przypadku musisz ustawić ją osobiście. @@ -221,32 +188,32 @@ Wyjście: Calamares::PythonJob - + Running %1 operation. Wykonuję operację %1. - + Bad working directory path Niepoprawna ścieżka katalogu roboczego - + Working directory %1 for python job %2 is not readable. Katalog roboczy %1 dla zadań pythona %2 jest nieosiągalny. - + Bad main script file Niepoprawny główny plik skryptu - + Main script file %1 for python job %2 is not readable. Główny plik skryptu %1 dla zadań pythona %2 jest nieczytelny. - + Boost.Python error in job "%1". Wystąpił błąd Boost.Python w zadaniu "%1". @@ -254,65 +221,91 @@ Wyjście: Calamares::ViewManager - + &Back &Wstecz - + &Next &Dalej - - + + &Cancel &Anuluj - + + + Cancel installation without changing the system. + Anuluj instalację bez dokonywania zmian w systemie. + + + Cancel installation? Anulować instalację? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Czy na pewno chcesz anulować obecny proces instalacji? Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. - + + &Yes + &Tak + + + + &No + &Nie + + + + &Close + Zam&knij + + + Continue with setup? Kontynuować z programem instalacyjnym? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Instalator %1 zamierza przeprowadzić zmiany na Twoim dysku, aby zainstalować %2.<br/><strong>Nie będziesz mógł cofnąć tych zmian.</strong> - + &Install now &Zainstaluj teraz - + Go &back &Cofnij się - - &Quit - W&yjdź + + &Done + &Ukończono - + + The installation is complete. Close the installer. + Instalacja ukończona pomyślnie. Możesz zamknąć instalator. + + + Error Błąd - + Installation Failed Wystąpił błąd instalacji @@ -343,12 +336,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. CalamaresWindow - + %1 Installer Instalator %1 - + Show debug information Pokaż informacje debugowania @@ -369,7 +362,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Ten komputer nie spełnia minimalnych wymagań, niezbędnych do instalacji %1.<br/>Instalacja nie może być kontynuowana. <a href="#details">Szczegóły...</a> @@ -379,17 +372,17 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Ten komputer nie spełnia wszystkich, zalecanych do instalacji %1 wymagań.<br/>Instalacja może być kontynuowana, ale niektóre opcje mogą być niedostępne. - + This program will ask you some questions and set up %2 on your computer. Ten program zada Ci garść pytań i ustawi %2 na Twoim komputerze. - + For best results, please ensure that this computer: Dla osiągnięcia najlepszych rezultatów upewnij się, że ten komputer: - + System requirements Wymagania systemowe @@ -402,35 +395,35 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Formularz - + After: Po: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Ręczne partycjonowanie</strong><br/>Możesz samodzielnie utworzyć lub zmienić rozmiar istniejących partycji. - + Boot loader location: Położenie programu rozruchowego: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 zostanie zmniejszony do %2MB a nowa partycja %3MB zostanie utworzona dla %4. - + Select storage de&vice: &Wybierz urządzenie przechowywania: - - - - + + + + Current: Bieżący: @@ -440,71 +433,71 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Użyj ponownie %1 jako partycji domowej dla %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Wybierz partycję do zmniejszenia, a następnie przeciągnij dolny pasek, aby zmienić jej rozmiar</strong> - + <strong>Select a partition to install on</strong> <strong>Wybierz partycję, na której przeprowadzona będzie instalacja</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Nigdzie w tym systemie nie można odnaleźć partycji systemowej EFI. Prosimy się cofnąć i użyć ręcznego partycjonowania dysku do ustawienia %1. - + The EFI system partition at %1 will be used for starting %2. Partycja systemowa EFI na %1 będzie użyta do uruchamiania %2. - + EFI system partition: Partycja systemowa EFI: - + 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. To urządzenie pamięci masowej prawdopodobnie nie posiada żadnego systemu operacyjnego. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Wyczyść dysk</strong><br/>Ta operacja <font color="red">usunie</font> wszystkie dane obecnie znajdujące się na wybranym urządzeniu przechowywania. - + 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. To urządzenie pamięci masowej posiada %1. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Zainstaluj obok siebie</strong><br/>Instalator zmniejszy partycję, aby zrobić miejsce dla %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Zastąp partycję</strong><br/>Zastępowanie partycji poprzez %1. - + This storage device already has 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. To urządzenie pamięci masowej posiada już system operacyjny. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu. - + This storage device has multiple operating systems 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. To urządzenie pamięci masowej posiada kilka systemów operacyjnych. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu. @@ -530,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. @@ -557,6 +550,11 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Create a Partition Utwórz partycję + + + MiB + MB + Partition &Type: @@ -593,32 +591,27 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Ro&zmiar: - - MB - MB - - - + En&crypt Zaszy%fruj - + Logical Logiczna - + Primary Podstawowa - + GPT GPT - + Mountpoint already in use. Please select another one. Punkt montowania jest już używany. Proszę wybrać inny. @@ -831,7 +824,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. DeviceInfoWidget - + 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. Typ <strong>tabeli partycji</strong> na zaznaczonym nośniku danych.<br><br>Jedyną metodą na zmianę tabeli partycji jest jej wyczyszczenie i utworzenie jej od nowa, co spowoduje utratę wszystkich danych.<br>Ten instalator zachowa obecną tabelę partycji, jeżeli nie wybierzesz innej opcji.<br>W wypadku niepewności, w nowszych systemach zalecany jest GPT. @@ -933,17 +926,22 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Ro&zmiar: - + + MiB + MB + + + Fi&le System: System p&lików: - + Flags: Flagi: - + Mountpoint already in use. Please select another one. Punkt montowania jest już używany. Proszę wybrać inny. @@ -971,7 +969,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Potwierdź hasło - + Please enter the same passphrase in both boxes. Użyj tego samego hasła w obu polach. @@ -989,27 +987,27 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Zainstaluj %1 na <strong>nowej</strong> partycji systemowej %2. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Ustaw <strong>nową</strong> partycję %2 z punktem montowania <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Zainstaluj %2 na partycji systemowej %3 <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Ustaw partycję %3 <strong>%1</strong> z punktem montowania <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Zainstaluj program rozruchowy na <strong>%1</strong>. - + Setting up mount points. Ustawianie punktów montowania. @@ -1027,18 +1025,33 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.&Uruchom ponownie teraz - + <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>Wszystko gotowe.</h1><br/>%1 został zainstalowany na Twoim komputerze.<br/>Możesz teraz ponownie uruchomić komputer, aby przejść do nowego systemu, albo kontynuować używanie środowiska live %2. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>Instalacja nie powiodła się</h1><br/>Nie udało się zainstalować %1 na Twoim komputerze.<br/>Komunikat o błędzie: %2. + FinishedViewStep - + Finish Koniec + + + Installation Complete + Instalacja zakończona + + + + The installation of %1 is complete. + Instalacja %1 ukończyła się pomyślnie. + FormatPartitionJob @@ -1116,12 +1129,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. KeyboardPage - + Set keyboard model to %1.<br/> Ustaw model klawiatury na %1.<br/> - + Set keyboard layout to %1/%2. Ustaw model klawiatury na %1/%2. @@ -1137,15 +1150,25 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. LCLocaleDialog - + System locale setting Systemowe ustawienia lokalne - + 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>. Systemowe ustawienia lokalne wpływają na ustawienia języka i znaków w niektórych elementach wiersza poleceń interfejsu użytkownika.<br/>Bieżące ustawienie to <strong>%1</strong>. + + + &Cancel + &Anuluj + + + + &OK + &OK + LicensePage @@ -1228,12 +1251,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. LocalePage - + The system language will be set to %1. Język systemu zostanie ustawiony na %1. - + The numbers and dates locale will be set to %1. Format liczb i daty zostanie ustawiony na %1. @@ -1254,12 +1277,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.&Zmień... - + Set timezone to %1/%2.<br/> Ustaw strefę czasową na %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. NetInstallPage - + Name Nazwa - + Description Opis - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalacja sieciowa. (Wyłączona: Nie można pobrać listy pakietów, sprawdź swoje połączenie z siecią) @@ -1389,7 +1412,6 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Jakiego imienia chcesz używać do logowania się? - @@ -1563,7 +1585,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Zainsta&luj program rozruchowy na: - + Are you sure you want to create a new partition table on %1? Czy na pewno chcesz utworzyć nową tablicę partycji na %1? @@ -1586,82 +1608,82 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Zainstaluj %1 <strong>obok</strong> innego systemu operacyjnego. - + <strong>Erase</strong> disk and install %1. <strong>Wyczyść</strong> dysk i zainstaluj %1. - + <strong>Replace</strong> a partition with %1. <strong>Zastąp</strong> partycję poprzez %1. - + <strong>Manual</strong> partitioning. <strong>Ręczne</strong> partycjonowanie. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Zainstaluj %1 <strong>obok</strong> innego systemu operacyjnego na dysku <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Wyczyść</strong> dysk <strong>%2</strong> (%3) i zainstaluj %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Zastąp</strong> partycję na dysku <strong>%2</strong> (%3) poprzez %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Ręczne</strong> partycjonowanie na dysku <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Dysk <strong>%1</strong> (%2) - + Current: Bieżący: - + After: Po: - + No EFI system partition configured Nie skonfigurowano partycji systemowej EFI - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. Partycja systemu EFI jest zalecana aby rozpocząć %1.<br/><br/>Aby ją skonfigurować, wróć i wybierz lub utwórz partycję z systemem plików FAT32 i flagą <strong>esp</strong> o punkcie montowania <strong>%2</strong>.<br/><br/>Możesz kontynuować bez ustawiania partycji systemu EFI, ale twój system może nie uruchomić się. - + EFI system partition flag not set Flaga partycji systemowej EFI nie została ustawiona - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. Partycja systemu EFI jest konieczna, aby rozpocząć %1.<br/><br/>Partycja została skonfigurowana w punkcie montowania <strong>%2</strong>, ale nie została ustawiona flaga <strong>esp</strong>. Aby ustawić tę flagę, wróć i zmodyfikuj tę partycję.<br/><br/>Możesz kontynuować bez ustawienia tej flagi, ale Twój system może się nie uruchomić. - + Boot partition not encrypted Niezaszyfrowana partycja rozruchowa - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Oddzielna partycja rozruchowa została skonfigurowana razem z zaszyfrowaną partycją roota, ale partycja rozruchowa nie jest szyfrowana.<br/><br/>Nie jest to najbezpieczniejsze rozwiązanie, ponieważ ważne pliki systemowe znajdują się na niezaszyfrowanej partycji.<br/>Możesz kontynuować, ale odblokowywanie systemu nastąpi później, w trakcie uruchamiania.<br/>Aby zaszyfrować partycję rozruchową, wróć i utwórz ją ponownie zaznaczając opcję <strong>Szyfruj</strong> w oknie tworzenia partycji. @@ -1680,22 +1702,22 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Domyślnie - + unknown nieznany - + extended rozszerzona - + unformatted niesformatowany - + swap przestrzeń wymiany @@ -1718,64 +1740,64 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Wskaż gdzie zainstalować %1.<br/><font color="red">Uwaga: </font>na wybranej partycji zostaną usunięte wszystkie pliki. - + The selected item does not appear to be a valid partition. Wybrany element zdaje się nie być poprawną partycją. - + %1 cannot be installed on empty space. Please select an existing partition. Nie można zainstalować %1 na pustej przestrzeni. Prosimy wybrać istniejącą partycję. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. Nie można zainstalować %1 na rozszerzonej partycji. Prosimy wybrać istniejącą partycję podstawową lub logiczną. - + %1 cannot be installed on this partition. %1 nie może zostać zainstalowany na tej partycji. - + Data partition (%1) Partycja z danymi (%1) - + Unknown system partition (%1) Nieznana partycja systemowa (%1) - + %1 system partition (%2) %1 partycja systemowa (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>Partycja %1 jest zbyt mała dla %2. Prosimy wybrać partycję o pojemności przynajmniej %3 GB. - + <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/>Nigdzie w tym systemie nie można odnaleźć partycji systemowej EFI. Prosimy się cofnąć i użyć ręcznego partycjonowania dysku do ustawienia %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 zostanie zainstalowany na %2.<br/><font color="red">Uwaga: </font>wszystkie dane znajdujące się na partycji %2 zostaną utracone. - + The EFI system partition at %1 will be used for starting %2. Partycja systemowa EFI na %1 będzie użyta do uruchamiania %2. - + EFI system partition: Partycja systemowa EFI: @@ -1783,55 +1805,60 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. RequirementsChecker - + Gathering system information... Zbieranie informacji o systemie... - + has at least %1 GB available drive space ma przynajmniej %1 GB dostępnego miejsca na dysku - + There is not enough drive space. At least %1 GB is required. Nie ma wystarczającej ilości miejsca na dysku. Wymagane jest przynajmniej %1 GB. - + has at least %1 GB working memory ma przynajmniej %1 GB pamięci roboczej - + The system does not have enough working memory. At least %1 GB is required. System nie posiada wystarczającej ilości pamięci roboczej. Wymagane jest przynajmniej %1 GB. - + is plugged in to a power source jest podłączony do źródła zasilania - + The system is not plugged in to a power source. System nie jest podłączony do źródła zasilania. - + is connected to the Internet jest podłączony do Internetu - + The system is not connected to the Internet. System nie jest podłączony do Internetu. - + The installer is not running with administrator rights. Instalator jest uruchomiony bez praw administratora. + + + The screen is too small to display the installer. + Zbyt niska rozdzielczość ekranu, aby wyświetlić instalator. + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. SetPasswordJob - + Set password for user %1 Ustaw hasło dla użytkownika %1 - + Setting password for user %1. Ustawianie hasła użytkownika %1. - + Bad destination system path. Błędna ścieżka docelowa systemu. - + rootMountPoint is %1 Punkt montowania / to %1 - + Cannot disable root account. Nie można wyłączyć konta administratora. - + passwd terminated with error code %1. Zakończono passwd z kodem błędu %1. - + Cannot set password for user %1. Nie można ustawić hasła dla użytkownika %1. - + usermod terminated with error code %1. Polecenie usermod przerwane z kodem błędu %1. @@ -2236,22 +2263,27 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.&Informacje - + <h1>Welcome to the %1 installer.</h1> <h1>Witamy w instalatorze %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Witamy w instalatorze Calamares dla systemu %1.</h1> + + + About %1 installer O instalatorze %1 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>dla %3</strong><br/><br/>Prawa autorskie 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Podziękowania dla: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg i <a href="https://www.transifex.com/calamares/calamares/">zespołu tłumaczy Calamares</a>.<br/><br/>Rozwój <a href="http://calamares.io/">Calamares</a> jest sponsorowany przez <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + <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/>dla %3</strong><br/><br/>Prawa autorskie 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Prawa autorskie 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Podziękowania dla: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg i <a href="https://www.transifex.com/calamares/calamares/">zespołu tłumaczy Calamares</a>.<br/><br/><a href="http://calamares.io/">Projekt Calamares</a> jest sponsorowany przez <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + %1 support Wsparcie %1 diff --git a/lang/calamares_pl_PL.ts b/lang/calamares_pl_PL.ts index bb51bf34f..462dd1f70 100644 --- a/lang/calamares_pl_PL.ts +++ b/lang/calamares_pl_PL.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Wybierz partycję do zmniejszenia: - - - - Allocate drive space by dragging the divider below: - Przydziel przestrzeń na dysku poprzez przeciągnięcie suwaka poniżej: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - Partycja systemowa EFI: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -221,32 +188,32 @@ Wyjście: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path Niepoprawna ścieżka folderu roboczego - + Working directory %1 for python job %2 is not readable. Folder roboczy %1 zadania pythona %2 jest nieosiągalny. - + Bad main script file Niepoprawny główny plik skryptu - + Main script file %1 for python job %2 is not readable. Główny plik skryptu %1 zadania pythona %2 jest nieczytelny. - + Boost.Python error in job "%1". Błąd Boost.Python w zadaniu "%1". @@ -254,65 +221,91 @@ Wyjście: Calamares::ViewManager - + &Back &Wstecz - + &Next &Dalej - - + + &Cancel &Anuluj - + + + Cancel installation without changing the system. + + + + Cancel installation? Przerwać instalację? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Czy naprawdę chcesz przerwać instalację? Instalator zakończy działanie i wszystkie zmiany zostaną utracone. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? Kontynuować instalację? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now &Zainstaluj - + Go &back &Wstecz - - &Quit - W&yjdź + + &Done + - + + The installation is complete. Close the installer. + + + + Error Błąd - + Installation Failed Wystąpił błąd instalacji @@ -343,12 +336,12 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. CalamaresWindow - + %1 Installer Instalator %1 - + Show debug information Pokaż informację debugowania @@ -369,7 +362,7 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -379,17 +372,17 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements Wymagania systemowe @@ -402,35 +395,35 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -440,71 +433,71 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -530,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. @@ -557,6 +550,11 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone.Create a Partition Utwórz partycję + + + MiB + + Partition &Type: @@ -593,32 +591,27 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone.Ro&zmiar: - - MB - MB - - - + En&crypt - + Logical Logiczna - + Primary Podstawowa - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -831,7 +824,7 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. DeviceInfoWidget - + 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. @@ -933,17 +926,22 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -971,7 +969,7 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. - + Please enter the same passphrase in both boxes. @@ -989,27 +987,27 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1027,18 +1025,33 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. - + <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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1116,12 +1129,12 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. KeyboardPage - + Set keyboard model to %1.<br/> Model klawiatury %1.<br/> - + Set keyboard layout to %1/%2. Model klawiatury %1/%2. @@ -1137,15 +1150,25 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1254,12 +1277,12 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. - + Set timezone to %1/%2.<br/> Strefa czasowa %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1330,17 +1353,17 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1389,7 +1412,6 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone.Jakiego imienia chcesz używać do logowania się? - @@ -1563,7 +1585,7 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. - + Are you sure you want to create a new partition table on %1? Na pewno utworzyć nową tablicę partycji na %1? @@ -1586,82 +1608,82 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1680,22 +1702,22 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone.Domyślnie - + unknown - + extended - + unformatted - + swap @@ -1718,64 +1740,64 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1783,55 +1805,60 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. SetPasswordJob - + Set password for user %1 Ustaw hasło użytkownika %1 - + Setting password for user %1. - + Bad destination system path. Błędna ścieżka docelowa. - + rootMountPoint is %1 Punkt montowania / to %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. Nie można ustawić hasła dla użytkownika %1. - + usermod terminated with error code %1. usermod przerwany z kodem błędu %1. @@ -2236,22 +2263,27 @@ Instalator zakończy działanie i wszystkie zmiany zostaną utracone. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index 5dd4250f2..bebf1c8b7 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Escolha a partição a ser encolhida: - - - - Allocate drive space by dragging the divider below: - Aloque espaço no disco deslizando o divisor abaixo: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Com esta operação, a partição <strong>%1</strong> que contém %4 será reduzida para %2MB e uma nova partição de %3MB será criada para %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Não foi possível encontrar uma partição EFI no sistema. Por favor, volte e use o particionamento manual para configurar %1. - - - - The EFI system partition at %1 will be used for starting %2. - A partição do sistema EFI em %1 será utilizada para iniciar %2. - - - - EFI system partition: - Partição de sistema EFI: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. O <strong>ambiente de inicialização</strong> deste sistema.<br><br>Sistemas x86 antigos têm suporte apenas ao <strong>BIOS</strong>.<br>Sistemas modernos normalmente usam <strong>EFI</strong>, mas também podem mostrar o BIOS se forem iniciados no modo de compatibilidade. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Este sistema foi iniciado com um ambiente de inicialização <strong>EFI</strong>.<br><br>Para configurar o início a partir de um ambiente EFI, este instalador deverá instalar um gerenciador de inicialização, como o <strong>GRUB</strong> ou <strong>systemd-boot</strong> em uma <strong>Partição de Sistema EFI</strong>. Este processo é automático, a não ser que escolha o particionamento manual, que no caso permite-lhe escolher ou criá-lo manualmente. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Este sistema foi iniciado utilizando o <strong>BIOS</strong> como ambiente de inicialização.<br><br>Para configurar a inicialização em um ambiente BIOS, este instalador deve instalar um gerenciador de boot, como o <strong>GRUB</strong>, no começo de uma partição ou no <strong>Master Boot Record</strong>, perto do começo da tabela de partições (recomendado). Este processo é automático, a não ser que você escolha o particionamento manual, onde você deverá configurá-lo manualmente. @@ -221,32 +188,32 @@ Saída: Calamares::PythonJob - + Running %1 operation. Executando operação %1. - + Bad working directory path Caminho de diretório de trabalho ruim - + Working directory %1 for python job %2 is not readable. Diretório de trabalho %1 para a tarefa do python %2 não é legível. - + Bad main script file Arquivo de script principal ruim - + Main script file %1 for python job %2 is not readable. Arquivo de script principal %1 para a tarefa do python %2 não é legível. - + Boost.Python error in job "%1". Boost.Python erro na tarefa "%1". @@ -254,65 +221,91 @@ Saída: Calamares::ViewManager - + &Back &Voltar - + &Next &Próximo - - + + &Cancel &Cancelar - + + + Cancel installation without changing the system. + Cancelar instalação sem modificar o sistema. + + + Cancel installation? Cancelar a instalação? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Você deseja realmente cancelar a instalação atual? O instalador será fechado e todas as alterações serão perdidas. - + + &Yes + &Sim + + + + &No + &Não + + + + &Close + &Fechar + + + Continue with setup? Continuar com configuração? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> O instalador %1 está prestes a fazer alterações no disco a fim de instalar %2.<br/><strong>Você não será capaz de desfazer estas mudanças.</strong> - + &Install now &Instalar agora - + Go &back Voltar - - &Quit - &Sair + + &Done + Completo - + + The installation is complete. Close the installer. + A instalação está completa. Feche o instalador. + + + Error Erro - + Installation Failed Falha na Instalação @@ -343,12 +336,12 @@ O instalador será fechado e todas as alterações serão perdidas. CalamaresWindow - + %1 Installer Instalador %1 - + Show debug information Exibir informações de depuração @@ -369,29 +362,29 @@ O instalador será fechado e todas as alterações serão perdidas. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - Este computador não satisfaz os requisitos mínimos para a instalação de %1. + Este computador não satisfaz os requisitos mínimos para instalar %1. A instalação não pode continuar.<a href="#details">Detalhes...</a> This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - Este computador não satisfaz alguns dos requisitos recomendados para a instalação de %1. + Este computador não satisfaz alguns dos requisitos recomendados para instalar %1. A instalação pode continuar, mas alguns recursos podem ser desativados. - + This program will ask you some questions and set up %2 on your computer. Este programa irá fazer-lhe algumas perguntas e configurar %2 no computador. - + For best results, please ensure that this computer: Para melhores resultados, por favor, certifique-se de que este computador: - + System requirements Requisitos do sistema @@ -404,35 +397,35 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.Formulário - + After: Depois: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Particionamento manual</strong><br/>Você pode criar ou redimensionar partições. - + Boot loader location: Local do gerenciador de inicialização: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 será reduzida para %2MB e uma nova partição de %3MB será criada para %4. - + Select storage de&vice: Selecione o dispositi&vo de armazenamento: - - - - + + + + Current: Atual: @@ -442,71 +435,71 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.Reutilizar %1 como partição home para %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Selecione uma partição para reduzir, então arraste a barra de baixo para redimensionar</strong> - + <strong>Select a partition to install on</strong> <strong>Selecione uma partição para instalação</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Uma partição de sistema EFI não pôde ser encontrada neste dispositivo. Por favor, volte e use o particionamento manual para gerenciar %1. - + The EFI system partition at %1 will be used for starting %2. A partição de sistema EFI em %1 será utilizada para iniciar %2. - + EFI system partition: Partição de sistema EFI: - + 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. Parece que não há um sistema operacional neste dispositivo. O que gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Apagar disco</strong><br/>Isto <font color="red">excluirá</font> todos os dados no dispositivo de armazenamento selecionado. - + 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. Este dispositivo de armazenamento possui %1 nele. O que gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instalar lado a lado</strong><br/>O instalador irá reduzir uma partição para liberar espaço para %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Substituir uma partição</strong><br/>Substitui uma partição com %1. - + This storage device already has 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. Já há um sistema operacional neste dispositivo de armazenamento. O que gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento. - + This storage device has multiple operating systems 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. Há diversos sistemas operacionais neste dispositivo de armazenamento. O que gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento. @@ -532,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. @@ -559,6 +552,11 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.Create a Partition Criar uma partição + + + MiB + MiB + Partition &Type: @@ -595,32 +593,27 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.Tamanho: - - MB - MB - - - + En&crypt &Criptografar - + Logical Lógica - + Primary Primária - + GPT GPT - + Mountpoint already in use. Please select another one. Ponto de montagem já em uso. Por favor, selecione outro. @@ -683,7 +676,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados. What kind of partition table do you want to create? - Você deseja criar que tipo de tabela de partições? + Que tipo de tabela de partições você deseja criar? @@ -833,9 +826,9 @@ A instalação pode continuar, mas alguns recursos podem ser desativados. DeviceInfoWidget - + 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. - O tipo de <strong>tabela de partições</strong> no dispositivo de armazenamento selecionado.<br><br>O único modo de alterar o tipo de tabela de partições é apagar e recriar a mesma do começo, processo o qual exclui todos os dados do dispositivo.<br>Este instalador manterá a atual tabela de partições, a não ser que você escolha o contrário.<br>Em caso de dúvidas, em sistemas modernos o GPT é recomendado. + O tipo de <strong>tabela de partições</strong> no dispositivo de armazenamento selecionado.<br><br>O único modo de alterar o tipo de tabela de partições é apagar e recriar a mesma do começo, processo o qual exclui todos os dados do dispositivo.<br>Este instalador manterá a tabela de partições atual, a não ser que você escolha o contrário.<br>Em caso de dúvidas, em sistemas modernos o GPT é recomendado. @@ -845,7 +838,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados. 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. - Este é um dispositivo de <strong>loop</strong>.<br><br>Este é um pseudo-dispositivo sem tabela de partições que faz um arquivo acessível como um dispositivo de bloco. Este tipo de configuração apenas contém um único sistema de arquivos. + Este é um dispositivo de <strong>loop</strong>.<br><br>Este é um pseudo-dispositivo sem tabela de partições que faz um arquivo acessível como um dispositivo de bloco. Este tipo de configuração normalmente contém apenas um único sistema de arquivos. @@ -935,17 +928,22 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.Tamanho: - + + MiB + MiB + + + Fi&le System: Sistema de Arquivos: - + Flags: Marcadores: - + Mountpoint already in use. Please select another one. Ponto de montagem já em uso. Por favor, selecione outro. @@ -973,7 +971,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.Confirme a frase-chave - + Please enter the same passphrase in both boxes. Por favor, insira a mesma frase-chave nos dois campos. @@ -991,27 +989,27 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.Instalar %1 em <strong>nova</strong> partição %2 do sistema. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Configurar <strong>nova</strong> partição %2 com ponto de montagem <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Instalar %2 em partição %3 do sistema <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Configurar partição %3 <strong>%1</strong> com ponto de montagem <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Instalar gerenciador de inicialização em <strong>%1</strong>. - + Setting up mount points. Configurando pontos de montagem. @@ -1029,18 +1027,33 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.&Reiniciar agora - + <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>Tudo pronto.</h1><br/>%1 foi instalado no seu computador.<br/>Agora você pode reiniciar seu novo sistema ou continuar usando o ambiente Live %2. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>A instalação falhou</h1><br/>%1 não foi instalado em seu computador.<br/>A mensagem de erro foi: %2. + FinishedViewStep - + Finish Concluir + + + Installation Complete + Instalação Completa + + + + The installation of %1 is complete. + A instalação do %1 está completa. + FormatPartitionJob @@ -1118,12 +1131,12 @@ A instalação pode continuar, mas alguns recursos podem ser desativados. KeyboardPage - + Set keyboard model to %1.<br/> Definir o modelo de teclado para %1.<br/> - + Set keyboard layout to %1/%2. Definir o layout do teclado para %1/%2. @@ -1139,15 +1152,25 @@ A instalação pode continuar, mas alguns recursos podem ser desativados. LCLocaleDialog - + System locale setting Definição de localidade do sistema - + 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>. A configuração de localidade do sistema afeta a linguagem e o conjunto de caracteres para algumas linhas de comando e elementos da interface do usuário.<br/>A configuração atual é <strong>%1</strong>. + + + &Cancel + &Cancelar + + + + &OK + &OK + LicensePage @@ -1230,12 +1253,12 @@ A instalação pode continuar, mas alguns recursos podem ser desativados. LocalePage - + The system language will be set to %1. O idioma do sistema será definido como %1. - + The numbers and dates locale will be set to %1. O local dos números e datas será definido como %1. @@ -1256,12 +1279,12 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.&Mudar... - + Set timezone to %1/%2.<br/> Definir o fuso horário para %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1332,17 +1355,17 @@ A instalação pode continuar, mas alguns recursos podem ser desativados. NetInstallPage - + Name Nome - + Description Descrição - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalação pela Rede. (Desabilitada: Não foi possível adquirir lista de pacotes, verifique sua conexão com a internet) @@ -1391,7 +1414,6 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.Qual nome você quer usar para entrar? - @@ -1565,7 +1587,7 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.Insta&lar o gerenciador de inicialização em: - + Are you sure you want to create a new partition table on %1? Você tem certeza de que deseja criar uma nova tabela de partições em %1? @@ -1588,82 +1610,82 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.Instalar %1 <strong>ao lado de</strong> outro sistema operacional. - + <strong>Erase</strong> disk and install %1. <strong>Apagar</strong> disco e instalar %1. - + <strong>Replace</strong> a partition with %1. <strong>Substituir</strong> uma partição com %1. - + <strong>Manual</strong> partitioning. Particionamento <strong>manual</strong>. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Instalar %1 <strong>ao lado de</strong> outro sistema operacional no disco <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Apagar</strong> disco <strong>%2</strong> (%3) e instalar %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Substituir</strong> uma partição no disco <strong>%2</strong> (%3) com %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). Particionamento <strong>manual</strong> no disco <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disco <strong>%1</strong> (%2) - + Current: Atualmente: - + After: Depois: - + No EFI system partition configured Nenhuma partição de sistema EFI configurada - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. Uma partição de sistema EFI é necessária para iniciar %1.<br/><br/>Para configurar uma partição de sistema EFI, volte, selecione ou crie um sistema de arquivos FAT32 com o marcador <strong>esp</strong> ativado e ponto de montagem <strong>%2</strong>.<br/><br/>Você pode continuar sem definir uma partição de sistema EFI, mas seu sistema pode não iniciar. - + EFI system partition flag not set Marcador da partição do sistema EFI não definida - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. Uma partição de sistema EFI é necessária para iniciar %1.<br/><br/>Uma partição foi configurada com o ponto de montagem <strong>%2</strong>, mas seu marcador <strong>esp</strong> não foi definido.<br/>Para definir o marcador, volte e edite a partição.<br/><br/>Você pode continuar sem definir um marcador, mas seu sistema pode não iniciar. - + Boot partition not encrypted Partição de boot não criptografada - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Uma partição de inicialização separada foi configurada juntamente com uma partição raiz criptografada, mas a partição de inicialização não é criptografada.<br/><br/>Há preocupações de segurança com este tipo de configuração, porque arquivos de sistema importantes são mantidos em uma partição não criptografada.<br/>Você pode continuar se quiser, mas o desbloqueio do sistema de arquivos acontecerá mais tarde durante a inicialização do sistema.<br/>Para criptografar a partição de inicialização, volte e recrie-a, selecionando <strong>Criptografar</strong> na janela de criação da partição. @@ -1682,22 +1704,22 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.Padrão - + unknown desconhecido - + extended estendida - + unformatted não formatado - + swap swap @@ -1720,64 +1742,64 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.Selecione onde instalar %1.<br/><font color="red">Atenção:</font> isto excluirá todos os arquivos existentes na partição selecionada. - + The selected item does not appear to be a valid partition. O item selecionado não parece ser uma partição válida. - + %1 cannot be installed on empty space. Please select an existing partition. %1 não pode ser instalado no espaço vazio. Por favor, selecione uma partição existente. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 não pode ser instalado em uma partição estendida. Por favor, selecione uma partição primária ou lógica existente. - + %1 cannot be installed on this partition. %1 não pode ser instalado nesta partição. - + Data partition (%1) Partição de dados (%1) - + Unknown system partition (%1) Partição de sistema desconhecida (%1) - + %1 system partition (%2) Partição de sistema %1 (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>A partição %1 é muito pequena para %2. Por favor, selecione uma partição com capacidade mínima de %3 GiB. - + <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/>Não foi encontrada uma partição de sistema EFI no sistema. Por favor, volte e use o particionamento manual para configurar %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 será instalado em %2.<br/><font color="red">Atenção: </font>todos os dados da partição %2 serão perdidos. - + The EFI system partition at %1 will be used for starting %2. A partição do sistema EFI em %1 será utilizada para iniciar %2. - + EFI system partition: Partição do sistema EFI: @@ -1785,55 +1807,60 @@ A instalação pode continuar, mas alguns recursos podem ser desativados. RequirementsChecker - + Gathering system information... Coletando informações do sistema... - + has at least %1 GB available drive space tenha pelo menos %1 GB de espaço disponível no dispositivo - + There is not enough drive space. At least %1 GB is required. Não há espaço suficiente no armazenamento. Pelo menos %1 GB é necessário. - + has at least %1 GB working memory tenha pelo menos %1 GB de memória - + The system does not have enough working memory. At least %1 GB is required. O sistema não tem memória de trabalho suficiente. Pelo menos %1 GB é necessário. - + is plugged in to a power source está conectado a uma fonte de energia - + The system is not plugged in to a power source. O sistema não está conectado a uma fonte de energia. - + is connected to the Internet está conectado à Internet - + The system is not connected to the Internet. O sistema não está conectado à Internet. - + The installer is not running with administrator rights. O instalador não está sendo executado com permissões de administrador. + + + The screen is too small to display the installer. + A tela é muito pequena para exibir o instalador. + ResizeFileSystemJob @@ -2069,42 +2096,42 @@ A instalação pode continuar, mas alguns recursos podem ser desativados. SetPasswordJob - + Set password for user %1 Definir senha para usuário %1 - + Setting password for user %1. Definindo senha para usuário %1 - + Bad destination system path. O caminho para o sistema está mal direcionado. - + rootMountPoint is %1 rootMountPoint é %1 - + Cannot disable root account. Não é possível desativar a conta root. - + passwd terminated with error code %1. passwd terminado com código de erro %1. - + Cannot set password for user %1. Não foi possível definir senha para o usuário %1. - + usermod terminated with error code %1. usermod terminou com código de erro %1. @@ -2238,22 +2265,27 @@ A instalação pode continuar, mas alguns recursos podem ser desativados.S&obre - + <h1>Welcome to the %1 installer.</h1> <h1>Bem-vindo ao instalador %1 .</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Bem-vindo ao instalador da Calamares para %1.</h1> + + + About %1 installer Sobre o instalador %1 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>para %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Agradecimentos: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg e a <a href="https://www.transifex.com/calamares/calamares/">equipe de tradutores do Calamares</a>.<br/><br/>O desenvolvimento do <a href="http://calamares.io/">Calamares</a> tem o apoio da <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + <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/>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/>Agradecimentos: 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/">Time de tradutores do Calamares</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> o desenvolvimento é patrocinado por <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + %1 support %1 suporte diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index cde467ebc..6068a7ab0 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Escolha a partição a encolher: - - - - Allocate drive space by dragging the divider below: - Alocar espaço em disco arrastando o divisor abaixo: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Com esta operação, a partição <strong>%1</strong> que contém %4 será reduzida para %2MB e uma nova partição %3MB será criada para %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Uma partição de sistema EFI não foi encontrada em parte alguma neste sistema. Por favor volte atrás e use o particionamento manual para configurar %1. - - - - The EFI system partition at %1 will be used for starting %2. - A partição de sistema EFI em %1 será usada para iniciar %2. - - - - EFI system partition: - Partição de sistema EFI: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. O <strong>ambiente de arranque</strong> deste sistema.<br><br>Sistemas x86 mais antigos apenas suportam <strong>BIOS</strong>.<br>Sistemas modernos normalmente usam <strong>EFI</strong>, mas também podem aparecer como BIOS se iniciados em modo de compatibilidade. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Este sistema foi iniciado com ambiente de arranque<strong>EFI</strong>.<br><br>Para configurar o arranque de um ambiente EFI, o instalador tem de implantar uma aplicação de carregar de arranque, tipo <strong>GRUB</strong> ou <strong>systemd-boot</strong> ou uma <strong>Partição de Sistema EFI</strong>. Isto é automático, a menos que escolha particionamento manual, e nesse caso tem de escolhê-la ou criar uma por si próprio. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Este sistema foi iniciado com um ambiente de arranque <strong>BIOS</strong>.<br><br>Para configurar um arranque de um ambiente BIOS, este instalador tem de instalar um carregador de arranque, tipo <strong>GRUB</strong>, quer no início da partição ou no <strong>Master Boot Record</strong> perto do início da tabela de partições (preferido). Isto é automático, a não ser que escolha particionamento manual, e nesse caso tem de o configurar por si próprio @@ -221,32 +188,32 @@ Saída: Calamares::PythonJob - + Running %1 operation. Operação %1 em execução. - + Bad working directory path Caminho do directório de trabalho errado - + Working directory %1 for python job %2 is not readable. Directório de trabalho %1 para a tarefa python %2 não é legível. - + Bad main script file Ficheiro de script principal errado - + Main script file %1 for python job %2 is not readable. Ficheiro de script principal %1 para a tarefa python %2 não é legível. - + Boost.Python error in job "%1". Erro Boost.Python na tarefa "%1". @@ -254,65 +221,91 @@ Saída: Calamares::ViewManager - + &Back &Voltar - + &Next &Próximo - - + + &Cancel &Cancelar - + + + Cancel installation without changing the system. + Cancelar instalar instalação sem modificar o sistema. + + + Cancel installation? Cancelar a instalação? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Tem a certeza que pretende cancelar o atual processo de instalação? O instalador será encerrado e todas as alterações serão perdidas. - + + &Yes + &Sim + + + + &No + &Não + + + + &Close + &Fechar + + + Continue with setup? Continuar com a configuração? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> O %1 instalador está prestes a fazer alterações ao seu disco em ordem para instalar %2.<br/><strong>Não será capaz de desfazer estas alterações.</strong> - + &Install now &Instalar agora - + Go &back Voltar &atrás - - &Quit - &Sair + + &Done + &Feito - + + The installation is complete. Close the installer. + A instalação está completa. Feche o instalador. + + + Error Erro - + Installation Failed Falha na Instalação @@ -343,12 +336,12 @@ O instalador será encerrado e todas as alterações serão perdidas. CalamaresWindow - + %1 Installer %1 Instalador - + Show debug information Mostrar informação de depuração @@ -369,7 +362,7 @@ O instalador será encerrado e todas as alterações serão perdidas. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Este computador não satisfaz os requisitos mínimos para instalar %1.<br/>A instalação não pode continuar. <a href="#details">Detalhes...</a> @@ -379,17 +372,17 @@ O instalador será encerrado e todas as alterações serão perdidas.Este computador não satisfaz alguns dos requisitos recomendados para instalar %1.<br/>A instalação pode continuar, mas algumas funcionalidades poderão ser desativadas. - + This program will ask you some questions and set up %2 on your computer. Este programa vai fazer-lhe algumas perguntas e configurar o %2 no seu computador. - + For best results, please ensure that this computer: Para melhores resultados, por favor certifique-se que este computador: - + System requirements Requisitos de sistema @@ -402,35 +395,35 @@ O instalador será encerrado e todas as alterações serão perdidas.Formulário - + After: Depois: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Particionamento manual</strong><br/>Pode criar ou redimensionar partições manualmente. - + Boot loader location: Localização do carregador de arranque: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 será encolhida para %2MB e uma nova %3MB partição será criada para %4. - + Select storage de&vice: Selecione o dis&positivo de armazenamento: - - - - + + + + Current: Atual: @@ -440,71 +433,71 @@ O instalador será encerrado e todas as alterações serão perdidas.Reutilizar %1 como partição home para %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Selecione uma partição para encolher, depois arraste a barra de fundo para redimensionar</strong> - + <strong>Select a partition to install on</strong> <strong>Selecione uma partição para instalar</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Nenhuma partição de sistema EFI foi encontrada neste sistema. Por favor volte atrás e use o particionamento manual para configurar %1. - + The EFI system partition at %1 will be used for starting %2. A partição de sistema EFI em %1 será usada para iniciar %2. - + EFI system partition: Partição de sistema EFI: - + 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. Este dispositivo de armazenamento aparenta não ter um sistema operativo. O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Apagar disco</strong><br/>Isto irá <font color="red">apagar</font> todos os dados atualmente apresentados no dispositivo de armazenamento selecionado. - + 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. Este dispositivo de armazenamento tem %1 nele. O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instalar paralelamente</strong><br/>O instalador irá encolher a partição para arranjar espaço para %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Substituir a partição</strong><br/>Substitui a partição com %1. - + This storage device already has 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. Este dispositivo de armazenamento já tem um sistema operativo nele. O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento. - + This storage device has multiple operating systems 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. Este dispositivo de armazenamento tem múltiplos sistemas operativos nele, O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento. @@ -530,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. @@ -557,6 +550,11 @@ O instalador será encerrado e todas as alterações serão perdidas.Create a Partition Criar uma Partição + + + MiB + MiB + Partition &Type: @@ -593,32 +591,27 @@ O instalador será encerrado e todas as alterações serão perdidas.Ta&manho: - - MB - MB - - - + En&crypt En&criptar - + Logical Lógica - + Primary Primária - + GPT GPT - + Mountpoint already in use. Please select another one. Ponto de montagem já em uso. Por favor selecione outro. @@ -831,7 +824,7 @@ O instalador será encerrado e todas as alterações serão perdidas. DeviceInfoWidget - + 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. O tipo da <strong>tabela de partições</strong> no dispositivo de armazenamento selecionado.<br><br>A única maneira de mudar o tipo da tabela de partições é apagá-la e recriar a tabela de partições do nada, o que destrói todos os dados no dispositivo de armazenamento.<br>Este instalador manterá a tabela de partições atual a não ser que escolha explicitamente em contrário.<br>Se não tem a certeza, nos sistemas modernos é preferido o GPT. @@ -933,17 +926,22 @@ O instalador será encerrado e todas as alterações serão perdidas.Ta&manho: - + + MiB + MiB + + + Fi&le System: Si&stema de Ficheiros: - + Flags: Flags: - + Mountpoint already in use. Please select another one. Ponto de montagem já em uso. Por favor selecione outro. @@ -971,7 +969,7 @@ O instalador será encerrado e todas as alterações serão perdidas.Confirmar frase-chave - + Please enter the same passphrase in both boxes. Por favor insira a mesma frase-passe em ambas as caixas. @@ -989,27 +987,27 @@ O instalador será encerrado e todas as alterações serão perdidas.Instalar %1 na <strong>nova</strong> %2 partição de sistema. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Criar <strong>nova</strong> %2 partição com ponto de montagem <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Instalar %2 em %3 partição de sistema <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Criar %3 partitição <strong>%1</strong> com ponto de montagem <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Instalar carregador de arranque em <strong>%1</strong>. - + Setting up mount points. Definindo pontos de montagem. @@ -1027,18 +1025,33 @@ O instalador será encerrado e todas as alterações serão perdidas.&Reiniciar agora - + <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>Tudo feito</h1><br/>%1 foi instalado no seu computador.<br/>Pode agora reiniciar para o seu novo sistema, ou continuar a usar o %2 ambiente Live. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>Instalação Falhada</h1><br/>%1 não foi instalado no seu computador.<br/>A mensagem de erro foi: %2. + FinishedViewStep - + Finish Finalizar + + + Installation Complete + Instalação Completa + + + + The installation of %1 is complete. + A instalação de %1 está completa. + FormatPartitionJob @@ -1116,12 +1129,12 @@ O instalador será encerrado e todas as alterações serão perdidas. KeyboardPage - + Set keyboard model to %1.<br/> Definir o modelo do teclado para %1.<br/> - + Set keyboard layout to %1/%2. Definir esquema do teclado para %1/%2. @@ -1137,15 +1150,25 @@ O instalador será encerrado e todas as alterações serão perdidas. LCLocaleDialog - + System locale setting Definição de localização do Sistema - + 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>. A definição local do sistema afeta o idioma e conjunto de carateres para alguns elementos do interface da linha de comandos.<br/>A definição atual é <strong>%1</strong>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ O instalador será encerrado e todas as alterações serão perdidas. LocalePage - + The system language will be set to %1. A linguagem do sistema será definida para %1. - + The numbers and dates locale will be set to %1. Os números e datas locais serão definidos para %1. @@ -1254,12 +1277,12 @@ O instalador será encerrado e todas as alterações serão perdidas.&Alterar... - + Set timezone to %1/%2.<br/> Definir fuso horário para %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ O instalador será encerrado e todas as alterações serão perdidas. NetInstallPage - + Name Nome - + Description Descrição - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalaçao de Rede. (Desativada: Incapaz de buscar listas de pacotes, verifique a sua ligação de rede) @@ -1389,7 +1412,6 @@ O instalador será encerrado e todas as alterações serão perdidas.Que nome deseja usar para iniciar a sessão? - @@ -1563,7 +1585,7 @@ O instalador será encerrado e todas as alterações serão perdidas.Instalar &carregador de arranque em: - + Are you sure you want to create a new partition table on %1? Tem certeza de que deseja criar uma nova tabela de partições em %1? @@ -1586,82 +1608,82 @@ O instalador será encerrado e todas as alterações serão perdidas.Instalar %1 <strong>paralelamente</strong> a outro sistema operativo. - + <strong>Erase</strong> disk and install %1. <strong>Apagar</strong> disco e instalar %1. - + <strong>Replace</strong> a partition with %1. <strong>Substituir</strong> a partição com %1. - + <strong>Manual</strong> partitioning. Particionamento <strong>Manual</strong>. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Instalar %1 <strong>paralelamente</strong> a outro sistema operativo no disco <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Apagar</strong> disco <strong>%2</strong> (%3) e instalar %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Substituir</strong> a partição no disco <strong>%2</strong> (%3) com %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). Particionamento <strong>Manual</strong> no disco <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disco <strong>%1</strong> (%2) - + Current: Atual: - + After: Depois: - + No EFI system partition configured Nenhuma partição de sistema EFI configurada - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. É necessária uma partição de sistema EFI para iniciar %1.<br/><br/>Para configurar uma partição de sistema EFI, volte atrás e selecione ou crie um sistema de ficheiros FAT32 com a flag <strong>esp</strong> ativada e ponto de montagem <strong>%2</strong>.<br/><br/>Pode continuar sem configurar uma partição de sistema EFI mas o seu sistema pode falhar o arranque. - + EFI system partition flag not set flag não definida da partição de sistema EFI - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. É necessária uma partição de sistema EFI para iniciar %1.<br/><br/>A partitição foi configurada com o ponto de montagem <strong>%2</strong> mas a sua flag <strong>esp</strong> não está definida.<br/>Para definir a flag, volte atrás e edite a partição.<br/><br/>Pode continuar sem definir a flag mas o seu sistema pode falhar o arranque. - + Boot partition not encrypted Partição de arranque não encriptada - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Foi preparada uma partição de arranque separada juntamente com uma partição root encriptada, mas a partição de arranque não está encriptada.<br/><br/>Existem preocupações de segurança com este tipo de configuração, por causa de importantes ficheiros de sistema serem guardados numa partição não encriptada.<br/>Se desejar pode continuar, mas o destrancar do sistema de ficheiros irá ocorrer mais tarde durante o arranque do sistema.<br/>Para encriptar a partição de arranque, volte atrás e recrie-a, e selecione <strong>Encriptar</strong> na janela de criação de partições. @@ -1680,22 +1702,22 @@ O instalador será encerrado e todas as alterações serão perdidas.Padrão - + unknown desconhecido - + extended estendido - + unformatted não formatado - + swap swap @@ -1718,64 +1740,64 @@ O instalador será encerrado e todas as alterações serão perdidas.Selecione onde instalar %1.<br/><font color="red">Aviso: </font>isto irá apagar todos os ficheiros na partição selecionada. - + The selected item does not appear to be a valid partition. O item selecionado não aparenta ser uma partição válida. - + %1 cannot be installed on empty space. Please select an existing partition. %1 não pode ser instalado no espaço vazio. Por favor selecione uma partição existente. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 não pode ser instalado numa partição estendida. Por favor selecione uma partição primária ou partição lógica. - + %1 cannot be installed on this partition. %1 não pode ser instalado nesta partição. - + Data partition (%1) Partição de dados (%1) - + Unknown system partition (%1) Partição de sistema desconhecida (%1) - + %1 system partition (%2) %1 partição de sistema (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>A partição %1 é demasiado pequena para %2. Por favor selecione uma partição com pelo menos %3 GiB de capacidade. - + <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/>Uma partição de sistema EFI não pode ser encontrada em nenhum sítio neste sistema. Por favor volte atrás e use o particionamento manual para instalar %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 será instalado na %2.<br/><font color="red">Aviso: </font>todos os dados na partição %2 serão perdidos. - + The EFI system partition at %1 will be used for starting %2. A partição de sistema EFI em %1 será usada para iniciar %2. - + EFI system partition: Partição de sistema EFI: @@ -1783,55 +1805,60 @@ O instalador será encerrado e todas as alterações serão perdidas. RequirementsChecker - + Gathering system information... A recolher informação de sistema... - + has at least %1 GB available drive space tem pelo menos %1 GB de espaço livre em disco - + There is not enough drive space. At least %1 GB is required. Não existe espaço livre suficiente em disco. É necessário pelo menos %1 GB. - + has at least %1 GB working memory tem pelo menos %1 GB de memória disponível - + The system does not have enough working memory. At least %1 GB is required. O sistema não tem memória disponível suficiente. É necessário pelo menos %1 GB. - + is plugged in to a power source está ligado a uma fonte de energia - + The system is not plugged in to a power source. O sistema não está ligado a uma fonte de energia. - + is connected to the Internet está ligado à internet - + The system is not connected to the Internet. O sistema não está ligado à internet. - + The installer is not running with administrator rights. O instalador não está a correr com permissões de administrador. + + + The screen is too small to display the installer. + O ecrã tem um tamanho demasiado pequeno para mostrar o instalador. + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ O instalador será encerrado e todas as alterações serão perdidas. SetPasswordJob - + Set password for user %1 Definir palavra-passe para o utilizador %1 - + Setting password for user %1. A definir palavra-passe para o utilizador %1. - + Bad destination system path. Mau destino do caminho do sistema. - + rootMountPoint is %1 rootMountPoint é %1 - + Cannot disable root account. Não é possível desativar a conta root. - + passwd terminated with error code %1. passwd terminado com código de erro %1. - + Cannot set password for user %1. Não é possível definir a palavra-passe para o utilizador %1. - + usermod terminated with error code %1. usermod terminou com código de erro %1. @@ -2236,22 +2263,27 @@ O instalador será encerrado e todas as alterações serão perdidas.&Sobre - + <h1>Welcome to the %1 installer.</h1> <h1>Bem vindo ao instalador do %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Bem vindo ao instalador Calamares para %1.</h1> + + + About %1 installer Sobre %1 instalador - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>para %3</strong><br/><br/>Direitos de cópia 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Agradecimentos a: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg e à <a href="https://www.transifex.com/calamares/calamares/">equipa de tradutores Calamares</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> desenvolvimento patrocinado por <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + <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/>for %3</strong><br/><br/>Direitos de Cópia 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Direitos de Cópia 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Agradecimentos a: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg e para <a href="https://www.transifex.com/calamares/calamares/">a equipa de tradutores do Calamares</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> desenvolvimento apoiado por <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + %1 support %1 suporte diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts index edfd937bb..9bcbe3aba 100644 --- a/lang/calamares_ro.ts +++ b/lang/calamares_ro.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Alegeți partiția de micșorat: - - - - Allocate drive space by dragging the divider below: - Alocați spațiu pe disc trăgând despărțitorul: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Cu această operație, partiția <strong>%1</strong>, cu mărimea de %4, va fi redusă la %2MB și se va crea o nouă partiție de %3MB pentru %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - O partiție de sistem EFI nu se găsește nicăieri pe acest sistem. Vă rugăm să reveniți și să utilizați partiționarea manuală pentru a seta %1. - - - - The EFI system partition at %1 will be used for starting %2. - Partiția de sistem EFI de pe %1 va fi folosită pentru a începe %2. - - - - EFI system partition: - Partiție de sistem EFI - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. <strong>Mediul de boot</strong> al acestui sistem.<br><br>Sisteme x86 mai vechi suportă numai <strong>BIOS</strong>.<br>Sisteme moderne folosesc de obicei <strong>EFI</strong>, dar ar putea fi afișate ca BIOS dacă au fost configurate în modul de compatibilitate. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Acest sistem a fost pornit într-un mediu de boot <strong>EFI</strong>.<br><br>Pentru a configura pornirea dintr-un mediu EFI, acest program de instalare trebuie să creeze o aplicație pentru boot-are, cum ar fi <strong>GRUB</strong> sau <strong>systemd-boot</strong> pe o <strong>partiție de sistem EFI</strong>. Acest pas este automat, cu excepția cazului în care alegeți partiționarea manuală. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Sistemul a fost pornit într-un mediu de boot <strong>BIOS</strong>.<br><br>Pentru a configura pornirea de la un mediu BIOS, programul de instalare trebuie să instaleze un mediu de boot, cum ar fi <strong>GRUB</strong> fie la începutul unei partiții sau pe <strong>Master Boot Record</strong> în partea de început a unei tabele de partiții (preferabil). Acesta este un pas automat, cu excepția cazului în care alegeți partiționarea manuală. @@ -221,32 +188,32 @@ Rezultat: Calamares::PythonJob - + Running %1 operation. Se rulează operațiunea %1. - + Bad working directory path Calea dosarului de lucru este proastă - + Working directory %1 for python job %2 is not readable. Dosarul de lucru %1 pentru sarcina python %2 nu este citibil. - + Bad main script file Fișierul script principal este prost - + Main script file %1 for python job %2 is not readable. Fișierul script peincipal %1 pentru sarcina Python %2 nu este citibil. - + Boost.Python error in job "%1". Eroare Boost.Python în sarcina „%1”. @@ -254,65 +221,91 @@ Rezultat: Calamares::ViewManager - + &Back &Înapoi - + &Next &Următorul - - + + &Cancel &Anulează - + + + Cancel installation without changing the system. + + + + Cancel installation? Anulez instalarea? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Doriți să anulați procesul curent de instalare? Programul de instalare va ieși, iar toate modificările vor fi pierdute. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? Continuați configurarea? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Programul de instalare %1 este pregătit să facă schimbări pe discul dumneavoastră pentru a instala %2.<br/><strong>Nu veți putea anula aceste schimbări.</strong> - + &Install now &Instalează acum - + Go &back Î&napoi - - &Quit - &Ieșire + + &Done + - + + The installation is complete. Close the installer. + + + + Error Eroare - + Installation Failed Instalare eșuată @@ -343,12 +336,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. CalamaresWindow - + %1 Installer Program de instalare %1 - + Show debug information Arată informația de depanare @@ -369,7 +362,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Acest calculator nu satisface cerințele minimale pentru instalarea %1.<br/>Instalarea nu poate continua. <a href="#details">Detalii...</a> @@ -379,17 +372,17 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Acest calculator nu satisface unele din cerințele recomandate pentru instalarea %1.<br/>Instalarea poate continua, dar unele funcții ar putea fi dezactivate. - + This program will ask you some questions and set up %2 on your computer. Acest program vă va pune mai multe întrebări și va seta %2 pe calculatorul dumneavoastră. - + For best results, please ensure that this computer: Pentru rezultate optime, asigurați-vă că acest calculator: - + System requirements Cerințe de sistem @@ -402,35 +395,35 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Formular - + After: După: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Partiționare manuală</strong><br/>Puteți crea sau redimensiona partițiile. - + Boot loader location: Locație boot loader: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 va fi micșorată la %2MB și o nouă partiție %3MB va fi creată pentru %4. - + Select storage de&vice: Selectează dispoziti&vul de stocare: - - - - + + + + Current: Actual: @@ -440,71 +433,71 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Reutilizează %1 ca partiție home pentru %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Selectează o partiție de micșorat, apoi trageți bara din jos pentru a redimensiona</strong> - + <strong>Select a partition to install on</strong> <strong>Selectează o partiție pe care să se instaleze</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. O partiție de sistem EFI nu poate fi găsită nicăieri în acest sistem. Vă rugăm să reveniți și să partiționați manual pentru a seta %1. - + The EFI system partition at %1 will be used for starting %2. Partiția de sistem EFI de la %1 va fi folosită pentru a porni %2. - + EFI system partition: Partiție de sistem EFI: - + 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. Acest dispozitiv de stocare nu pare să aibă un sistem de operare instalat. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte să fie realizate schimbări pe dispozitivul de stocare. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Șterge discul</strong><br/>Aceasta va <font color="red">șterge</font> toate datele prezente pe dispozitivul de stocare selectat. - + 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. Acest dispozitiv de stocare are %1. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte să fie realizate schimbări pe dispozitivul de stocare. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Instalează laolaltă</strong><br/>Instalatorul va micșora o partiție pentru a face loc pentru %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Înlocuiește o partiție</strong><br/>Înlocuiește o partiție cu %1. - + This storage device already has 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. Acest dispozitiv de stocare are deja un sistem de operare instalat. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte de se realiza schimbări pe dispozitivul de stocare. - + This storage device has multiple operating systems 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. Acest dispozitiv de stocare are mai multe sisteme de operare instalate. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte de a se realiza schimbări pe dispozitivul de stocare. @@ -530,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. @@ -557,6 +550,11 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Create a Partition Creează o partiție + + + MiB + + Partition &Type: @@ -593,32 +591,27 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Mă&rime: - - MB - MB - - - + En&crypt &Criptează - + Logical Logică - + Primary Primară - + GPT GPT - + Mountpoint already in use. Please select another one. Punct de montare existent. Vă rugăm alegeţi altul. @@ -831,7 +824,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. DeviceInfoWidget - + 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. Tipul de <strong>tabelă de partiții</strong> de pe dispozitivul de stocare selectat.<br><br>Singura metodă de a schimba tipul de tabelă de partiții este ștergerea și recrearea acesteia de la zero, ceea de distruge toate datele de pe dispozitivul de stocare.<br>Acest program de instalare va păstra tabela de partiții actuală cu excepția cazului în care alegeți altfel.<br>Dacă nu sunteți sigur, GPT este preferabil pentru sistemele moderne. @@ -933,17 +926,22 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Mă&rime - + + MiB + + + + Fi&le System: Sis&tem de fișiere: - + Flags: Flags: - + Mountpoint already in use. Please select another one. Punct de montare existent. Vă rugăm alegeţi altul. @@ -971,7 +969,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Confirmă fraza secretă - + Please enter the same passphrase in both boxes. Introduceți aceeași frază secretă în ambele căsuțe. @@ -989,27 +987,27 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Instalează %1 pe <strong>noua</strong> partiție de sistem %2. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Setează <strong>noua</strong> partiție %2 cu punctul de montare <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Instalează %2 pe partiția de sistem %3 <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Setează partiția %3 <strong>%1</strong> cu punctul de montare <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Instalează bootloader-ul pe <strong>%1</strong>. - + Setting up mount points. Se setează puncte de montare. @@ -1027,18 +1025,33 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.&Repornește acum - + <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>Gata.</h1><br/>%1 a fost instalat pe calculatorul dumneavoastră.<br/>Puteți reporni noul sistem, sau puteți continua să folosiți sistemul de operare portabil %2. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish Termină + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1116,12 +1129,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. KeyboardPage - + Set keyboard model to %1.<br/> Setează modelul tastaturii la %1.<br/> - + Set keyboard layout to %1/%2. Setează aranjamentul de tastatură la %1/%2. @@ -1137,15 +1150,25 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. LCLocaleDialog - + System locale setting Setările de localizare - + 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>. Setările de localizare ale sistemului afectează limba și setul de caractere folosit pentru unele elemente de interfață la linia de comandă.<br/>Setările actuale sunt <strong>%1</strong>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. LocalePage - + The system language will be set to %1. Limba sistemului va fi %1. - + The numbers and dates locale will be set to %1. Formatul numerelor și datelor calendaristice va fi %1. @@ -1254,12 +1277,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.S&chimbă - + Set timezone to %1/%2.<br/> Setează fusul orar la %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. NetInstallPage - + Name Nume - + Description Despre - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalarea rețelei. (Dezactivat: Nu se pot obține listele de pachete, verificați conexiunea la rețea) @@ -1389,7 +1412,6 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Ce nume doriți să utilizați pentru logare? - @@ -1563,7 +1585,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Instalează boot&loaderul pe: - + Are you sure you want to create a new partition table on %1? Sigur doriți să creați o nouă tabelă de partiție pe %1? @@ -1586,82 +1608,82 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Instalează %1 <strong>laolaltă</strong> cu un alt sistem de operare. - + <strong>Erase</strong> disk and install %1. <strong>Șterge</strong> discul și instalează %1. - + <strong>Replace</strong> a partition with %1. <strong>Înlocuiește</strong> o partiție cu %1. - + <strong>Manual</strong> partitioning. Partiționare <strong>manuală</strong>. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Instalează %1 <strong>laolaltă</strong> cu un alt sistem de operare pe discul <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Șterge</strong> discul <strong>%2</strong> (%3) și instalează %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Înlocuiește</strong> o partiție pe discul <strong>%2</strong> (%3) cu %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). Partiționare <strong>manuală</strong> a discului <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Discul <strong>%1</strong> (%2) - + Current: Actual: - + After: După: - + No EFI system partition configured Nicio partiție de sistem EFI nu a fost configurată - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. Este necesară o partiție de sistem EFI pentru a porni %1.<br/><br/>Pentru a configura o partiție de sistem EFI, reveniți și selectați sau creați o partiție FAT32 cu flag-ul <strong>esp</strong> activat și montată la <strong>%2</strong>.<br/><br/>Puteți continua și fără configurarea unei partiții de sistem EFI, dar este posibil ca sistemul să nu pornească. - + EFI system partition flag not set Flag-ul de partiție de sistem pentru EFI nu a fost setat - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. O partiție de sistem EFI este necesară pentru a porni %1.<br/><br/>A fost configurată o partiție cu punct de montare la <strong>%2</strong> dar flag-ul <strong>esp</strong> al acesteia nu a fost setat.<br/>Pentru a seta flag-ul, reveniți și editați partiția.<br/><br/>Puteți continua și fără setarea flag-ului, dar este posibil ca sistemul să nu pornească. - + Boot partition not encrypted Partiția de boot nu este criptată - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. A fost creată o partiție de boot împreună cu o partiție root criptată, dar partiția de boot nu este criptată.<br/><br/>Sunt potențiale probleme de securitate cu un astfel de aranjament deoarece importante fișiere de sistem sunt păstrate pe o partiție necriptată.<br/>Puteți continua dacă doriți, dar descuierea sistemului se va petrece mai târziu în timpul pornirii.<br/>Pentru a cripta partiția de boot, reveniți și recreați-o, alegând opțiunea <strong>Criptează</strong> din fereastra de creare de partiții. @@ -1680,22 +1702,22 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Implicit - + unknown necunoscut - + extended extins - + unformatted neformatat - + swap swap @@ -1718,64 +1740,64 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Selectați locul în care să instalați %1.<br/><font color="red">Atenție: </font>aceasta va șterge toate fișierele de pe partiția selectată. - + The selected item does not appear to be a valid partition. Elementul selectat nu pare a fi o partiție validă. - + %1 cannot be installed on empty space. Please select an existing partition. %1 nu poate fi instalat în spațiul liber. Vă rugăm să alegeți o partiție existentă. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 nu poate fi instalat pe o partiție extinsă. Vă rugăm selectați o partiție primară existentă sau o partiție logică. - + %1 cannot be installed on this partition. %1 nu poate fi instalat pe această partiție. - + Data partition (%1) Partiție de date (%1) - + Unknown system partition (%1) Partiție de sistem necunoscută (%1) - + %1 system partition (%2) %1 partiție de sistem (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>Partiția %1 este prea mică pentru %2. Vă rugăm selectați o partiție cu o capacitate de cel puțin %3 GiB. - + <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/>O partiție de sistem EFI nu a putut fi găsită nicăieri pe sistem. Vă rugăm să reveniți și să utilizați partiționarea manuală pentru a seta %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 va fi instalat pe %2.<br/><font color="red">Atenție: </font>toate datele de pe partiția %2 se vor pierde. - + The EFI system partition at %1 will be used for starting %2. Partiția de sistem EFI de la %1 va fi folosită pentru a porni %2. - + EFI system partition: Partiție de sistem EFI: @@ -1783,55 +1805,60 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. RequirementsChecker - + Gathering system information... Se adună informații despre sistem... - + has at least %1 GB available drive space are cel puțin %1 spațiu disponibil - + There is not enough drive space. At least %1 GB is required. Nu este suficient spațiu disponibil. Sunt necesari cel puțin %1 GB. - + has at least %1 GB working memory are cel puțin %1 GB de memorie utilizabilă - + The system does not have enough working memory. At least %1 GB is required. Sistemul nu are suficientă memorie utilizabilă. Sunt necesari cel puțin %1 GB. - + is plugged in to a power source este alimentat cu curent - + The system is not plugged in to a power source. Sistemul nu este alimentat cu curent. - + is connected to the Internet este conectat la Internet - + The system is not connected to the Internet. Sistemul nu este conectat la Internet. - + The installer is not running with administrator rights. Programul de instalare nu rulează cu privilegii de administrator. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. SetPasswordJob - + Set password for user %1 Setează parola pentru utilizatorul %1 - + Setting password for user %1. Se setează parola pentru utilizatorul %1. - + Bad destination system path. Cale de sistem destinație proastă. - + rootMountPoint is %1 rootMountPoint este %1 - + Cannot disable root account. Nu pot dezactiva contul root - + passwd terminated with error code %1. eroare la setarea parolei cod %1 - + Cannot set password for user %1. Nu se poate seta parola pentru utilizatorul %1. - + usermod terminated with error code %1. usermod s-a terminat cu codul de eroare %1. @@ -2236,22 +2263,27 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.&Despre - + <h1>Welcome to the %1 installer.</h1> <h1>Bine ați venit la programul de instalare pentru %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer Despre programul de instalare %1 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Mulţumiri: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg şi <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> dezvoltarea sponsorizată de <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + <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. + - + %1 support %1 suport diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts index 04e0d3053..4f7ca92f0 100644 --- a/lang/calamares_ru.ts +++ b/lang/calamares_ru.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Выберите раздел для уменьшения: - - - - Allocate drive space by dragging the divider below: - Выделите дисковое пространство, перемещая ползунок: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Это действие уменьшит раздел <strong>%1</strong>, содержащий %4, до %2 MB, и создаст новый раздел %3 MB для %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Не удалось найти системный раздел EFI в этой системе. Пожалуйста, вернитесь назад и выполните ручную разметку для установки %1. - - - - The EFI system partition at %1 will be used for starting %2. - Системный раздел EFI на %1 будет использован для запуска %2. - - - - EFI system partition: - Системный раздел EFI: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. <strong>Среда загрузки</strong> данной системы.<br><br>Старые системы x86 поддерживают только <strong>BIOS</strong>.<br>Современные системы обычно используют <strong>EFI</strong>, но также могут имитировать BIOS, если среда загрузки запущена в режиме совместимости. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Эта система использует среду загрузки <strong>EFI</strong>.<br><br>Чтобы настроить запуск из под среды EFI, установщик использует приложения загрузки, такое как <strong>GRUB</strong> или <strong>systemd-boot</strong> на <strong>системном разделе EFI</strong>. Процесс автоматизирован, но вы можете использовать ручной режим, где вы сами будете должны выбрать или создать его. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Эта система запущена в <strong>BIOS</strong> среде загрузки.<br><br> Чтобы настроить запуск из под среды BIOS, установщик должен установить загручик, такой как <strong>GRUB</strong>, либо в начале раздела, либо в <strong>Master Boot Record</strong>, находящийся в начале таблицы разделов (по умолчанию). Процесс автоматизирован, но вы можете выбрать ручной режим, где будете должны настроить его сами. @@ -221,32 +188,32 @@ Output: Calamares::PythonJob - + Running %1 operation. Выполняется действие %1. - + Bad working directory path Неверный путь к рабочему каталогу - + Working directory %1 for python job %2 is not readable. Рабочий каталог %1 для задачи python %2 недоступен для чтения. - + Bad main script file Ошибочный главный файл сценария - + Main script file %1 for python job %2 is not readable. Главный файл сценария %1 для задачи python %2 недоступен для чтения. - + Boost.Python error in job "%1". Boost.Python ошибка в задаче "%1". @@ -254,64 +221,90 @@ Output: Calamares::ViewManager - + &Back &Назад - + &Next &Далее - - + + &Cancel О&тмена - + + + Cancel installation without changing the system. + + + + Cancel installation? Отменить установку? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Действительно прервать процесс установки? Программа установки сразу прекратит работу, все изменения будут потеряны. - + + &Yes + &Да + + + + &No + &Нет + + + + &Close + &Закрыть + + + Continue with setup? Продолжить установку? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Программа установки %1 готова внести изменения на Ваш диск, чтобы установить %2.<br/><strong>Отменить эти изменения будет невозможно.</strong> - + &Install now Приступить к &установке - + Go &back &Назад - - &Quit - &Выйти + + &Done + - + + The installation is complete. Close the installer. + Установка завершена. Закройте установщик. + + + Error Ошибка - + Installation Failed Установка завершилась неудачей @@ -342,12 +335,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer Программа установки %1 - + Show debug information Показать отладочную информацию @@ -368,7 +361,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Этот компьютер не соответствует минимальным требованиям для установки %1.<br/>Невозможно продолжить установку. <a href="#details">Подробнее...</a> @@ -378,17 +371,17 @@ The installer will quit and all changes will be lost. Этот компьютер соответствует не всем рекомендуемым требованиям для установки %1.<br/>Можно продолжить установку, но некоторые возможности могут быть недоступны. - + This program will ask you some questions and set up %2 on your computer. Эта программа задаст вам несколько вопросов и поможет установить %2 на ваш компьютер. - + For best results, please ensure that this computer: Для наилучших результатов, убедитесь, что этот компьютер: - + System requirements Системные требования @@ -401,35 +394,35 @@ The installer will quit and all changes will be lost. Форма - + After: После: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Ручная разметка</strong><br/>Вы можете самостоятельно создавать разделы или изменять их размеры. - + Boot loader location: Расположение загрузчика: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 будет уменьшен до %2MB и новый раздел %3MB будет создан для %4. - + Select storage de&vice: Выбрать устройство &хранения: - - - - + + + + Current: Текущий: @@ -439,71 +432,71 @@ The installer will quit and all changes will be lost. Использовать %1 как домашний раздел для %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Выберите раздел для уменьшения, затем двигайте ползунок, изменяя размер</strong> - + <strong>Select a partition to install on</strong> <strong>Выберите раздел для установки</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Не найдено системного раздела EFI. Пожалуйста, вернитесь назад и выполните ручную разметку %1. - + The EFI system partition at %1 will be used for starting %2. Системный раздел EFI на %1 будет использован для запуска %2. - + EFI system partition: Системный раздел EFI: - + 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/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Стереть диск</strong><br/>Это <font color="red">удалит</font> все данные, которые сейчас находятся на выбранном устройстве. - + 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/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Установить рядом</strong><br/>Программа установки уменьшит раздел, чтобы освободить место для %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Заменить раздел</strong><br/>Меняет раздел на %1. - + This storage device already has 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/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения. - + This storage device has multiple operating systems 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/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения. @@ -529,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. Освобождены все временные точки монтирования. @@ -556,6 +549,11 @@ The installer will quit and all changes will be lost. Create a Partition Создать раздел + + + MiB + + Partition &Type: @@ -592,34 +590,29 @@ The installer will quit and all changes will be lost. Ра&змер: - - MB - МБ - - - + En&crypt Ши&фровать - + Logical Логический - + Primary Основной - + GPT GPT - + Mountpoint already in use. Please select another one. - + Точка монтирования уже занята. Пожалуйста, выберете другую. @@ -830,7 +823,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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-разметку. @@ -878,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: "/" раздел не зашифрован @@ -891,7 +884,7 @@ The installer will quit and all changes will be lost. Dummy C++ Job - + Dummy C++ Job @@ -932,17 +925,22 @@ The installer will quit and all changes will be lost. Ра&змер: - + + MiB + + + + Fi&le System: &Файловая система: - + Flags: Флаги: - + Mountpoint already in use. Please select another one. @@ -970,7 +968,7 @@ The installer will quit and all changes will be lost. Подтвердите пароль - + Please enter the same passphrase in both boxes. Пожалуйста, введите один и тот же пароль в оба поля. @@ -988,27 +986,27 @@ The installer will quit and all changes will be lost. Установить %1 на <strong>новый</strong> системный раздел %2. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Настроить <strong>новый</strong> %2 раздел с точкой монтирования <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Установить %2 на %3 системный раздел <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Настроить %3 раздел <strong>%1</strong> с точкой монтирования <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Установить загрузчик на <strong>%1</strong>. - + Setting up mount points. Настраиваются точки монтирования. @@ -1026,18 +1024,33 @@ 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/>Вы можете перезагрузить компьютер и использовать Вашу новую систему или продолжить работу в Live окружении %2. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish Завершить + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1115,12 +1128,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> Установить модель клавиатуры на %1.<br/> - + Set keyboard layout to %1/%2. Установить раскладку клавиатуры на %1/%2. @@ -1136,15 +1149,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting Общие региональные настройки - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1227,12 +1250,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. Системным языком будет установлен %1. - + The numbers and dates locale will be set to %1. Региональным форматом чисел и дат будет установлен %1. @@ -1253,12 +1276,12 @@ The installer will quit and all changes will be lost. И&зменить... - + Set timezone to %1/%2.<br/> Установить часовой пояс на %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1329,17 +1352,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Имя - + Description - + Описание - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Установка по сети. (Отключено: не удается получить список пакетов, проверьте сетевое подключение) @@ -1388,7 +1411,6 @@ The installer will quit and all changes will be lost. Какое имя Вы хотите использовать для входа? - @@ -1562,7 +1584,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? @@ -1585,82 +1607,82 @@ The installer will quit and all changes will be lost. Установить %1 <strong>параллельно</strong> к другой операционной системе. - + <strong>Erase</strong> disk and install %1. <strong>Очистить</strong> диск и установить %1. - + <strong>Replace</strong> a partition with %1. <strong>Заменить</strong> раздел на %1. - + <strong>Manual</strong> partitioning. <strong>Ручная</strong> разметка. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Установить %1 <strong>параллельно</strong> к другой операционной системе на диске <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Очистить</strong> диск <strong>%2</strong> (%3) и установить %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Заменить</strong> раздел на диске <strong>%2</strong> (%3) на %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Ручная</strong> разметка диска <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Диск <strong>%1</strong> (%2) - + Current: Текущий: - + After: После: - + No EFI system partition configured Нет настроенного системного раздела EFI - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. Чтобы начать, необходим системный раздел EFI %1.<br/><br/>Для настройки системного раздела EFI, вернитесь, выберите или создайте файловую систему FAT32 с установленным флагом <strong>esp</strong> и точкой монтирования <strong>%2</strong>.<br/><br/>Вы можете продолжить и без настройки системного раздела EFI, но Ваша система может не загрузиться. - + EFI system partition flag not set Не установлен флаг системного раздела EFI - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. Чтобы начать, необходим системный раздел EFI %1.<br/><br/>Был настроен раздел с точкой монтирования <strong>%2</strong>, но его флаг <strong>esp</strong> не установлен.<br/>Для установки флага вернитесь и отредактируйте раздел.<br/><br/>Вы можете продолжить и без установки флага, но Ваша система может не загрузиться. - + Boot partition not encrypted Загрузочный раздел не зашифрован - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Включено шифрование корневого раздела, но использован отдельный загрузочный раздел без шифрования.<br/><br/>При такой конфигурации возникают проблемы с безопасностью, потому что важные системные файлы хранятся на разделе без шифрования.<br/>Если хотите, можете продолжить, но файловая система будет разблокирована позднее во время загрузки системы.<br/>Чтобы включить шифрование загрузочного раздела, вернитесь назад и снова создайте его, отметив <strong>Шифровать</strong> в окне создания раздела. @@ -1679,22 +1701,22 @@ The installer will quit and all changes will be lost. По умолчанию - + unknown неизвестный - + extended расширенный - + unformatted неформатированный - + swap swap @@ -1717,64 +1739,64 @@ The installer will quit and all changes will be lost. Выберите, где установить %1.<br/><font color="red">Внимание: </font>это удалит все файлы на выбранном разделе. - + The selected item does not appear to be a valid partition. Выбранный элемент, видимо, не является действующим разделом. - + %1 cannot be installed on empty space. Please select an existing partition. %1 не может быть установлен вне раздела. Пожалуйста выберите существующий раздел. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 не может быть установлен прямо в расширенный раздел. Выберите существующий основной или логический раздел. - + %1 cannot be installed on this partition. %1 не может быть установлен в этот раздел. - + Data partition (%1) Раздел данных (%1) - + Unknown system partition (%1) Неизвестный системный раздел (%1) - + %1 system partition (%2) %1 системный раздел (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>Раздел %1 слишком мал для %2. Пожалуйста выберите раздел объемом не менее %3 Гиб. - + <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. Вернитесь назад и выполните ручную разметку для установки %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 будет установлен в %2.<br/><font color="red">Внимание: </font>все данные на разделе %2 будут потеряны. - + The EFI system partition at %1 will be used for starting %2. Системный раздел EFI на %1 будет использован для запуска %2. - + EFI system partition: Системный раздел EFI: @@ -1782,55 +1804,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... Сбор информации о системе... - + has at least %1 GB available drive space доступно как минимум %1 ГБ свободного дискового пространства - + There is not enough drive space. At least %1 GB is required. Недостаточно места на дисках. Необходимо как минимум %1 ГБ. - + has at least %1 GB working memory доступно как минимум %1 ГБ оперативной памяти - + The system does not have enough working memory. At least %1 GB is required. Недостаточно оперативной памяти. Необходимо как минимум %1 ГБ. - + is plugged in to a power source подключено сетевое питание - + The system is not plugged in to a power source. Сетевое питание не подключено. - + is connected to the Internet присутствует выход в сеть Интернет - + The system is not connected to the Internet. Отсутствует выход в Интернет. - + The installer is not running with administrator rights. Программа установки не запущена с привилегиями администратора. + + + The screen is too small to display the installer. + Слишком маленький экран для окна установщика. + ResizeFileSystemJob @@ -2066,42 +2093,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 Задать пароль для пользователя %1 - + Setting password for user %1. Устанавливаю пароль для учетной записи %1. - + Bad destination system path. Неверный путь целевой системы. - + rootMountPoint is %1 Точка монтирования корневого раздела %1 - + Cannot disable root account. Невозможно отключить учетную запись root - + passwd terminated with error code %1. - + Cannot set password for user %1. Не удалось задать пароль для пользователя %1. - + usermod terminated with error code %1. Команда usermod завершилась с кодом ошибки %1. @@ -2235,22 +2262,27 @@ The installer will quit and all changes will be lost. &О - + <h1>Welcome to the %1 installer.</h1> <h1>Добро пожаловать в программу установки %1 .</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Добро пожаловать в установщик Calamares для %1 .</h1> + + + About %1 installer О программе установки %1 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support %1 поддержка diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts index 84caeb37d..a515fd14c 100644 --- a/lang/calamares_sk.ts +++ b/lang/calamares_sk.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Zvoľte oddiel na zmenšenie: - - - - Allocate drive space by dragging the divider below: - Miesto na disku vyhradíte posunutím oddeľovača nižšie: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Touto operáciou, sa oddiel <strong>%1</strong>, ktorý obsahuje %4 zmenší na %2MB a vytvorí sa nový %3MB oddiel pre distribúciu %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Oddiel systému EFI sa nedá v tomto počítači nájsť. Prosím, prejdite späť a použite ručné rozdelenie oddielov na inštaláciu distribúcie %1. - - - - The EFI system partition at %1 will be used for starting %2. - Oddiel systému EFI na %1 bude použitý na spustenie distribúcie %2. - - - - EFI system partition: - Oddiel systému EFI: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. <strong>Zavádzacie prostredie</strong> tohto systému.<br><br>Staršie systémy architektúry x86 podporujú iba <strong>BIOS</strong>.<br>Moderné systémy obvykle používajú <strong>EFI</strong>, ale tiež sa môžu zobraziť ako BIOS, ak sú spustené v režime kompatiblitiy. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Tento systém bol spustený so zavádzacím prostredím <strong>EFI</strong>.<br><br>Na konfiguráciu spustenia z prostredia EFI, musí inštalátor umiestniť aplikáciu zavádzača, ako je <strong>GRUB</strong> alebo <strong>systemd-boot</strong> na <strong>oddiel systému EFI</strong>. Toto je vykonané automaticky, pokiaľ nezvolíte ručné rozdelenie oddielov, v tom prípade ho musíte zvoliť alebo vytvoriť ručne. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Tento systém bol spustený so zavádzacím prostredím <strong>BIOS</strong>.<br><br>Na konfiguráciu spustenia z prostredia BIOS, musí inštalátor nainštalovať zavádzač, ako je <strong>GRUB</strong>, buď na začiatok oddielu alebo na <strong>hlavný zavádzací záznam (MBR)</strong> pri začiatku tabuľky oddielov (preferované). Toto je vykonané automaticky, pokiaľ nezvolíte ručné rozdelenie oddielov, v tom prípade ho musíte nainštalovať ručne. @@ -221,32 +188,32 @@ Výstup: Calamares::PythonJob - + Running %1 operation. Spúšťa sa operácia %1. - + Bad working directory path Nesprávna cesta k pracovnému adresáru - + Working directory %1 for python job %2 is not readable. Pracovný adresár %1 pre úlohu jazyka python %2 nie je možné čítať. - + Bad main script file Nesprávny súbor hlavného skriptu - + Main script file %1 for python job %2 is not readable. Súbor hlavného skriptu %1 pre úlohu jazyka python %2 nie je možné čítať. - + Boost.Python error in job "%1". Chyba knižnice Boost.Python v úlohe „%1“. @@ -254,65 +221,91 @@ Výstup: Calamares::ViewManager - + &Back &Späť - + &Next Ď&alej - - + + &Cancel &Zrušiť - + + + Cancel installation without changing the system. + Zruší inštaláciu bez zmeny systému. + + + Cancel installation? Zrušiť inštaláciu? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Skutočne chcete zrušiť aktuálny priebeh inštalácie? Inštalátor sa ukončí a všetky zmeny budú stratené. - + + &Yes + _Áno + + + + &No + _Nie + + + + &Close + _Zavrieť + + + Continue with setup? Pokračovať v inštalácii? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Inštalátor distribúcie %1 sa chystá vykonať zmeny na vašom disku, aby nainštaloval distribúciu %2. <br/><strong>Tieto zmeny nebudete môcť vrátiť späť.</strong> - + &Install now &Inštalovať teraz - + Go &back Prejsť s&päť - - &Quit - &Ukončiť + + &Done + _Dokončiť - + + The installation is complete. Close the installer. + Inštalácia je dokončená. Zatvorí inštalátor. + + + Error Chyba - + Installation Failed Inštalácia zlyhala @@ -343,12 +336,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. CalamaresWindow - + %1 Installer Inštalátor distribúcie %1 - + Show debug information Zobraziť ladiace informácie @@ -369,7 +362,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Tento počítač nespĺňa minimálne požiadavky pre inštaláciu distribúcie %1.<br/>Inštalácia nemôže pokračovať. <a href="#details">Podrobnosti...</a> @@ -379,17 +372,17 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Tento počítač nespĺňa niektoré z odporúčaných požiadaviek pre inštaláciu distribúcie %1.<br/>Inštalácia môže pokračovať, ale niektoré funkcie môžu byť zakázané. - + This program will ask you some questions and set up %2 on your computer. Tento program sa vás spýta na niekoľko otázok a nainštaluje distribúciu %2 do vášho počítača. - + For best results, please ensure that this computer: Pre čo najlepší výsledok, sa prosím, uistite, že tento počítač: - + System requirements Systémové požiadavky @@ -402,35 +395,35 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Forma - + After: Potom: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Ručné rozdelenie oddielov</strong><br/>Môžete vytvoriť alebo zmeniť veľkosť oddielov podľa seba. - + Boot loader location: Umiestnenie zavádzača: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. Oddiel %1 bude zmenšený na %2MB a nový %3MB oddiel bude vytvorený pre distribúciu %4. - + Select storage de&vice: Vyberte úložné &zariadenie: - - - - + + + + Current: Teraz: @@ -440,71 +433,71 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Opakované použitie oddielu %1 ako domovského pre distribúciu %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Vyberte oddiel na zmenšenie a potom potiahnutím spodného pruhu zmeňte veľkosť</strong> - + <strong>Select a partition to install on</strong> <strong>Vyberte oddiel, na ktorý sa má inštalovať</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Oddiel systému EFI sa nedá v tomto počítači nájsť. Prosím, prejdite späť a použite ručné rozdelenie oddielov na inštaláciu distribúcie %1. - + The EFI system partition at %1 will be used for starting %2. Oddie lsystému EFI na %1 bude použitý na spustenie distribúcie %2. - + EFI system partition: Oddiel systému EFI: - + 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. Zdá sa, že toto úložné zariadenie neobsahuje operačný systém. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Vymazanie disku</strong><br/>Týmto sa <font color="red">odstránia</font> všetky údaje momentálne sa nachádzajúce na vybratom úložnom zariadení. - + 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. Toto úložné zariadenie obsahuje operačný systém %1. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Inštalácia popri súčasnom systéme</strong><br/>Inštalátor zmenší oddiel a uvoľní miesto pre distribúciu %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Nahradenie oddielu</strong><br/>Nahradí oddiel distribúciou %1. - + This storage device already has 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. Toto úložné zariadenie už obsahuje operačný systém. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení. - + This storage device has multiple operating systems 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. Toto úložné zariadenie obsahuje viacero operačných systémov. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení. @@ -530,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. @@ -557,6 +550,11 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Create a Partition Vytvorenie oddielu + + + MiB + MiB + Partition &Type: @@ -593,32 +591,27 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Veľ&kosť: - - MB - MB - - - + En&crypt Zaši&frovať - + Logical Logický - + Primary Primárny - + GPT GPT - + Mountpoint already in use. Please select another one. Bod pripojenia sa už používa. Prosím, vyberte iný. @@ -831,7 +824,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. DeviceInfoWidget - + 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. Typ <strong>tabuľky oddielov</strong> na vybratom úložnom zariadení.<br><br>Jediným spôsobom ako zmeniť tabuľku oddielov je vymazanie a znovu vytvorenie tabuľky oddielov od začiatku, čím sa zničia všetky údaje úložnom zariadení.<br>Inštalátor ponechá aktuálnu tabuľku oddielov, pokiaľ sa výlučne nerozhodnete inak.<br>Ak nie ste si istý, na moderných systémoch sa preferuje typ tabuľky oddielov GPT. @@ -933,17 +926,22 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. V&eľkosť: - + + MiB + MiB + + + Fi&le System: S&ystém súborov: - + Flags: Značky: - + Mountpoint already in use. Please select another one. Bod pripojenia sa už používa. Prosím, vyberte iný. @@ -971,7 +969,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Potvrdenie hesla - + Please enter the same passphrase in both boxes. Prosím, zadajte rovnaké heslo do oboch polí. @@ -989,27 +987,27 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Inštalovať distribúciu %1 na <strong>novom</strong> %2 systémovom oddieli. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. Nastaviť <strong>nový</strong> %2 oddiel s bodom pripojenia <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. Inštalovať distribúciu %2 na %3 systémovom oddieli <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. Nastaviť %3 oddiel <strong>%1</strong> s bodom pripojenia <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Inštalovať zavádzač do <strong>%1</strong>. - + Setting up mount points. Nastavujú sa body pripojení. @@ -1027,18 +1025,33 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. &Reštartovať teraz - + <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>Všetko je dokončené.</h1><br/>Distribúcia %1 bola nainštalovaná do vášho počítača.<br/>Teraz môžete reštartovať počítač a spustiť váš nový systém, alebo pokračovať v používaní živého prostredia distribúcie %2. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>Inštalácia zlyhala</h1><br/>Distribúcia %1 nebola nainštalovaná do vášho počítača.<br/>Chybová hláška: %2. + FinishedViewStep - + Finish Dokončenie + + + Installation Complete + Inštalácia dokončená + + + + The installation of %1 is complete. + Inštalácia distribúcie %1s je dokončená. + FormatPartitionJob @@ -1116,12 +1129,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. KeyboardPage - + Set keyboard model to %1.<br/> Nastavenie modelu klávesnice na %1.<br/> - + Set keyboard layout to %1/%2. Nastavenie rozloženia klávesnice na %1/%2. @@ -1137,15 +1150,25 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. LCLocaleDialog - + System locale setting Miestne nastavenie systému - + 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>. Miestne nastavenie systému ovplyvní jazyk a znakovú sadu niektorých prvkov používateľského rozhrania v príkazovom riadku.<br/>Aktuálne nastavenie je <strong>%1</strong>. + + + &Cancel + &Zrušiť + + + + &OK + &OK + LicensePage @@ -1228,12 +1251,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. LocalePage - + The system language will be set to %1. Jazyk systému bude nastavený na %1. - + The numbers and dates locale will be set to %1. Miestne nastavenie čísel a dátumov bude nastavené na %1. @@ -1254,12 +1277,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Z&meniť... - + Set timezone to %1/%2.<br/> Nastavenie časovej zóny na %1/%2.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. NetInstallPage - + Name Názov - + Description Popis - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Sieťová inštalácia. (Zakázaná: Nie je možné získať zoznamy balíkov. Skontrolujte vaše sieťové pripojenie.) @@ -1389,7 +1412,6 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Aké meno chcete použiť na prihlásenie? - @@ -1563,7 +1585,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Nainštalovať &zavádzač na: - + Are you sure you want to create a new partition table on %1? Naozaj chcete vytvoriť novú tabuľku oddielov na zariadení %1? @@ -1586,82 +1608,82 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Inštalácia distribúcie %1 <strong>popri</strong> inom operačnom systéme. - + <strong>Erase</strong> disk and install %1. <strong>Vymazanie</strong> disku a inštalácia distribúcie %1. - + <strong>Replace</strong> a partition with %1. <strong>Nahradenie</strong> oddielu distribúciou %1. - + <strong>Manual</strong> partitioning. <strong>Ručné</strong> rozdelenie oddielov. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Inštalácia distribúcie %1 <strong>popri</strong> inom operačnom systéme na disku <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Vymazanie</strong> disku <strong>%2</strong> (%3) a inštalácia distribúcie %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Nahradenie</strong> oddielu na disku <strong>%2</strong> (%3) distribúciou %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Ručné</strong> rozdelenie oddielov na disku <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disk <strong>%1</strong> (%2) - + Current: Teraz: - + After: Potom: - + No EFI system partition configured Nie je nakonfigurovaný žiadny oddiel systému EFI - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. Oddiel systému EFI je potrebný pre spustenie distribúcie %1.<br/><br/>Na konfiguráciu oddielu systému EFI prejdite späť a vyberte alebo vytvorte systém súborov FAT32 s povolenou značkou <strong>esp</strong> a bod pripojenia <strong>%2</strong>.<br/><br/>Môžete porkačovať bez nastavenia oddielu systému EFI, ale váš systém môže pri spustení zlyhať. - + EFI system partition flag not set Značka oddielu systému EFI nie je nastavená - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. Oddiel systému EFI je potrebný pre spustenie distribúcie %1.<br/><br/>Oddiel bol nakonfigurovaný s bodom pripojenia <strong>%2</strong>, ale nemá nastavenú značku <strong>esp</strong>.<br/>Na nastavenie značky prejdite späť a upravte oddiel.<br/><br/>Môžete porkačovať bez nastavenia značky, ale váš systém môže pri spustení zlyhať. - + Boot partition not encrypted Zavádzací oddiel nie je zašifrovaný - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Spolu so zašifrovaným koreňovým oddielom bol nainštalovaný oddelený zavádzací oddiel, ktorý ale nie je zašifrovaný.<br/><br/>S týmto typom inštalácie je ohrozená bezpečnosť, pretože dôležité systémové súbory sú uchovávané na nezašifrovanom oddieli.<br/>Ak si to želáte, môžete pokračovať, ale neskôr, počas spúšťania systému sa vykoná odomknutie systému súborov.<br/>Na zašifrovanie zavádzacieho oddielu prejdite späť a vytvorte ju znovu vybratím voľby <strong>Zašifrovať</strong> v okne vytvárania oddielu. @@ -1680,22 +1702,22 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Predvolený - + unknown neznámy - + extended rozšírený - + unformatted nenaformátovaný - + swap odkladací @@ -1718,64 +1740,64 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Vyberte, kde sa má nainštalovať distribúcia %1.<br/><font color="red">Upozornenie: </font>týmto sa odstránia všetky súbory na vybratom oddieli. - + The selected item does not appear to be a valid partition. Zdá sa, že vybratá položka nie je platným oddielom. - + %1 cannot be installed on empty space. Please select an existing partition. Distribúcia %1 sa nedá nainštalovať na prázdne miesto. Prosím, vyberte existujúci oddiel. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. Distribúcia %1 sa nedá nainštalovať na rozšírený oddiel. Prosím, vyberte existujúci primárny alebo logický oddiel. - + %1 cannot be installed on this partition. Distribúcia %1 sa nedá nainštalovať na tento oddiel. - + Data partition (%1) Údajový oddiel (%1) - + Unknown system partition (%1) Neznámy systémový oddiel (%1) - + %1 system partition (%2) Systémový oddiel operačného systému %1 (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>Oddiel %1 je príliš malý pre distribúciu %2. Prosím, vyberte oddiel s kapacitou aspoň %3 GiB. - + <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/>Oddiel systému EFI sa nedá v tomto počítači nájsť. Prosím, prejdite späť a použite ručné rozdelenie oddielov na inštaláciu distribúcie %1. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>Distribúcia %1 bude nainštalovaná na oddiel %2.<br/><font color="red">Upozornenie: </font>všetky údaje na oddieli %2 budú stratené. - + The EFI system partition at %1 will be used for starting %2. Oddiel systému EFI na %1 bude použitý pre spustenie distribúcie %2. - + EFI system partition: Oddiel systému EFI: @@ -1783,55 +1805,60 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. RequirementsChecker - + Gathering system information... Zbierajú sa informácie o počítači... - + has at least %1 GB available drive space obsahuje aspoň %1 GB voľného miesta na disku - + There is not enough drive space. At least %1 GB is required. Nie je dostatok miesta na disku. Vyžaduje sa aspoň %1 GB. - + has at least %1 GB working memory obsahuje aspoň %1 GB voľnej operačnej pamäte - + The system does not have enough working memory. At least %1 GB is required. Počítač neobsahuje dostatok operačnej pamäte. Vyžaduje sa aspoň %1 GB. - + is plugged in to a power source je pripojený k zdroju napájania - + The system is not plugged in to a power source. Počítač nie je pripojený k zdroju napájania. - + is connected to the Internet je pripojený k internetu - + The system is not connected to the Internet. Počítač nie je pripojený k internetu. - + The installer is not running with administrator rights. Inštalátor nie je spustený s právami správcu. + + + The screen is too small to display the installer. + Obrazovka je príliš malá na to, aby bolo možné zobraziť inštalátor. + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. SetPasswordJob - + Set password for user %1 Nastavenie hesla pre používateľa %1 - + Setting password for user %1. Nastavuje sa heslo pre používateľa %1. - + Bad destination system path. Nesprávny cieľ systémovej cesty. - + rootMountPoint is %1 rootMountPoint je %1 - + Cannot disable root account. Nedá sa zakázať účet správcu. - + passwd terminated with error code %1. Príkaz passwd ukončený s chybovým kódom %1. - + Cannot set password for user %1. Nedá sa nastaviť heslo pre používateľa %1. - + usermod terminated with error code %1. Príkaz usermod ukončený s chybovým kódom %1. @@ -2236,22 +2263,27 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. &O inštalátore - + <h1>Welcome to the %1 installer.</h1> <h1>Vitajte v inštalátore distribúcie %1.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>Vitajte v aplikácii Calamares, inštalátore distribúcie %1.</h1> + + + About %1 installer O inštalátore %1 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>pre distribúciu %3</strong><br/><br/>Autorské práva 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Poďakovanie: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg a <a href="https://www.transifex.com/calamares/calamares/">tím prekladateľov programu Calamares</a>.<br/><br/>Vývoj programu <a href="http://calamares.io/">Calamares</a> je podporovaný projektom <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Oslobodzujúci softvér. + + <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/>for %3</strong><br/><br/>Autorské práva 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Autorské práva 2017 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Poďakovanie: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg a <a href="https://www.transifex.com/calamares/calamares/">prekladateľký tím inštalátora Calamares</a>.<br/><br/><a href="http://calamares.io/">Calamares</a> je vyvýjaný s podporou projektu <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Oslobodzujúci softvér. - + %1 support Podpora distribúcie %1 diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts index dc40aab3c..9a2165909 100644 --- a/lang/calamares_sl.ts +++ b/lang/calamares_sl.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Izberite razdelek, ki naj bo zmanjšan: - - - - Allocate drive space by dragging the divider below: - Dodelite prostor na disku prek vlečenja razdelilnika spodaj: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - S to operacijo bo razdelek <strong>%1</strong>, ki vsebuje %4 zmanjšan na %2MB, pri čemer bo za %5 ustvarjen nov razdelek velikosti %3MB. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -221,32 +188,32 @@ Izpis: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path Nepravilna pot delovne mape - + Working directory %1 for python job %2 is not readable. Ni mogoče brati delovne mape %1 za pythonovo opravilo %2. - + Bad main script file Nepravilna datoteka glavnega skripta - + Main script file %1 for python job %2 is not readable. Ni mogoče brati datoteke %1 glavnega skripta za pythonovo opravilo %2. - + Boost.Python error in job "%1". Napaka Boost.Python v opravilu "%1". @@ -254,65 +221,91 @@ Izpis: Calamares::ViewManager - + &Back &Nazaj - + &Next &Naprej - - + + &Cancel - + + + Cancel installation without changing the system. + + + + Cancel installation? Preklic namestitve? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Ali res želite preklicati trenutni namestitveni proces? Namestilni program se bo končal in vse spremembe bodo izgubljene. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now - + Go &back - - &Quit - &Izhod + + &Done + - + + The installation is complete. Close the installer. + + + + Error Napaka - + Installation Failed Namestitev je spodletela @@ -343,12 +336,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. CalamaresWindow - + %1 Installer %1 Namestilnik - + Show debug information @@ -369,7 +362,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -379,17 +372,17 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -402,35 +395,35 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -440,71 +433,71 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -530,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. @@ -557,6 +550,11 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. Create a Partition Ustvari razdelek + + + MiB + + Partition &Type: @@ -593,32 +591,27 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. Ve&likost - - MB - MB - - - + En&crypt - + Logical Logičen - + Primary Primaren - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -831,7 +824,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. DeviceInfoWidget - + 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. @@ -933,17 +926,22 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -971,7 +969,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Please enter the same passphrase in both boxes. @@ -989,27 +987,27 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1027,18 +1025,33 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + <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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1116,12 +1129,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. KeyboardPage - + Set keyboard model to %1.<br/> Nastavi model tipkovnice na %1.<br/> - + Set keyboard layout to %1/%2. Nastavi razporeditev tipkovnice na %1/%2. @@ -1137,15 +1150,25 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1254,12 +1277,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Set timezone to %1/%2.<br/> Nastavi časovni pas na %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1330,17 +1353,17 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1389,7 +1412,6 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. Katero ime želite uporabiti za prijavljanje? - @@ -1563,7 +1585,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Are you sure you want to create a new partition table on %1? Ali ste prepričani, da želite ustvariti novo razpredelnico razdelkov na %1? @@ -1586,82 +1608,82 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1680,22 +1702,22 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. Privzeto - + unknown - + extended - + unformatted - + swap @@ -1718,64 +1740,64 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1783,55 +1805,60 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2236,22 +2263,27 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts index 009db289d..b0c88e99b 100644 --- a/lang/calamares_sr.ts +++ b/lang/calamares_sr.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Изаберите партицију за смањивање: - - - - Allocate drive space by dragging the divider below: - Издвојте простор на диску повлачећи граничник испод: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -221,32 +188,32 @@ Output: Calamares::PythonJob - + Running %1 operation. Извршавам %1 операцију. - + Bad working directory path Лоша путања радног директоријума - + Working directory %1 for python job %2 is not readable. Радни директоријум %1 за питонов посао %2 није читљив. - + Bad main script file Лош фајл главне скрипте - + Main script file %1 for python job %2 is not readable. Фајл главне скрипте %1 за питонов посао %2 није читљив. - + Boost.Python error in job "%1". Boost.Python грешка у послу „%1“. @@ -254,65 +221,91 @@ Output: Calamares::ViewManager - + &Back &Назад - + &Next &Следеће - - + + &Cancel &Откажи - + + + Cancel installation without changing the system. + + + + Cancel installation? Отказати инсталацију? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Да ли стварно желите да прекинете текући процес инсталације? Инсталер ће бити затворен и све промене ће бити изгубљене. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? Наставити са подешавањем? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now &Инсталирај сада - + Go &back Иди &назад - - &Quit - &Затвори + + &Done + - + + The installation is complete. Close the installer. + + + + Error Грешка - + Installation Failed Инсталација није успела @@ -343,12 +336,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer %1 инсталер - + Show debug information @@ -369,7 +362,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -379,17 +372,17 @@ The installer will quit and all changes will be lost. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: За најбоље резултате обезбедите да овај рачунар: - + System requirements Системски захтеви @@ -402,35 +395,35 @@ The installer will quit and all changes will be lost. Форма - + After: После: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Ручно партиционисање</strong><br/>Сами можете креирати или мењати партције. - + Boot loader location: Подизни учитавач на: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 биће змањена на %2MB а нова %3MB партиција биће направљена за %4. - + Select storage de&vice: Изаберите у&ређај за смештање: - - - - + + + + Current: Тренутно: @@ -440,71 +433,71 @@ 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>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -530,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. @@ -557,6 +550,11 @@ The installer will quit and all changes will be lost. Create a Partition Направи партицију + + + MiB + + Partition &Type: @@ -593,32 +591,27 @@ The installer will quit and all changes will be lost. Вели&чина - - MB - MB - - - + En&crypt - + Logical Логичка - + Primary Примарна - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -831,7 +824,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -933,17 +926,22 @@ The installer will quit and all changes will be lost. &Величина: - + + MiB + + + + Fi&le System: Фајл &систем: - + Flags: - + Mountpoint already in use. Please select another one. @@ -971,7 +969,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -989,27 +987,27 @@ The installer will quit and all changes will be lost. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1027,18 +1025,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish Заврши + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1116,12 +1129,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1137,15 +1150,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. Системски језик биће постављен на %1 - + The numbers and dates locale will be set to %1. @@ -1254,12 +1277,12 @@ The installer will quit and all changes will be lost. &Измени... - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1330,17 +1353,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name Назив - + Description Опис - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1389,7 +1412,6 @@ The installer will quit and all changes will be lost. - @@ -1563,7 +1585,7 @@ The installer will quit and all changes will be lost. - + Are you sure you want to create a new partition table on %1? @@ -1586,82 +1608,82 @@ The installer will quit and all changes will be lost. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: Тренутно: - + After: После: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1680,22 +1702,22 @@ The installer will quit and all changes will be lost. подразумевано - + unknown непознато - + extended проширена - + unformatted неформатирана - + swap @@ -1718,64 +1740,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1783,55 +1805,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2236,22 +2263,27 @@ The installer will quit and all changes will be lost. &О програму - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer О %1 инсталатеру - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support %1 подршка diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts index ba32943a6..5d39c973e 100644 --- a/lang/calamares_sr@latin.ts +++ b/lang/calamares_sr@latin.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Odaberite particiju koju želite smanjiti: - - - - Allocate drive space by dragging the divider below: - Izdvojite prostor na disku tako što ćete povući graničnik ispod: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -221,32 +188,32 @@ Povratna poruka: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path Neispravna putanja do radne datoteke - + Working directory %1 for python job %2 is not readable. Nemoguće pročitati radnu datoteku %1 za funkciju %2 u Python-u. - + Bad main script file Neispravan glavna datoteka za skriptu - + Main script file %1 for python job %2 is not readable. Glavna datoteka za skriptu %1 za Python funkciju %2 se ne može pročitati. - + Boost.Python error in job "%1". Boost.Python greška u funkciji %1 @@ -254,65 +221,91 @@ Povratna poruka: Calamares::ViewManager - + &Back &Nazad - + &Next &Dalje - - + + &Cancel &Prekini - + + + Cancel installation without changing the system. + + + + Cancel installation? Prekini instalaciju? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Da li stvarno želite prekinuti trenutni proces instalacije? Instaler će se zatvoriti i sve promjene će biti izgubljene. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now - + Go &back - - &Quit - &Zatvori + + &Done + - + + The installation is complete. Close the installer. + + + + Error Greška - + Installation Failed Neuspješna instalacija @@ -343,12 +336,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. CalamaresWindow - + %1 Installer %1 Instaler - + Show debug information @@ -369,7 +362,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -379,17 +372,17 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -402,35 +395,35 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -440,71 +433,71 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -530,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. @@ -557,6 +550,11 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. Create a Partition Kreiraj particiju + + + MiB + + Partition &Type: @@ -593,32 +591,27 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. Veli&čina - - MB - MB - - - + En&crypt - + Logical Logička - + Primary Primarna - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -831,7 +824,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. DeviceInfoWidget - + 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. @@ -933,17 +926,22 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -971,7 +969,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Please enter the same passphrase in both boxes. @@ -989,27 +987,27 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1027,18 +1025,33 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + <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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1116,12 +1129,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1137,15 +1150,25 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1254,12 +1277,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Set timezone to %1/%2.<br/> Postavi vremensku zonu na %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1330,17 +1353,17 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1389,7 +1412,6 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. Koje ime želite koristiti da se prijavite? - @@ -1563,7 +1585,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Are you sure you want to create a new partition table on %1? @@ -1586,82 +1608,82 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1680,22 +1702,22 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + unknown - + extended - + unformatted - + swap @@ -1718,64 +1740,64 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1783,55 +1805,60 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2236,22 +2263,27 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index f843b9ec3..eabe4119b 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -1,53 +1,20 @@ - - AlongsidePage - - - Choose partition to shrink: - Välj partition att förminska: - - - - Allocate drive space by dragging the divider below: - Fördela diskutrymme genom att flytta markören nedanför: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Med denna handling kommer partitionen <strong>%1</strong> som innehåller %4 att förminskas till %2 MB och en ny %3 MB stor partition kommer att skapas för %5. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Ingen EFI-systempartition kunde hittas. Gå tillbaka och partitionera din hårddisk manuellt för %1. - - - - The EFI system partition at %1 will be used for starting %2. - EFI-systempartitionen %1 kommer att användas för att starta %2. - - - - EFI system partition: - EFI-systempartition: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. Systemets <strong>uppstartsmiljö</strong>.<br><br>Äldre x86-system stödjer endast <strong>BIOS</strong>.<br>Moderna system stödjer vanligen <strong>EFI</strong>, men kan också vara i kompabilitetsläge för BIOS. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Detta system startades med en <strong>EFI-miljö</strong>.<br><br>För att ställa in uppstart från en EFI-miljö måste en uppstartsladdare användas, t.ex. <strong>GRUB</strong> eller <strong>systemd-boot</strong> eller en <strong>EFI-systempartition</strong>. Detta sker automatiskt, såvida du inte väljer att partitionera manuellt. Då måste du själv installera en uppstartsladdare. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. - + Detta system startades med en <strong>BIOS-miljö</strong>. <br><br>För att ställa in uppstart från en BIOS-miljö måste en uppstartsladdare som t.ex. <strong>GRUB</strong> installeras, antingen i början av en partition eller på <strong>huvudstartsektorn (MBR)</strong> i början av partitionstabellen. Detta sker automatiskt, såvida du inte väljer manuell partitionering. Då måste du själv installera en uppstartsladdare. @@ -103,18 +70,18 @@ Type: - + Typ: none - + ingen Interface: - + Gränssnitt: @@ -221,32 +188,32 @@ Utdata: Calamares::PythonJob - + Running %1 operation. Kör %1-operation - + Bad working directory path Arbetskatalogens sökväg är ogiltig - + Working directory %1 for python job %2 is not readable. Arbetskatalog %1 för pythonuppgift %2 är inte läsbar. - + Bad main script file Ogiltig huvudskriptfil - + Main script file %1 for python job %2 is not readable. Huvudskriptfil %1 för pythonuppgift %2 är inte läsbar. - + Boost.Python error in job "%1". Boost.Python-fel i uppgift "%'1". @@ -254,65 +221,91 @@ Utdata: Calamares::ViewManager - + &Back &Bakåt - + &Next &Nästa - - + + &Cancel Avbryt - + + + Cancel installation without changing the system. + + + + Cancel installation? Avbryt installation? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Är du säker på att du vill avsluta installationen i förtid? Alla ändringar kommer att gå förlorade. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? Fortsätt med installation? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1-installeraren är på väg att göra ändringar för att installera %2.<br/><strong>Du kommer inte att kunna ångra dessa ändringar!strong> - + &Install now &Installera nu - + Go &back Gå &bakåt - - &Quit - Avsluta + + &Done + - + + The installation is complete. Close the installer. + + + + Error Fel - + Installation Failed Installationen misslyckades @@ -343,12 +336,12 @@ Alla ändringar kommer att gå förlorade. CalamaresWindow - + %1 Installer %1-installationsprogram - + Show debug information Visa avlusningsinformation @@ -369,7 +362,7 @@ Alla ändringar kommer att gå förlorade. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Denna dator uppfyller inte minimikraven för att installera %1.<br/>Installationen kan inte fortsätta. <a href="#details">Detaljer...</a> @@ -379,17 +372,17 @@ Alla ändringar kommer att gå förlorade. Denna dator uppfyller inte alla rekommenderade krav för att installera %1.<br/>Installationen kan fortsätta, men alla alternativ och funktioner kanske inte kan användas. - + This program will ask you some questions and set up %2 on your computer. Detta program kommer att ställa dig några frågor och installera %2 på din dator. - + For best results, please ensure that this computer: För bästa resultat, vänligen se till att datorn: - + System requirements Systemkrav @@ -402,111 +395,111 @@ Alla ändringar kommer att gå förlorade. Formulär - + After: Efter: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Manuell partitionering</strong><br/>Du kan själv skapa och ändra storlek på partitionerna. - + Boot loader location: Sökväg till uppstartshanterare: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 kommer att förminskas till %2 MB och en ny %3 MB-partition kommer att skapas för %4. - + Select storage de&vice: Välj lagringsenhet: - - - - + + + + Current: Nuvarande: Reuse %1 as home partition for %2. - + Återanvänd %1 som hempartition för %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + <strong>Välj en partition att minska, sen dra i nedre fältet för att ändra storlek</strong> - + <strong>Select a partition to install on</strong> - + <strong>Välj en partition att installera på</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + Ingen EFI-partition kunde inte hittas på systemet. Gå tillbaka och partitionera din lagringsenhet manuellt för att ställa in %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI-partitionen %1 kommer att användas för att starta %2. - + EFI system partition: EFI system partition: - + 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. - - - - - - - - <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - - 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. - - - - - - - - <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - - - - - <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + Denna lagringsenhet ser inte ut att ha ett operativsystem installerat. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring görs på lagringseneheten. + + - This storage device already has 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. - + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. + <strong>Rensa lagringsenhet</strong><br/>Detta kommer <font color="red">radera</font> all existerande data på den valda lagringsenheten. - + + 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. + Denna lagringsenhet har %1 på sig. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring görs på lagringsenheten. + + + + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. + <strong>Installera på sidan om</strong><br/>Installationshanteraren kommer krympa en partition för att göra utrymme för %1. + + + + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. + <strong>Ersätt en partition</strong><br/>Ersätter en partition med %1. + + + + This storage device already has 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. + Denna lagringsenhet har redan ett operativsystem på sig. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring sker på lagringsenheten. + + + This storage device has multiple operating systems 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. - + Denna lagringsenhet har flera operativsystem på sig. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring sker på lagringsenheten. @@ -530,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 @@ -557,6 +550,11 @@ Alla ändringar kommer att gå förlorade. Create a Partition Skapa en partition + + + MiB + + Partition &Type: @@ -575,12 +573,12 @@ Alla ändringar kommer att gå förlorade. Fi&le System: - + Fi&lsystem: Flags: - + Flaggor: @@ -593,34 +591,29 @@ Alla ändringar kommer att gå förlorade. Storlek: - - MB - MB - - - + En&crypt - + Kr%yptera - + Logical Logisk - + Primary Primär - + GPT GPT - + Mountpoint already in use. Please select another one. - + Monteringspunkt används redan. Välj en annan. @@ -628,17 +621,17 @@ Alla ändringar kommer att gå förlorade. Create new %2MB partition on %4 (%3) with file system %1. - + Skapa ny %2MB partition på %4 (%3) med filsystem %1. Create new <strong>%2MB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Skapa ny <strong>%2MB</strong> partition på <strong>%4 (%3)</strong> med filsystem <strong>%1</strong>. Creating new %1 partition on %2. - + Skapar ny %1 partition på %2. @@ -699,17 +692,17 @@ Alla ändringar kommer att gå förlorade. Create new %1 partition table on %2. - + Skapa ny %1 partitionstabell på %2. Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3). - + Skapa ny <strong>%1</strong> partitionstabell på <strong>%2</strong> (%3). Creating new %1 partition table on %2. - + Skapar ny %1 partitionstabell på %2. @@ -772,12 +765,12 @@ Alla ändringar kommer att gå förlorade. Cannot add user %1 to groups: %2. - + Kan inte lägga till användare %1 till grupper: %2. usermod terminated with error code %1. - + usermod avslutade med felkod %1. @@ -831,14 +824,14 @@ Alla ändringar kommer att gå förlorade. DeviceInfoWidget - + 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. - + Typen av <strong>partitionstabell</strong> på den valda lagringsenheten.<br><br>Det enda sättet attt ändra typen av partitionstabell är genom att radera och återskapa partitionstabellen från början, vilket förstör all data på lagringsenheten.<br>Installationshanteraren kommer behålla den nuvarande partitionstabellen om du inte väljer något annat.<br>På moderna system är GPT att föredra. This device has a <strong>%1</strong> partition table. - + Denna enhet har en <strong>%1</strong> partitionstabell. @@ -933,17 +926,22 @@ Alla ändringar kommer att gå förlorade. Storlek: - + + MiB + + + + Fi&le System: Fi&lsystem: - + Flags: - + Mountpoint already in use. Please select another one. @@ -971,7 +969,7 @@ Alla ändringar kommer att gå förlorade. Bekräfta lösenord - + Please enter the same passphrase in both boxes. @@ -989,27 +987,27 @@ Alla ändringar kommer att gå förlorade. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. Installera uppstartshanterare på <strong>%1</strong>. - + Setting up mount points. Ställer in monteringspunkter. @@ -1027,18 +1025,33 @@ Alla ändringar kommer att gå förlorade. Sta&rta om nu - + <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>Klappat och klart.</h1><br/>%1 har installerats på din dator.<br/>Du kan nu starta om till ditt nya system, eller fortsätta att använda %2 i liveläge. + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish Slutför + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1116,12 +1129,12 @@ Alla ändringar kommer att gå förlorade. KeyboardPage - + Set keyboard model to %1.<br/> Sätt tangenbordsmodell till %1.<br/> - + Set keyboard layout to %1/%2. Sätt tangentbordslayout till %1/%2. @@ -1137,15 +1150,25 @@ Alla ändringar kommer att gå förlorade. LCLocaleDialog - + System locale setting Systemspråksinställning - + 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>. Systemspråket påverkar vilket språk och teckenuppsättning somliga kommandoradsprogram använder.<br/>Det nuvarande språket är <strong>%1</strong>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ Alla ändringar kommer att gå förlorade. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1254,12 +1277,12 @@ Alla ändringar kommer att gå förlorade. Ändra... - + Set timezone to %1/%2.<br/> Sätt tidszon till %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1330,17 +1353,17 @@ Alla ändringar kommer att gå förlorade. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1389,7 +1412,6 @@ Alla ändringar kommer att gå förlorade. Vilket namn vill du använda för att logga in? - @@ -1563,7 +1585,7 @@ Alla ändringar kommer att gå förlorade. Installera uppstartshanterare på: - + Are you sure you want to create a new partition table on %1? Är du säker på att du vill skapa en ny partitionstabell på %1? @@ -1586,82 +1608,82 @@ Alla ändringar kommer att gå förlorade. Installera %1 <strong>bredvid</strong> ett annat operativsystem. - + <strong>Erase</strong> disk and install %1. <strong>Rensa</strong> disken och installera %1. - + <strong>Replace</strong> a partition with %1. <strong>Ersätt</strong> en partition med %1. - + <strong>Manual</strong> partitioning. <strong>Manuell</strong> partitionering. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Installera %1 <strong>bredvid</strong> ett annat operativsystem på disken <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Rensa</strong> disken <strong>%2</strong> (%3) och installera %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Ersätt</strong> en partition på disken <strong>%2</strong> (%3) med %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Manuell</strong> partitionering på disken <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disk <strong>%1</strong> (%2) - + Current: Nuvarande: - + After: Efter: - + No EFI system partition configured Ingen EFI system partition konfigurerad - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1680,22 +1702,22 @@ Alla ändringar kommer att gå förlorade. Standard - + unknown okänd - + extended utökad - + unformatted oformaterad - + swap @@ -1718,64 +1740,64 @@ Alla ändringar kommer att gå förlorade. Välj var du vill installera %1.<br/><font color="red">Varning: </font>detta kommer att radera alla filer på den valda partitionen. - + The selected item does not appear to be a valid partition. Det valda alternativet verkar inte vara en giltig partition. - + %1 cannot be installed on empty space. Please select an existing partition. %1 kan inte installeras i tomt utrymme. Välj en existerande partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 kan inte installeras på en utökad partition. Välj en existerande primär eller logisk partition. - + %1 cannot be installed on this partition. %1 kan inte installeras på den här partitionen. - + Data partition (%1) Datapartition (%1) - + Unknown system partition (%1) Okänd systempartition (%1) - + %1 system partition (%2) Systempartition för %1 (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>Partitionen %1 är för liten för %2. Välj en partition med minst storleken %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 kommer att installeras på %2.<br/><font color="red">Varning: </font>all data på partition %2 kommer att gå förlorad. - + The EFI system partition at %1 will be used for starting %2. EFI-systempartitionen %1 kommer att användas för att starta %2. - + EFI system partition: EFI-systempartition: @@ -1783,55 +1805,60 @@ Alla ändringar kommer att gå förlorade. RequirementsChecker - + Gathering system information... Samlar systeminformation... - + has at least %1 GB available drive space har minst %1 GB tillgängligt utrymme på hårddisken - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory har minst %1 GB arbetsminne - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source är ansluten till en strömkälla - + The system is not plugged in to a power source. Systemet är inte anslutet till någon strömkälla. - + is connected to the Internet är ansluten till internet - + The system is not connected to the Internet. Systemet är inte anslutet till internet. - + The installer is not running with administrator rights. Installationsprogammet körs inte med administratörsrättigheter. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ Alla ändringar kommer att gå förlorade. SetPasswordJob - + Set password for user %1 Ange lösenord för användare %1 - + Setting password for user %1. Ställer in lösenord för användaren %1. - + Bad destination system path. Ogiltig systemsökväg till målet. - + rootMountPoint is %1 rootMonteringspunkt är %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. Kan inte ställa in lösenord för användare %1. - + usermod terminated with error code %1. usermod avslutade med felkod %1. @@ -2236,22 +2263,27 @@ Alla ändringar kommer att gå förlorade. Om - + <h1>Welcome to the %1 installer.</h1> <h1>V&auml;lkommen till %1-installeraren.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer Om %1-installationsprogrammet - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support %1-support diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts index c41639ff8..5c2f1a55a 100644 --- a/lang/calamares_th.ts +++ b/lang/calamares_th.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - เลือกพาร์ทิชันที่ต้องการย่อขนาด: - - - - Allocate drive space by dragging the divider below: - จองพื้นที่ในไดรฟ์โดยการเลื่อนตัวแบ่งพื้นที่ที่ด้านล่าง: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - ในการปฏิบัติการนี้ พาร์ทิชัน <strong>%1</strong> ซึ่งมี %4 จะถูกทำการ shrunk ไปเป็น %2MB และพาร์ทิชัน %3MB ใหม่จะถูกสร้างขึ้นสำหรับ %5 - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - ไม่พบพาร์ทิชันสำหรับระบบ EFI อยู่ที่ไหนเลยในระบบนี้ กรุณากลับไปเลือกใช้การแบ่งพาร์ทิชันด้วยตนเอง เพื่อติดตั้ง %1 - - - - The EFI system partition at %1 will be used for starting %2. - พาร์ทิชันสำหรับระบบ EFI ที่ %1 จะถูกใช้เพื่อเริ่มต้น %2 - - - - EFI system partition: - พาร์ทิชันสำหรับระบบ EFI: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -221,32 +188,32 @@ Output: Calamares::PythonJob - + Running %1 operation. การปฏิบัติการ %1 กำลังทำงาน - + Bad working directory path เส้นทางไดเรคทอรีที่ใช้ทำงานไม่ถูกต้อง - + Working directory %1 for python job %2 is not readable. ไม่สามารถอ่านไดเรคทอรีที่ใช้ทำงาน %1 สำหรับ python %2 ได้ - + Bad main script file ไฟล์สคริปต์หลักไม่ถูกต้อง - + Main script file %1 for python job %2 is not readable. ไม่สามารถอ่านไฟล์สคริปต์หลัก %1 สำหรับ python %2 ได้ - + Boost.Python error in job "%1". Boost.Python ผิดพลาดที่งาน "%1". @@ -254,65 +221,91 @@ Output: Calamares::ViewManager - + &Back &B ย้อนกลับ - + &Next &N ถัดไป - - + + &Cancel &C ยกเลิก - + + + Cancel installation without changing the system. + + + + Cancel installation? ยกเลิกการติดตั้ง? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. คุณต้องการยกเลิกกระบวนการติดตั้งที่กำลังดำเนินการอยู่หรือไม่? ตัวติดตั้งจะสิ้นสุดการทำงานและไม่บันทึกการเปลี่ยนแปลงที่ได้ดำเนินการก่อนหน้านี้ - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? ดำเนินการติดตั้งต่อหรือไม่? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> ตัวติดตั้ง %1 กำลังพยายามที่จะทำการเปลี่ยนแปลงในดิสก์ของคุณเพื่อติดตั้ง %2<br/><strong>คุณจะไม่สามารถยกเลิกการเปลี่ยนแปลงเหล่านี้ได้</strong> - + &Install now &ติดตั้งตอนนี้ - + Go &back กลั&บไป - - &Quit - &Q ออก + + &Done + - + + The installation is complete. Close the installer. + + + + Error ข้อผิดพลาด - + Installation Failed การติดตั้งล้มเหลว @@ -343,12 +336,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer ตัวติดตั้ง %1 - + Show debug information แสดงข้อมูลการดีบั๊ก @@ -369,7 +362,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> ขณะที่กำลังติดตั้ง ตัวติดตั้งฟ้องว่า คอมพิวเตอร์นี้มีความต้องการไม่เพียงพอที่จะติดตั้ง %1.<br/>ไม่สามารถทำการติดตั้งต่อไปได้ <a href="#details">รายละเอียด...</a> @@ -379,17 +372,17 @@ The installer will quit and all changes will be lost. ขณะที่กำลังติดตั้ง ตัวติดตั้งฟ้องว่า คอมพิวเตอร์มีความต้องการไม่เพียงพอที่จะติดตั้ง %1<br/>ไม่สามารถทำการติดตั้งต่อไปได้ และฟีเจอร์บางอย่างจะถูกปิดไว้ - + This program will ask you some questions and set up %2 on your computer. โปรแกรมนี้จะถามคุณบางอย่าง เพื่อติดตั้ง %2 ไว้ในคอมพิวเตอร์ของคุณ - + For best results, please ensure that this computer: สำหรับผลลัพธ์ที่ดีขึ้น โปรดตรวจสอบให้แน่ใจว่าคอมพิวเตอร์เครื่องนี้: - + System requirements ความต้องการของระบบ @@ -402,35 +395,35 @@ The installer will quit and all changes will be lost. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -440,71 +433,71 @@ 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>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -530,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. จุดเชื่อมต่อชั่วคราวทั้งหมดถูกล้างแล้ว @@ -557,6 +550,11 @@ The installer will quit and all changes will be lost. Create a Partition สร้างพาร์ทิชัน + + + MiB + + Partition &Type: @@ -593,32 +591,27 @@ The installer will quit and all changes will be lost. &Z ขนาด: - - MB - MB เมกะไบต์ - - - + En&crypt - + Logical โลจิคอล - + Primary หลัก - + GPT GPT - + Mountpoint already in use. Please select another one. @@ -831,7 +824,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -933,17 +926,22 @@ The installer will quit and all changes will be lost. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -971,7 +969,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -989,27 +987,27 @@ The installer will quit and all changes will be lost. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1027,18 +1025,33 @@ The installer will quit and all changes will be lost. &R เริ่มต้นใหม่ทันที - + <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 Live environment ต่อไป + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1116,12 +1129,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> ตั้งค่าโมเดลแป้นพิมพ์เป็น %1<br/> - + Set keyboard layout to %1/%2. ตั้งค่าแบบแป้นพิมพ์เป็น %1/%2 @@ -1137,15 +1150,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting การตั้งค่า locale ระบบ - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1228,12 +1251,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1254,12 +1277,12 @@ The installer will quit and all changes will be lost. &C เปลี่ยนแปลง... - + Set timezone to %1/%2.<br/> ตั้งโซนเวลาเป็น %1/%2<br/> - + %1 (%2) Language (Country) @@ -1330,17 +1353,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1389,7 +1412,6 @@ The installer will quit and all changes will be lost. ชื่อที่คุณต้องการใช้ในการล็อกอิน? - @@ -1563,7 +1585,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? @@ -1586,82 +1608,82 @@ The installer will quit and all changes will be lost. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1680,22 +1702,22 @@ The installer will quit and all changes will be lost. ค่าเริ่มต้น - + unknown - + extended - + unformatted - + swap @@ -1718,64 +1740,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1783,55 +1805,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 ตั้งรหัสผ่านสำหรับผู้ใช้ %1 - + Setting password for user %1. - + Bad destination system path. path ของระบบเป้าหมายไม่ถูกต้อง - + rootMountPoint is %1 rootMountPoint คือ %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. ไม่สามารถตั้งค่ารหัสผ่านสำหรับผู้ใช้ %1 - + usermod terminated with error code %1. usermod จบด้วยโค้ดข้อผิดพลาด %1 @@ -2236,22 +2263,27 @@ The installer will quit and all changes will be lost. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts index 02bb0b39e..ba9335279 100644 --- a/lang/calamares_tr_TR.ts +++ b/lang/calamares_tr_TR.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Küçültmek için bir disk bölümü seçin: - - - - Allocate drive space by dragging the divider below: - Aşağıdaki bölümleyiciyi sürükleyerek kullanılabilir disk alanı belirle: - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - Bu işlem ile <strong>%1</strong> bölümü içeren %4 %2MB küçültülecek ve yeni bölüm %3MB oluşturulacak %5 için. - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Bu sistemde EFI disk bölümü bulunamadı. Lütfen geri dönün ve %1 kurmak için gelişmiş kurulum seçeneğini kullanın. - - - - The EFI system partition at %1 will be used for starting %2. - %1 EFI sistem bölümü %2 başlatmak için kullanılacaktır. - - - - EFI system partition: - EFI sistem bölümü: - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. Bu sistemdeki<br> <strong>önyükleme arayüzü</strong> sadece eski x86 sistem ve <strong>BIOS</strong> destekler. <br>Modern sistemler genellikle <strong>EFI</strong> kullanır fakat önyükleme arayüzü uyumlu modda ise BIOS seçilebilir. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. Bu sistem, bir <strong>EFI</strong> önyükleme arayüzü ile başladı.<br><br>EFI ortamından başlangıcı yapılandırmak için, bu yükleyici <strong>EFI Sistem Bölümü</strong> üzerinde <strong>GRUB</strong> veya <strong>systemd-boot</strong> gibi bir önyükleyici oluşturmalıdır. Bunu otomatik olarak yapabileceğiniz gibi elle disk bölümleri oluşturarak ta yapabilirsiniz. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. Bu sistem, bir <strong>BIOS</strong> önyükleme arayüzü ile başladı.<br><br>BIOS ortamında önyükleme için, yükleyici bölümün başında veya bölüm tablosu başlangıcına yakın <strong>Master Boot Record</strong> üzerine <strong>GRUB</strong> gibi bir önyükleyici yüklemeniz gerekir (önerilir). Eğer bu işlemin otomatik olarak yapılmasını istemez iseniz elle bölümleme yapabilirsiniz. @@ -60,12 +27,12 @@ Boot Partition - Önyükleyici Bölümü + Önyükleyici Disk Bölümü System Partition - Sistem Bölümü + Sistem Disk Bölümü @@ -221,32 +188,32 @@ Output: Calamares::PythonJob - + Running %1 operation. %1 işlemleri yapılıyor. - + Bad working directory path Dizin yolu kötü çalışıyor - + Working directory %1 for python job %2 is not readable. %2 python işleri için %1 dizinleme çalışırken okunamadı. - + Bad main script file - Sorunlu script + Sorunlu betik dosyası - + Main script file %1 for python job %2 is not readable. - %2 python işleri için %1 sorunlu script okunamadı. + %2 python işleri için %1 sorunlu betik okunamadı. - + Boost.Python error in job "%1". Boost.Python iş hatası "%1". @@ -254,65 +221,91 @@ Output: Calamares::ViewManager - + &Back &Geri - + &Next &Sonraki - - + + &Cancel &Vazgeç - + + + Cancel installation without changing the system. + Sistemi değiştirmeden kurulumu iptal edin. + + + Cancel installation? Yüklemeyi iptal et? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Yükleme işlemini gerçekten iptal etmek istiyor musunuz? Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. - + + &Yes + &Evet + + + + &No + &Hayır + + + + &Close + &Kapat + + + Continue with setup? Kuruluma devam et? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 sistem yükleyici %2 yüklemek için diskinizde değişiklik yapacak.<br/><strong>Bu değişiklikleri geri almak mümkün olmayacak.</strong> - + &Install now &Şimdi yükle - + Go &back Geri &git - - &Quit - &Çıkış + + &Done + &Tamam - + + The installation is complete. Close the installer. + Yükleme işi tamamlandı. Sistem yükleyiciyi kapatın. + + + Error Hata - + Installation Failed Kurulum Başarısız @@ -343,12 +336,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. CalamaresWindow - + %1 Installer %1 Yükleniyor - + Show debug information Hata ayıklama bilgisini göster @@ -369,7 +362,7 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> Bu bilgisayara %1 yüklemek için minimum gereksinimler karşılanamadı. Kurulum devam edemiyor. <a href="#detaylar">Detaylar...</a> @@ -381,17 +374,17 @@ Kurulum devam edemiyor. <a href="#detaylar">Detaylar...</a> Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. - + This program will ask you some questions and set up %2 on your computer. Bu program size bazı sorular soracak ve bilgisayarınıza %2 kuracak. - + For best results, please ensure that this computer: En iyi sonucu elde etmek için bilgisayarınızın aşağıdaki gereksinimleri karşıladığından emin olunuz: - + System requirements Sistem gereksinimleri @@ -404,35 +397,35 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Biçim - + After: Sonra: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Elle bölümleme</strong><br/>Bölümler oluşturabilir ve boyutlandırabilirsiniz. - + Boot loader location: Önyükleyici konumu: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 %2MB küçülecek ve %4 için %3MB bir disk bölümü oluşturacak. - + Select storage de&vice: Depolama ay&gıtı seç: - - - - + + + + Current: Geçerli: @@ -443,71 +436,71 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Küçültmek için bir bölüm seçip alttaki çubuğu sürükleyerek boyutlandır</strong> - + <strong>Select a partition to install on</strong> <strong>Yükleyeceğin disk bölümünü seç</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. Bu sistemde EFI disk bölümü bulunamadı. Lütfen geri dönün ve %1 kurmak için gelişmiş kurulum seçeneğini kullanın. - + The EFI system partition at %1 will be used for starting %2. %1 EFI sistem bölümü %2 başlatmak için kullanılacaktır. - + EFI system partition: EFI sistem bölümü: - + 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. Bu depolama aygıtı üzerinde yüklü herhangi bir işletim sistemi tespit etmedik. Ne yapmak istersiniz?<br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Diski sil</strong><br/>Seçili depolama bölümündeki mevcut veriler şu anda <font color="red">silinecektir.</font> - + 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. Bu depolama aygıtı üzerinde %1 vardır. Ne yapmak istersiniz?<br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Yanına yükleyin</strong><br/>Sistem yükleyici disk bölümünü küçülterek %1 için yer açacak. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Varolan bir disk bölümüne kur</strong><br/>Varolan bir disk bölümü üzerine %1 kur. - + This storage device already has 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. Bu depolama aygıtı üzerinde bir işletim sistemi yüklü. Ne yapmak istersiniz? <br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak. - + This storage device has multiple operating systems 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. Bu depolama aygıtı üzerinde birden fazla işletim sistemi var. Ne yapmak istersiniz? <br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak. @@ -533,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. @@ -560,6 +553,11 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Create a Partition Yeni Bölüm Oluştur + + + MiB + MB + Partition &Type: @@ -596,32 +594,27 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Bo&yut: - - MB - MB - - - + En&crypt Şif&rele - + Logical Mantıksal - + Primary Birincil - + GPT GPT - + Mountpoint already in use. Please select another one. Bağlama noktası zaten kullanımda. Lütfen diğerini seçiniz. @@ -834,7 +827,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. DeviceInfoWidget - + 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. Seçili depolama aygıtında bir <strong>bölümleme tablosu</strong> oluştur.<br><br>Bölümleme tablosu oluşturmanın tek yolu aygıt üzerindeki bölümleri silmek, verileri yoketmek ve yeni bölümleme tablosu oluşturmaktır.<br>Sistem yükleyici aksi bir seçeneğe başvurmaz iseniz geçerli bölümlemeyi koruyacaktır.<br>Emin değilseniz, modern sistemler için GPT tercih edebilirsiniz. @@ -936,17 +929,22 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Bo&yut: - + + MiB + MB + + + Fi&le System: D&osya Sistemi: - + Flags: Bayraklar: - + Mountpoint already in use. Please select another one. Bağlama noktası zaten kullanımda. Lütfen diğerini seçiniz. @@ -974,7 +972,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Parolayı doğrula - + Please enter the same passphrase in both boxes. Her iki kutuya da aynı parolayı giriniz. @@ -992,27 +990,27 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.%2 <strong>yeni</strong> sistem diskine %1 yükle. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. %2 <strong>yeni</strong> disk bölümünü <strong>%1</strong> ile ayarlayıp bağla. - + Install %2 on %3 system partition <strong>%1</strong>. %3 <strong>%1</strong> sistem diskine %2 yükle. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. %3 diskine<strong>%1</strong> ile <strong>%2</strong> bağlama noktası ayarla. - + Install boot loader on <strong>%1</strong>. <strong>%1</strong> üzerine sistem ön yükleyiciyi kur. - + Setting up mount points. Bağlama noktalarını ayarla. @@ -1030,18 +1028,33 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.&Şimdi yeniden başlat - + <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>Tüm işlem tamamlandı.</h1><br/>%1 bilgisayarınıza yüklendi<br/>Yeni kurduğunuz sistemi kullanmak için yeniden başlatabilir veya %2 Çalışan sistem ile devam edebilirsiniz. + + + <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. + FinishedViewStep - + Finish Kurulum Tamam + + + Installation Complete + Kurulum Tamamlandı + + + + The installation of %1 is complete. + Kurulum %1 oranında tamamlandı. + FormatPartitionJob @@ -1119,12 +1132,12 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. KeyboardPage - + Set keyboard model to %1.<br/> %1 Klavye düzeni olarak seçildi.<br/> - + Set keyboard layout to %1/%2. Alt klavye türevi olarak %1/%2 seçildi. @@ -1140,15 +1153,25 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. LCLocaleDialog - + System locale setting Sistem yerel ayarları - + 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>. Sistem yerel ayarı, bazı uçbirim, kullanıcı ayarlamaları ve başkaca dil seçeneklerini belirler ve etkiler. <br/>Varsayılan geçerli ayarlar <strong>%1</strong>. + + + &Cancel + &Vazgeç + + + + &OK + &TAMAM + LicensePage @@ -1231,12 +1254,12 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. LocalePage - + The system language will be set to %1. Sistem dili %1 olarak ayarlanacak. - + The numbers and dates locale will be set to %1. Sayılar ve günler için sistem yereli %1 olarak ayarlanacak. @@ -1257,12 +1280,12 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.&Değiştir... - + Set timezone to %1/%2.<br/> Bölge ve zaman dilimi %1/%2 olarak ayarlandı.<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1333,17 +1356,17 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. NetInstallPage - + Name İsim - + Description Açıklama - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Ağ Üzerinden Kurulum. (Devre Dışı: Paket listeleri alınamıyor, ağ bağlantısını kontrol ediniz) @@ -1392,7 +1415,6 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Giriş için hangi adı kullanmak istersiniz? - @@ -1566,7 +1588,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Şuraya ön &yükleyici kur: - + Are you sure you want to create a new partition table on %1? %1 tablosunda yeni bölüm oluşturmaya devam etmek istiyor musunuz? @@ -1589,82 +1611,82 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Diğer işletim sisteminin <strong>yanına</strong> %1 yükle. - + <strong>Erase</strong> disk and install %1. Diski <strong>sil</strong> ve %1 yükle. - + <strong>Replace</strong> a partition with %1. %1 ile disk bölümünün üzerine <strong>yaz</strong>. - + <strong>Manual</strong> partitioning. <strong>Manuel</strong> bölümleme. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). <strong>%2</strong> (%3) diskindeki diğer işletim sisteminin <strong>yanına</strong> %1 yükle. - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>%2</strong> (%3) diski <strong>sil</strong> ve %1 yükle. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>%2</strong> (%3) disk bölümünün %1 ile <strong>üzerine yaz</strong>. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>%1</strong> (%2) disk bölümünü <strong>manuel</strong> bölümle. - + Disk <strong>%1</strong> (%2) Disk <strong>%1</strong> (%2) - + Current: Geçerli: - + After: Sonra: - + No EFI system partition configured EFI sistem bölümü yapılandırılmamış - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. %1 başlatmak için bir EFI sistem bölümü gereklidir.<br/><br/>EFI sistem bölümünü yapılandırmak için geri dönün ve seçim yapın veya FAT32 dosya sistemi ile <strong>esp</strong> etiketiyle <strong>%2</strong> noktasına bağlayın.<br/><br/>Bir EFI sistem bölümü kurmadan devam edebilirsiniz fakat işletim sistemi başlatılamayabilir. - + EFI system partition flag not set EFI sistem bölümü bayrağı ayarlanmadı - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. %1 başlatmak için bir EFI sistem bölümü gereklidir.<br/><br/>Bir bağlama noktası <strong>%2</strong> olarak yapılandırıldı fakat <strong>esp</strong>bayrağı ayarlanmadı.<br/>Bayrağı ayarlamak için, geri dönün ve bölümü düzenleyin.<br/><br/>Sen bayrağı ayarlamadan devam edebilirsin fakat işletim sistemi başlatılamayabilir. - + Boot partition not encrypted Önyükleme yani boot diski şifrelenmedi - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Ayrı bir önyükleme yani boot disk bölümü, şifrenmiş bir kök bölüm ile birlikte ayarlandı, fakat önyükleme bölümü şifrelenmedi.<br/><br/>Bu tip kurulumun güvenlik endişeleri vardır, çünkü önemli sistem dosyaları şifrelenmemiş bir bölümde saklanır.<br/>İsterseniz kuruluma devam edebilirsiniz, fakat dosya sistemi kilidi daha sonra sistem başlatılırken açılacak.<br/> Önyükleme bölümünü şifrelemek için geri dönün ve bölüm oluşturma penceresinde <strong>Şifreleme</strong>seçeneği ile yeniden oluşturun. @@ -1684,22 +1706,22 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Varsayılan - + unknown bilinmeyen - + extended uzatılmış - + unformatted biçimlenmemiş - + swap Swap-Takas @@ -1722,64 +1744,64 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.%1 kurulacak diski seçin.<br/><font color="red">Uyarı: </font>Bu işlem seçili disk üzerindeki tüm dosyaları silecek. - + The selected item does not appear to be a valid partition. Seçili nesne, geçerli bir disk bölümü olarak görünmüyor. - + %1 cannot be installed on empty space. Please select an existing partition. %1 tanımlanmamış boş bir alana kurulamaz. Lütfen geçerli bir disk bölümü seçin. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 uzatılmış bir disk bölümüne kurulamaz. Geçerli bir, birincil disk ya da mantıksal disk bölümü seçiniz. - + %1 cannot be installed on this partition. %1 bu disk bölümüne yüklenemedi. - + Data partition (%1) Veri diski (%1) - + Unknown system partition (%1) Bilinmeyen sistem bölümü (%1) - + %1 system partition (%2) %1 sistem bölümü (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>disk bölümü %2 için %1 daha küçük. Lütfen, en az %3 GB kapasiteli bir disk bölümü seçiniz. - + <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/>Bu sistemde EFI disk bölümü bulamadı. Lütfen geri dönün ve %1 kurmak için gelişmiş kurulum seçeneğini kullanın. - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%2 üzerine %1 kuracak.<br/><font color="red">Uyarı: </font>%2 diskindeki tüm veriler kaybedilecek. - + The EFI system partition at %1 will be used for starting %2. %1 EFI sistem bölümü %2 başlatmak için kullanılacaktır. - + EFI system partition: EFI sistem bölümü: @@ -1787,56 +1809,61 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. RequirementsChecker - + Gathering system information... Sistem bilgileri toplanıyor... - + has at least %1 GB available drive space En az %1 GB disk alanı olduğundan... - + There is not enough drive space. At least %1 GB is required. Yeterli disk alanı mevcut değil. En az %1 GB disk alanı gereklidir. - + has at least %1 GB working memory En az %1 GB bellek bulunduğundan... - + The system does not have enough working memory. At least %1 GB is required. Yeterli ram bellek gereksinimi karşılanamıyor. En az %1 GB ram bellek gereklidir. - + is plugged in to a power source Bir güç kaynağına takılı olduğundan... - + The system is not plugged in to a power source. Sistem güç kaynağına bağlı değil. - + is connected to the Internet İnternete bağlı olduğundan... - + The system is not connected to the Internet. Sistem internete bağlı değil. - + The installer is not running with administrator rights. Sistem yükleyici yönetici haklarına sahip olmadan çalışmıyor. + + + The screen is too small to display the installer. + Ekran, sistem yükleyiciyi görüntülemek için çok küçük. + ResizeFileSystemJob @@ -2072,42 +2099,42 @@ Sistem güç kaynağına bağlı değil. SetPasswordJob - + Set password for user %1 %1 Kullanıcı için parola ayarla - + Setting password for user %1. %1 Kullanıcısı için parola ayarlanıyor. - + Bad destination system path. Hedef sistem yolu bozuk. - + rootMountPoint is %1 rootBağlamaNoktası %1 - + Cannot disable root account. root hesap devre dışı bırakılamaz. - + passwd terminated with error code %1. passwd %1 hata kodu ile sonlandı. - + Cannot set password for user %1. %1 Kullanıcısı için parola ayarlanamadı. - + usermod terminated with error code %1. usermod %1 hata koduyla çöktü. @@ -2241,22 +2268,27 @@ Sistem güç kaynağına bağlı değil. &Hakkında - + <h1>Welcome to the %1 installer.</h1> <h1>%1 Sistem Yükleyiciye Hoşgeldiniz.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>%1 Calamares Sistem Yükleyici .</h1> + + + About %1 installer %1 sistem yükleyici hakkında - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>for %3</strong><br/><br/>Telif Hakkı 2014-2017 Teo Mrnjavac &lt;teo@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. + + <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. - + %1 support %1 destek diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts index 48a95abf1..a67caae8a 100644 --- a/lang/calamares_uk.ts +++ b/lang/calamares_uk.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - Оберіть розділ для зменьшення: - - - - Allocate drive space by dragging the divider below: - Виділіть місце на диску, перетягнувши роздільник нижче - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -215,32 +182,32 @@ Output: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path - + Working directory %1 for python job %2 is not readable. - + Bad main script file - + Main script file %1 for python job %2 is not readable. - + Boost.Python error in job "%1". @@ -248,64 +215,90 @@ Output: Calamares::ViewManager - + &Back - + &Next - - + + &Cancel - + + + Cancel installation without changing the system. + + + + Cancel installation? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now - + Go &back - - &Quit + + &Done - + + The installation is complete. Close the installer. + + + + Error - + Installation Failed @@ -336,12 +329,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer %1 Установник - + Show debug information @@ -362,7 +355,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -372,17 +365,17 @@ The installer will quit and all changes will be lost. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -395,35 +388,35 @@ The installer will quit and all changes will be lost. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -433,71 +426,71 @@ 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>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -523,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. @@ -550,6 +543,11 @@ The installer will quit and all changes will be lost. Create a Partition + + + MiB + + Partition &Type: @@ -586,32 +584,27 @@ The installer will quit and all changes will be lost. - - MB - - - - + En&crypt - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -824,7 +817,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -926,17 +919,22 @@ The installer will quit and all changes will be lost. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -964,7 +962,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -982,27 +980,27 @@ The installer will quit and all changes will be lost. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1020,18 +1018,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1109,12 +1122,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1130,15 +1143,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1221,12 +1244,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1247,12 +1270,12 @@ The installer will quit and all changes will be lost. - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1323,17 +1346,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1382,7 +1405,6 @@ The installer will quit and all changes will be lost. - @@ -1556,7 +1578,7 @@ The installer will quit and all changes will be lost. - + Are you sure you want to create a new partition table on %1? @@ -1579,82 +1601,82 @@ The installer will quit and all changes will be lost. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1673,22 +1695,22 @@ The installer will quit and all changes will be lost. - + unknown - + extended - + unformatted - + swap @@ -1711,64 +1733,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1776,55 +1798,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2060,42 +2087,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2229,22 +2256,27 @@ The installer will quit and all changes will be lost. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts index 63345ec32..744e43ced 100644 --- a/lang/calamares_ur.ts +++ b/lang/calamares_ur.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - - - - - Allocate drive space by dragging the divider below: - - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -215,32 +182,32 @@ Output: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path - + Working directory %1 for python job %2 is not readable. - + Bad main script file - + Main script file %1 for python job %2 is not readable. - + Boost.Python error in job "%1". @@ -248,64 +215,90 @@ Output: Calamares::ViewManager - + &Back - + &Next - - + + &Cancel - + + + Cancel installation without changing the system. + + + + Cancel installation? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now - + Go &back - - &Quit + + &Done - + + The installation is complete. Close the installer. + + + + Error - + Installation Failed @@ -336,12 +329,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer - + Show debug information @@ -362,7 +355,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -372,17 +365,17 @@ The installer will quit and all changes will be lost. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -395,35 +388,35 @@ The installer will quit and all changes will be lost. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -433,71 +426,71 @@ 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>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -523,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. @@ -550,6 +543,11 @@ The installer will quit and all changes will be lost. Create a Partition + + + MiB + + Partition &Type: @@ -586,32 +584,27 @@ The installer will quit and all changes will be lost. - - MB - - - - + En&crypt - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -824,7 +817,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -926,17 +919,22 @@ The installer will quit and all changes will be lost. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -964,7 +962,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -982,27 +980,27 @@ The installer will quit and all changes will be lost. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1020,18 +1018,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1109,12 +1122,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1130,15 +1143,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1221,12 +1244,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1247,12 +1270,12 @@ The installer will quit and all changes will be lost. - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1323,17 +1346,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1382,7 +1405,6 @@ The installer will quit and all changes will be lost. - @@ -1556,7 +1578,7 @@ The installer will quit and all changes will be lost. - + Are you sure you want to create a new partition table on %1? @@ -1579,82 +1601,82 @@ The installer will quit and all changes will be lost. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1673,22 +1695,22 @@ The installer will quit and all changes will be lost. - + unknown - + extended - + unformatted - + swap @@ -1711,64 +1733,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1776,55 +1798,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2060,42 +2087,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2229,22 +2256,27 @@ The installer will quit and all changes will be lost. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts index 216b6bb34..aa9eb1029 100644 --- a/lang/calamares_uz.ts +++ b/lang/calamares_uz.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - - - - - Allocate drive space by dragging the divider below: - - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - - - - - The EFI system partition at %1 will be used for starting %2. - - - - - EFI system partition: - - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -215,32 +182,32 @@ Output: Calamares::PythonJob - + Running %1 operation. - + Bad working directory path - + Working directory %1 for python job %2 is not readable. - + Bad main script file - + Main script file %1 for python job %2 is not readable. - + Boost.Python error in job "%1". @@ -248,64 +215,90 @@ Output: Calamares::ViewManager - + &Back - + &Next - - + + &Cancel - + + + Cancel installation without changing the system. + + + + Cancel installation? - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - + + &Yes + + + + + &No + + + + + &Close + + + + Continue with setup? - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Install now - + Go &back - - &Quit + + &Done - + + The installation is complete. Close the installer. + + + + Error - + Installation Failed @@ -336,12 +329,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer - + Show debug information @@ -362,7 +355,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> @@ -372,17 +365,17 @@ The installer will quit and all changes will be lost. - + This program will ask you some questions and set up %2 on your computer. - + For best results, please ensure that this computer: - + System requirements @@ -395,35 +388,35 @@ The installer will quit and all changes will be lost. - + After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Boot loader location: - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. - + Select storage de&vice: - - - - + + + + Current: @@ -433,71 +426,71 @@ 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>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: - + 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. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - + 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. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device already has 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. - + This storage device has multiple operating systems 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. @@ -523,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. @@ -550,6 +543,11 @@ The installer will quit and all changes will be lost. Create a Partition + + + MiB + + Partition &Type: @@ -586,32 +584,27 @@ The installer will quit and all changes will be lost. - - MB - - - - + En&crypt - + Logical - + Primary - + GPT - + Mountpoint already in use. Please select another one. @@ -824,7 +817,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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. @@ -926,17 +919,22 @@ The installer will quit and all changes will be lost. - + + MiB + + + + Fi&le System: - + Flags: - + Mountpoint already in use. Please select another one. @@ -964,7 +962,7 @@ The installer will quit and all changes will be lost. - + Please enter the same passphrase in both boxes. @@ -982,27 +980,27 @@ The installer will quit and all changes will be lost. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. - + Install %2 on %3 system partition <strong>%1</strong>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. - + Install boot loader on <strong>%1</strong>. - + Setting up mount points. @@ -1020,18 +1018,33 @@ 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>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + FinishedViewStep - + Finish + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1109,12 +1122,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. @@ -1130,15 +1143,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting - + 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>. + + + &Cancel + + + + + &OK + + LicensePage @@ -1221,12 +1244,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. - + The numbers and dates locale will be set to %1. @@ -1247,12 +1270,12 @@ The installer will quit and all changes will be lost. - + Set timezone to %1/%2.<br/> - + %1 (%2) Language (Country) @@ -1323,17 +1346,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name - + Description - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -1382,7 +1405,6 @@ The installer will quit and all changes will be lost. - @@ -1556,7 +1578,7 @@ The installer will quit and all changes will be lost. - + Are you sure you want to create a new partition table on %1? @@ -1579,82 +1601,82 @@ The installer will quit and all changes will be lost. - + <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) - + Current: - + After: - + No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + EFI system partition flag not set - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. @@ -1673,22 +1695,22 @@ The installer will quit and all changes will be lost. - + unknown - + extended - + unformatted - + swap @@ -1711,64 +1733,64 @@ The installer will quit and all changes will be lost. - + The selected item does not appear to be a valid partition. - + %1 cannot be installed on empty space. Please select an existing partition. - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. - + %1 cannot be installed on this partition. - + Data partition (%1) - + Unknown system partition (%1) - + %1 system partition (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. - + <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>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. - + The EFI system partition at %1 will be used for starting %2. - + EFI system partition: @@ -1776,55 +1798,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... - + has at least %1 GB available drive space - + There is not enough drive space. At least %1 GB is required. - + has at least %1 GB working memory - + The system does not have enough working memory. At least %1 GB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + The installer is not running with administrator rights. + + + The screen is too small to display the installer. + + ResizeFileSystemJob @@ -2060,42 +2087,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 - + Setting password for user %1. - + Bad destination system path. - + rootMountPoint is %1 - + Cannot disable root account. - + passwd terminated with error code %1. - + Cannot set password for user %1. - + usermod terminated with error code %1. @@ -2229,22 +2256,27 @@ The installer will quit and all changes will be lost. - + <h1>Welcome to the %1 installer.</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + About %1 installer - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>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. - + %1 support diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts index 94ac6b044..f2894938e 100644 --- a/lang/calamares_zh_CN.ts +++ b/lang/calamares_zh_CN.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - 选择要缩小的分区： - - - - Allocate drive space by dragging the divider below: - 拖动下方的分隔来调整分区空间： - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - 在此操作后，带有 %4 的分区 <strong>%1</strong> 将缩小到 %2MB，而后将为 %5 创建一个 %3MB 大小的分区。 - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - 在此系统上找不到任何 EFI 系统分区。请后退到上一步并使用手动分区配置 %1。 - - - - The EFI system partition at %1 will be used for starting %2. - 将使用 %1 处的 EFI 系统分区启动 %2。 - - - - EFI system partition: - EFI 系统分区： - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. 这个系统的<strong>引导环境</strong>。<br><br>较旧的 x86 系统只支持 <strong>BIOS</strong>。<br>现代的系统则通常使用 <strong>EFI</strong>，但若引导时使用了兼容模式，也可以显示为 BIOS。 - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. 这个系统从 <strong>EFI</strong> 引导环境启动。<br><br>目前市面上大多数的民用设备都使用 EFI，并同时与之使用 GPT 分区表。<br>要从 EFI 环境引导的话，本安装程序必须部署一个引导器（如 <strong>GRUB</strong> 或 <strong>systemd-boot</strong>）到 <strong>EFI 系统分区</strong>。这个步骤是自动的，除非您选择手动分区——此时您必须自行选择或创建。 - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. 这个系统从 <strong>BIOS</strong> 引导环境启动。<br><br> 要从 BIOS 环境引导，本安装程序必须安装引导器（如 <strong>GRUB</strong>），一般而言要么安装在分区的开头，要么就是在靠进分区表开头的 <strong>主引导记录</strong>（推荐）中。这个步骤是自动的，除非您选择手动分区——此时您必须自行配置。 @@ -222,32 +189,32 @@ Output: Calamares::PythonJob - + Running %1 operation. 正在运行 %1 个操作。 - + Bad working directory path 错误的工作目录路径 - + Working directory %1 for python job %2 is not readable. 用于 python 任务 %2 的工作目录 %1 不可读。 - + Bad main script file 错误的主脚本文件 - + Main script file %1 for python job %2 is not readable. 用于 python 任务 %2 的主脚本文件 %1 不可读。 - + Boost.Python error in job "%1". 任务“%1”出现 Boost.Python 错误。 @@ -255,65 +222,91 @@ Output: Calamares::ViewManager - + &Back 后退(&B) - + &Next 下一步(&N) - - + + &Cancel 取消(&C) - + + + Cancel installation without changing the system. + 取消安装，并不做任何更改。 + + + Cancel installation? 取消安装？ - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. 确定要取消当前的安装吗？ 安装程序将退出，所有修改都会丢失。 - + + &Yes + &是 + + + + &No + &否 + + + + &Close + &关闭 + + + Continue with setup? 要继续安装吗？ - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 安装程序将在您的磁盘上做出变更以安装 %2。<br/><strong>您将无法复原这些变更。</strong> - + &Install now 现在安装 (&I) - + Go &back 返回 (&B) - - &Quit - 退出(&Q) + + &Done + &完成 - + + The installation is complete. Close the installer. + 安装过程已完毕。请关闭安装器。 + + + Error 错误 - + Installation Failed 安装失败 @@ -344,12 +337,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer %1 安装程序 - + Show debug information 显示调试信息 @@ -370,7 +363,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> 此电脑未满足安装 %1 的最低需求。<br/>安装无法继续。<a href="#details">详细信息...</a> @@ -380,17 +373,17 @@ The installer will quit and all changes will be lost. 此电脑未满足一些安装 %1 的推荐需求。<br/>可以继续安装，但一些功能可能会被停用。 - + This program will ask you some questions and set up %2 on your computer. 本程序将会问您一些问题并在您的电脑上安装及设置 %2 。 - + For best results, please ensure that this computer: 为了更好的体验，请确定这台电脑: - + System requirements 系统需求 @@ -403,35 +396,35 @@ The installer will quit and all changes will be lost. 表单 - + After: 之后： - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>手动分区</strong><br/>您可以自行创建或重新调整分区大小。 - + Boot loader location: 引导程序位置： - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 将会被缩减到 %2 MB，同时将为 %4 创建空间为 %3MB 的新分区。 - + Select storage de&vice: 选择存储器(&V)： - - - - + + + + Current: 当前： @@ -441,71 +434,71 @@ The installer will quit and all changes will be lost. 将 %1 重用为 %2 的家分区。 - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>选择要缩小的分区，然后拖动底栏改变大小</strong> - + <strong>Select a partition to install on</strong> <strong>选择要安装到的分区</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. 在此系统上找不到任何 EFI 系统分区。请后退到上一步并使用手动分区配置 %1。 - + The EFI system partition at %1 will be used for starting %2. %1 处的 EFI 系统分区将被用来启动 %2。 - + EFI system partition: EFI 系统分区： - + 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/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。 - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>抹除磁盘</strong><br/>这将会<font color="red">删除</font>目前选定的存储器上所有的数据。 - + 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/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。 - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>并存安装</strong><br/>安装程序将会缩小一个分区，为 %1 腾出空间。 - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>取代一个分区</strong><br/>以 %1 <strong>替代</strong>一个分区。 - + This storage device already has 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/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。 - + This storage device has multiple operating systems 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/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。 @@ -531,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. 所有临时挂载点都已经清除。 @@ -558,6 +551,11 @@ The installer will quit and all changes will be lost. Create a Partition 创建分区 + + + MiB + MiB + Partition &Type: @@ -594,32 +592,27 @@ The installer will quit and all changes will be lost. 大小(&Z)： - - MB - MB - - - + En&crypt 加密(&C) - + Logical 逻辑分区 - + Primary 主分区 - + GPT GPT - + Mountpoint already in use. Please select another one. 挂载点已被占用。请选择另一个。 @@ -832,7 +825,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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。 @@ -935,17 +928,22 @@ The installer will quit and all changes will be lost. 尺寸 (&Z)： - + + MiB + MiB + + + Fi&le System: 文件系统 (&L)： - + Flags: 标记： - + Mountpoint already in use. Please select another one. 挂载点已被占用。请选择另一个。 @@ -973,7 +971,7 @@ The installer will quit and all changes will be lost. 确认密码 - + Please enter the same passphrase in both boxes. 请在两个输入框中输入同样的密码。 @@ -991,27 +989,27 @@ The installer will quit and all changes will be lost. 在 <strong>新的</strong>系统分区 %2 上安装 %1。 - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. 设置 <strong>新的</strong> 含挂载点 <strong>%1</strong> 的 %2 分区。 - + Install %2 on %3 system partition <strong>%1</strong>. 在 %3 系统割区 <strong>%1</strong> 上安装 %2。 - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. 为分区 %3 <strong>%1</strong> 设置挂载点 <strong>%2</strong>。 - + Install boot loader on <strong>%1</strong>. 在 <strong>%1</strong>上安装引导程序。 - + Setting up mount points. 正在设置挂载点。 @@ -1029,18 +1027,33 @@ The installer will quit and all changes will be lost. 现在重启(&R) - + <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 Live 环境。 + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>安装失败</h1><br/>%1 未在你的电脑上安装。<br/>错误信息：%2。 + FinishedViewStep - + Finish 结束 + + + Installation Complete + + + + + The installation of %1 is complete. + + FormatPartitionJob @@ -1118,12 +1131,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> 设置键盘型号为 %1。<br/> - + Set keyboard layout to %1/%2. 设置键盘布局为 %1/%2。 @@ -1139,15 +1152,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting 系统语区设置 - + 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>。 + + + &Cancel + + + + + &OK + + LicensePage @@ -1230,12 +1253,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. 系统语言将设置为 %1。 - + The numbers and dates locale will be set to %1. 数字和日期地域将设置为 %1。 @@ -1256,12 +1279,12 @@ The installer will quit and all changes will be lost. 更改 (&C) ... - + Set timezone to %1/%2.<br/> 设置时区为 %1/%2。<br/> - + %1 (%2) Language (Country) %1（%2） @@ -1332,17 +1355,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name 名称 - + Description 描述 - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) 网络安装。（已禁用：无法获取软件包列表，请检查网络连接） @@ -1391,7 +1414,6 @@ The installer will quit and all changes will be lost. 您想要使用的登录用户名是？ - @@ -1565,7 +1587,7 @@ The installer will quit and all changes will be lost. 安装引导程序于(&L)： - + Are you sure you want to create a new partition table on %1? 您是否确定要在 %1 上创建新分区表？ @@ -1588,82 +1610,82 @@ The installer will quit and all changes will be lost. 将 %1 安装在其他操作系统<strong>旁边</strong>。 - + <strong>Erase</strong> disk and install %1. <strong>抹除</strong>磁盘并安装 %1。 - + <strong>Replace</strong> a partition with %1. 以 %1 <strong>替代</strong>一个分区。 - + <strong>Manual</strong> partitioning. <strong>手动</strong>分区 - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). 将 %1 安装在磁盘 <strong>%2</strong> (%3) 上的另一个操作系统<strong>旁边</strong>。 - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>抹除</strong> 磁盘 <strong>%2</strong> (%3) 并且安装 %1。 - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. 以 %1 <strong>替代</strong> 一个在磁盘 <strong>%2</strong> (%3) 上的分区。 - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). 在磁盘 <strong>%1</strong> (%2) 上<strong>手动</strong>分区。 - + Disk <strong>%1</strong> (%2) 磁盘 <strong>%1</strong> (%2) - + Current: 当前： - + After: 之后： - + No EFI system partition configured 未配置 EFI 系统分区 - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. 必须有 EFI 系统分区才能启动 %1 。<br/><br/>要配置 EFI 系统分区，后退一步，然后创建或选中一个 FAT32 分区并为之设置 <strong>esp</strong> 标记及挂载点 <strong>%2</strong>。<br/><br/>你可以不创建 EFI 系统分区并继续安装，但是你的系统可能无法启动。 - + EFI system partition flag not set 未设置 EFI 系统分区标记 - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. 必须有 EFI 系统分区才能启动 %1 。<br/><br/>已有挂载点为 <strong>%2</strong> 的分区，但是未设置 <strong>esp</strong> 标记。<br/>要设置此标记，后退并编辑分区。<br/><br/>你可以不创建 EFI 系统分区并继续安装，但是你的系统可能无法启动。 - + Boot partition not encrypted 引导分区未加密 - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. 您尝试用单独的引导分区配合已加密的根分区使用，但引导分区未加密。<br/><br/>这种配置方式可能存在安全隐患，因为重要的系统文件存储在了未加密的分区上。<br/>您可以继续保持此配置，但是系统解密将在系统启动时而不是引导时进行。<br/>要加密引导分区，请返回上一步并重新创建此分区，并在分区创建窗口选中 <strong>加密</strong> 选项。 @@ -1682,22 +1704,22 @@ The installer will quit and all changes will be lost. 默认 - + unknown 未知 - + extended 扩展分区 - + unformatted 未格式化 - + swap 临时存储空间 @@ -1720,64 +1742,64 @@ The installer will quit and all changes will be lost. <b>选择要安装 %1 的地方。</b><br/><font color="red">警告：</font>这将会删除所有已选取的分区上的文件。 - + The selected item does not appear to be a valid partition. 选中项似乎不是有效分区。 - + %1 cannot be installed on empty space. Please select an existing partition. 无法在空白空间中安装 %1。请选取一个存在的分区。 - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. 无法在拓展分区上安装 %1。请选取一个存在的主要或逻辑分区。 - + %1 cannot be installed on this partition. 无法安装 %1 到此分区。 - + Data partition (%1) 数据分区 (%1) - + Unknown system partition (%1) 未知系统分区 (%1) - + %1 system partition (%2) %1 系统分区 (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>分区 %1 对 %2 来说太小了。请选取一个容量至少有 %3 GiB 的分区。 - + <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 系统分区。请后退到上一步并使用手动分区配置 %1。 - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>即将安装 %1 到 %2 上。<br/><font color="red">警告： </font>分区 %2 上的所有数据都将丢失。 - + The EFI system partition at %1 will be used for starting %2. 将使用 %1 处的 EFI 系统分区启动 %2。 - + EFI system partition: EFI 系统分区： @@ -1785,55 +1807,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... 正在收集系统信息 ... - + has at least %1 GB available drive space 至少 %1 GB 可用磁盘空间 - + There is not enough drive space. At least %1 GB is required. 没有足够的磁盘空间。至少需要 %1 GB。 - + has at least %1 GB working memory 至少 %1 GB 可用内存 - + The system does not have enough working memory. At least %1 GB is required. 系统没有足够的内存。至少需要 %1 GB。 - + is plugged in to a power source 已连接到电源 - + The system is not plugged in to a power source. 系统未连接到电源。 - + is connected to the Internet 已连接到互联网 - + The system is not connected to the Internet. 系统未连接到互联网。 - + The installer is not running with administrator rights. 安装器未以管理员权限运行 + + + The screen is too small to display the installer. + 屏幕不能完整显示安装器。 + ResizeFileSystemJob @@ -2069,42 +2096,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 设置用户 %1 的密码 - + Setting password for user %1. 正在为用户 %1 设置密码。 - + Bad destination system path. 非法的目标系统路径。 - + rootMountPoint is %1 根挂载点为 %1 - + Cannot disable root account. 无法禁用 root 帐号。 - + passwd terminated with error code %1. passwd 以错误代码 %1 终止。 - + Cannot set password for user %1. 无法设置用户 %1 的密码。 - + usermod terminated with error code %1. usermod 以错误代码 %1 中止。 @@ -2238,22 +2265,27 @@ The installer will quit and all changes will be lost. 关于(&A) - + <h1>Welcome to the %1 installer.</h1> - <h1>欢迎来到 %1 安装程序。</h1> + <h1>欢迎使用 %1 安装程序。</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>欢迎使用 Calamares 安装程序 - %1。</h1> + + + About %1 installer 关于 %1 安装程序 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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> 赞助。 + + <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. - + %1 support %1 的支持信息 diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts index 52d2dbb36..04de28cf1 100644 --- a/lang/calamares_zh_TW.ts +++ b/lang/calamares_zh_TW.ts @@ -1,51 +1,18 @@ - - AlongsidePage - - - Choose partition to shrink: - 請選擇要縮減的磁區： - - - - Allocate drive space by dragging the divider below: - 拖曳以下的分界線以分配裝置空間 - - - - With this operation, the partition <strong>%1</strong> which contains %4 will be shrunk to %2MB and a new %3MB partition will be created for %5. - 將會執行以下操作：縮減原容量為 %4 的分割區 <strong>%1</strong> 為 %2MB 並新建一個新的 %3MB 分割區以容納 %5 。 - - - - An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - 在這個系統上找不到任何的 EFI 系統分割區。請回到上一步並使用手動分割以設定 %1。 - - - - The EFI system partition at %1 will be used for starting %2. - 在 %1 的 EFI 系統分割區將會在開始 %2 時使用。 - - - - EFI system partition: - EFI 系統分割區： - - BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. 這個系統的<strong>開機環境</strong>。<br><br>較舊的 x86 系統只支援 <strong>BIOS</strong>。<br>現代的系統則通常使用 <strong>EFI</strong>，但若開機環境是以相容模式執行，其也可能顯示為 BIOS。 - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. 這個系統以 <strong>EFI</strong> 開機環境啟動。<br><br>要設定從 EFI 環境開機，本安裝程式必須部署一個開機載入器應用程式，像是 <strong>GRUB</strong> 或 <strong>systemd-boot</strong> 在 <strong>EFI 系統分割區</strong>上。這是自動的，除非您選擇手動分割，在這種情況下，您必須自行選取或建立它。 - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. 這個系統以 <strong>BIOS</strong> 開機環境開始。<br><br>要從 BIOS 環境開機開機，本安裝程式必須安裝開機載入器，像是 <strong>GRUB</strong>，且通常不是安裝在分割區的開頭就是在靠進分割表開頭的 <strong>主開機記錄</strong>（推薦）。這是自動的，除非您選擇手動分割，在這種情況下，您必須自行設定它。 @@ -221,32 +188,32 @@ Output: Calamares::PythonJob - + Running %1 operation. 正在執行 %1 操作。 - + Bad working directory path 不良的工作目錄路徑 - + Working directory %1 for python job %2 is not readable. Python 行程 %2 作用中的目錄 %1 不具讀取權限。 - + Bad main script file 錯誤的主要腳本檔 - + Main script file %1 for python job %2 is not readable. Python 行程 %2 的主要腳本檔 %1 無法讀取。 - + Boost.Python error in job "%1". 行程 %1 中 Boost.Python 錯誤。 @@ -254,65 +221,91 @@ Output: Calamares::ViewManager - + &Back 返回 (&B) - + &Next 下一步 (&N) - - + + &Cancel 取消(&C) - + + + Cancel installation without changing the system. + 不變更系統並取消安裝。 + + + Cancel installation? 取消安裝？ - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. 您真的想要取消目前的安裝程序嗎？ 安裝程式將會退出且所有變動將會遺失。 - + + &Yes + 是(&Y) + + + + &No + 否(&N) + + + + &Close + 關閉(&C) + + + Continue with setup? 繼續安裝？ - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 安裝程式將在您的磁碟上做出變更以安裝 %2。<br/><strong>您將無法復原這些變更。</strong> - + &Install now 現在安裝 (&I) - + Go &back 上一步 (&B) - - &Quit - 離開 (&Q) + + &Done + 完成(&D) - + + The installation is complete. Close the installer. + 安裝完成。關閉安裝程式。 + + + Error 錯誤 - + Installation Failed 安裝失敗 @@ -343,12 +336,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Installer %1 安裝程式 - + Show debug information 顯示除錯資訊 @@ -369,7 +362,7 @@ The installer will quit and all changes will be lost. CheckerWidget - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> 此電腦未滿足安裝 %1 的最低配備。<br/>安裝無法繼續。<a href="#details">詳細資訊...</a> @@ -379,17 +372,17 @@ The installer will quit and all changes will be lost. 此電腦未滿足一些安裝 %1 的推薦需求。<br/>安裝可以繼續，但部份功能可能會被停用。 - + This program will ask you some questions and set up %2 on your computer. 本程式將會問您一些問題並在您的電腦上安裝及設定 %2 。 - + For best results, please ensure that this computer: 為了得到最佳的結果，請確保此電腦： - + System requirements 系統需求 @@ -402,35 +395,35 @@ The installer will quit and all changes will be lost. 表單 - + After: 之後： - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>手動分割</strong><br/>您可以自行建立或重新調整分割區大小。 - + Boot loader location: 開機載入器位置： - + %1 will be shrunk to %2MB and a new %3MB partition will be created for %4. %1 將會被縮減容量到 %2MB 而一個新的 %3MB 分割區將會被建立為 %4。 - + Select storage de&vice: 選取儲存裝置(&V)： - - - - + + + + Current: 目前： @@ -440,71 +433,71 @@ The installer will quit and all changes will be lost. 重新使用 %1 作為 %2 的家目錄分割區。 - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>選取要縮減的分割區，然後拖曳底部條狀物來調整大小</strong> - + <strong>Select a partition to install on</strong> <strong>選取分割區以安裝在其上</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. 在這個系統上找不到任何的 EFI 系統分割區。請回到上一步並使用手動分割以設定 %1。 - + The EFI system partition at %1 will be used for starting %2. 在 %1 的 EFI 系統分割區將會在開始 %2 時使用。 - + EFI system partition: EFI 系統分割區： - + 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/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。 - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>抹除磁碟</strong><br/>這將會<font color="red">刪除</font>目前選取的儲存裝置上所有的資料。 - + 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/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。 - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>並存安裝</strong><br/>安裝程式將會縮減一個分割區以讓出空間給 %1。 - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>取代一個分割區</strong><br/>用 %1 取代一個分割區。 - + This storage device already has 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/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。 - + This storage device has multiple operating systems 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/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。 @@ -530,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. 已清除所有暫時掛載。 @@ -557,6 +550,11 @@ The installer will quit and all changes will be lost. Create a Partition 建立一個分割區 + + + MiB + MiB + Partition &Type: @@ -593,32 +591,27 @@ The installer will quit and all changes will be lost. 容量大小 (&z) ： - - MB - MB - - - + En&crypt 加密(&C) - + Logical 邏輯磁區 - + Primary 主要磁區 - + GPT GPT - + Mountpoint already in use. Please select another one. 掛載點使用中。請選擇其他的。 @@ -831,7 +824,7 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + 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。 @@ -933,17 +926,22 @@ The installer will quit and all changes will be lost. 容量大小 (&Z) ： - + + MiB + MiB + + + Fi&le System: 檔案系統 (&I)： - + Flags: 旗標： - + Mountpoint already in use. Please select another one. 掛載點使用中。請選擇其他的。 @@ -971,7 +969,7 @@ The installer will quit and all changes will be lost. 確認通關密語 - + Please enter the same passphrase in both boxes. 請在兩個框框中輸入相同的通關密語。 @@ -989,27 +987,27 @@ The installer will quit and all changes will be lost. 在 <strong>新的</strong>系統分割區 %2 上安裝 %1。 - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>. 設定 <strong>新的</strong> 不含掛載點 <strong>%1</strong> 的 %2 分割區。 - + Install %2 on %3 system partition <strong>%1</strong>. 在 %3 系統分割區 <strong>%1</strong> 上安裝 %2。 - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>. 為分割區 %3 <strong>%1</strong> 設定掛載點 <strong>%2</strong>。 - + Install boot loader on <strong>%1</strong>. 安裝開機載入器於 <strong>%1</strong>。 - + Setting up mount points. 正在設定掛載點。 @@ -1027,18 +1025,33 @@ The installer will quit and all changes will be lost. 現在重新啟動 (&R) - + <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 Live 環境。 + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + <h1>安裝失敗</h1><br/>%1 並未安裝到您的電腦上。<br/>錯誤訊息為：%2。 + FinishedViewStep - + Finish 完成 + + + Installation Complete + 安裝完成 + + + + The installation of %1 is complete. + %1 的安裝已完成。 + FormatPartitionJob @@ -1116,12 +1129,12 @@ The installer will quit and all changes will be lost. KeyboardPage - + Set keyboard model to %1.<br/> 設定鍵盤型號為 %1 。<br/> - + Set keyboard layout to %1/%2. 設定鍵盤佈局為 %1/%2 。 @@ -1137,15 +1150,25 @@ The installer will quit and all changes will be lost. LCLocaleDialog - + System locale setting 系統語系設定 - + 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>。 + + + &Cancel + 取消(&C) + + + + &OK + 確定(&O) + LicensePage @@ -1228,12 +1251,12 @@ The installer will quit and all changes will be lost. LocalePage - + The system language will be set to %1. 系統語言將會設定為 %1。 - + The numbers and dates locale will be set to %1. 數字與日期語系將會被設定為 %1。 @@ -1254,12 +1277,12 @@ The installer will quit and all changes will be lost. 變更...(&C) - + Set timezone to %1/%2.<br/> 設定時區為 %1/%2 。<br/> - + %1 (%2) Language (Country) %1 (%2) @@ -1330,17 +1353,17 @@ The installer will quit and all changes will be lost. NetInstallPage - + Name 名稱 - + Description 描述 - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) 網路安裝。（已停用：無法擷取軟體包清單，請檢查您的網路連線） @@ -1389,7 +1412,6 @@ The installer will quit and all changes will be lost. 您想使用何種登入名稱？ - @@ -1563,7 +1585,7 @@ The installer will quit and all changes will be lost. 安裝開機載入器在(&L)： - + Are you sure you want to create a new partition table on %1? 您是否確定要在 %1 上建立一個新的分割區表格？ @@ -1586,82 +1608,82 @@ The installer will quit and all changes will be lost. 將 %1 安裝在其他作業系統<strong>旁邊</strong>。 - + <strong>Erase</strong> disk and install %1. <strong>抹除</strong>磁碟並安裝 %1。 - + <strong>Replace</strong> a partition with %1. 以 %1 <strong>取代</strong>一個分割區。 - + <strong>Manual</strong> partitioning. <strong>手動</strong>分割 - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). 將 %1 安裝在磁碟 <strong>%2</strong> (%3) 上的另一個作業系統<strong>旁邊</strong>。 - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>抹除</strong> 磁碟 <strong>%2</strong> (%3) 並且安裝 %1。 - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. 以 %1 <strong>取代</strong> 一個在磁碟 <strong>%2</strong> (%3) 上的分割區。 - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). 在磁碟 <strong>%1</strong> (%2) 上<strong>手動</strong>分割。 - + Disk <strong>%1</strong> (%2) 磁碟 <strong>%1</strong> (%2) - + Current: 目前： - + After: 之後： - + No EFI system partition configured 未設定 EFI 系統分割區 - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>esp</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. 需要一個 EFI 系統分割區以啟動 %1。<br/><br/>要設定 EFI 系統分割區，回到上一步並選取或建立一個包含啟用的 <strong>esp</strong> 旗標以及掛載點 <strong>%2</strong> 的 FAT32 檔案系統。<br/><br/>您也可以不設定 EFI 系統分割區並繼續，但是您的系統可能會啟動失敗。 - + EFI system partition flag not set EFI 系統分割區旗標未設定 - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>esp</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. 需要一個 EFI 系統分割區以啟動 %1。<br/><br/>有一個掛載點設定為 <strong>%2</strong> 但未設定 <strong>esp</strong> 旗標的分割區。<br/>要設定此旗標，回到上一步並編輯分割區。<br/><br/>您也可以不設定旗標而繼續，但您的系統可能會啟動失敗。 - + Boot partition not encrypted 開機分割區未加密 - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. 單獨的開機分割區會與加密的根分割區一起設定，但是開機分割區並不會被加密。<br/><br/>這種設定可能會造成安全性問題，因為系統檔案放在未加密的分割區中。<br/>若您想要，您可以繼續，但是檔案系統的解鎖會在系統啟動後才發生。<br/>要加密開機分割區，回到上一頁並重新建立它，在分割區建立視窗中選取<strong>加密</strong>。 @@ -1680,22 +1702,22 @@ The installer will quit and all changes will be lost. 預設值 - + unknown 未知 - + extended 延伸分割區 - + unformatted 未格式化 - + swap swap @@ -1718,64 +1740,64 @@ The installer will quit and all changes will be lost. 選取要在哪裡安裝 %1。<br/><font color="red">警告：</font>這將會刪除所有在選定分割區中的檔案。 - + The selected item does not appear to be a valid partition. 選定的項目似乎不是一個有效的分割區。 - + %1 cannot be installed on empty space. Please select an existing partition. %1 無法在空白的空間中安裝。請選取一個存在的分割區。 - + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. %1 無法在延伸分割區上安裝。請選取一個存在的主要或邏輯分割區。 - + %1 cannot be installed on this partition. %1 無法在此分割區上安裝。 - + Data partition (%1) 資料分割區 (%1) - + Unknown system partition (%1) 未知的系統分割區 (%1) - + %1 system partition (%2) %1 系統分割區 (%2) - + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. <strong>%4</strong><br/><br/>分割區 %1 對 %2 來說太小了。請選取一個容量至少有 %3 GiB 的分割區。 - + <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 系統分割區。請回到上一步並使用手動分割以設定 %1。 - - - + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. <strong>%3</strong><br/><br/>%1 將會安裝在 %2 上。<br/><font color="red">警告： </font>所有在分割區 %2 上的資料都將會遺失。 - + The EFI system partition at %1 will be used for starting %2. 在 %1 的 EFI 系統分割區將會在開始 %2 時使用。 - + EFI system partition: EFI 系統分割區： @@ -1783,55 +1805,60 @@ The installer will quit and all changes will be lost. RequirementsChecker - + Gathering system information... 收集系統資訊中... - + has at least %1 GB available drive space 有至少 %1 GB 的可用磁碟空間 - + There is not enough drive space. At least %1 GB is required. 沒有足夠的磁碟空間。至少需要 %1 GB。 - + has at least %1 GB working memory 有至少 %1 GB 的可用記憶體 - + The system does not have enough working memory. At least %1 GB is required. 系統沒有足夠的記憶體。至少需要 %1 GB。 - + is plugged in to a power source 已插入外接電源 - + The system is not plugged in to a power source. 系統未插入外接電源。 - + is connected to the Internet 已連上網際網路 - + The system is not connected to the Internet. 系統未連上網際網路 - + The installer is not running with administrator rights. 安裝程式並未以管理員權限執行。 + + + The screen is too small to display the installer. + 螢幕太小了，沒辦法顯示安裝程式。 + ResizeFileSystemJob @@ -2067,42 +2094,42 @@ The installer will quit and all changes will be lost. SetPasswordJob - + Set password for user %1 為使用者 %1 設定密碼 - + Setting password for user %1. 正在為使用者 %1 設定密碼。 - + Bad destination system path. 非法的目標系統路徑。 - + rootMountPoint is %1 根掛載點為 %1 - + Cannot disable root account. 無法停用 root 帳號。 - + passwd terminated with error code %1. passwd 以錯誤代碼 %1 終止。 - + Cannot set password for user %1. 無法為使用者 %1 設定密碼。 - + usermod terminated with error code %1. usermod 以錯誤代碼 %1 終止。 @@ -2236,22 +2263,27 @@ The installer will quit and all changes will be lost. 關於(&A) - + <h1>Welcome to the %1 installer.</h1> <h1>歡迎使用 %1 安裝程式。</h1> - + + <h1>Welcome to the Calamares installer for %1.</h1> + <h1>歡迎使用 %1 的 Calamares 安裝程式。</h1> + + + About %1 installer 關於 %1 安裝程式 - - <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@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/>Copyright 2014-2017 Teo Mrnjavac <teo@kde.org><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 贊助。 + + <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/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 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 贊助。 - + %1 support %1 支援 diff --git a/lang/python.pot b/lang/python.pot new file mode 100644 index 000000000..ad66c1cab --- /dev/null +++ b/lang/python.pot @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: \n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Generate machine-id." + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Dummy python job." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Dummy python step {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "Processing packages (%(count)d / %(total)d)" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "Installing one package." +msgstr[1] "Installing %(num)d packages." + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "Removing one package." +msgstr[1] "Removing %(num)d packages." + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "Install packages." diff --git a/lang/python/ar/LC_MESSAGES/python.mo b/lang/python/ar/LC_MESSAGES/python.mo new file mode 100644 index 000000000..8a59291af Binary files /dev/null and b/lang/python/ar/LC_MESSAGES/python.mo differ diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po new file mode 100644 index 000000000..bdabbf28e --- /dev/null +++ b/lang/python/ar/LC_MESSAGES/python.po @@ -0,0 +1,61 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ar\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/ast/LC_MESSAGES/python.mo b/lang/python/ast/LC_MESSAGES/python.mo new file mode 100644 index 000000000..a4fa1fe81 Binary files /dev/null and b/lang/python/ast/LC_MESSAGES/python.mo differ diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po new file mode 100644 index 000000000..c3eb56943 --- /dev/null +++ b/lang/python/ast/LC_MESSAGES/python.po @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ast\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Xenerar machine-id." + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Trabayu maniquín de python." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Pasu maniquín de python {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/bg/LC_MESSAGES/python.mo b/lang/python/bg/LC_MESSAGES/python.mo new file mode 100644 index 000000000..470525ae3 Binary files /dev/null and b/lang/python/bg/LC_MESSAGES/python.mo differ diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po new file mode 100644 index 000000000..28b4fbb7c --- /dev/null +++ b/lang/python/bg/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: bg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/ca/LC_MESSAGES/python.mo b/lang/python/ca/LC_MESSAGES/python.mo new file mode 100644 index 000000000..efd56d034 Binary files /dev/null and b/lang/python/ca/LC_MESSAGES/python.mo differ diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po new file mode 100644 index 000000000..1ace6c80e --- /dev/null +++ b/lang/python/ca/LC_MESSAGES/python.po @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Davidmp , 2017\n" +"Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Generació de l'id. de la màquina." + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Tasca de python fictícia." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Pas de python fitctici {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "Processant paquets (%(count)d / %(total)d)" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "Instal·lant un paquet." +msgstr[1] "Instal·lant %(num)d paquets." + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "Eliminant un paquet." +msgstr[1] "Eliminant %(num)d paquets." + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "Instal·la els paquets." diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.mo b/lang/python/cs_CZ/LC_MESSAGES/python.mo new file mode 100644 index 000000000..f98f7f8ee Binary files /dev/null and b/lang/python/cs_CZ/LC_MESSAGES/python.mo differ diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po new file mode 100644 index 000000000..59616a830 --- /dev/null +++ b/lang/python/cs_CZ/LC_MESSAGES/python.po @@ -0,0 +1,56 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: pavelrz , 2017\n" +"Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: cs_CZ\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Vytvořit machine-id." + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Testovací úloha python." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Testovací krok {} python." + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "Instalovat balíčky." diff --git a/lang/python/da/LC_MESSAGES/python.mo b/lang/python/da/LC_MESSAGES/python.mo new file mode 100644 index 000000000..0521d0612 Binary files /dev/null and b/lang/python/da/LC_MESSAGES/python.mo differ diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po new file mode 100644 index 000000000..830e045e6 --- /dev/null +++ b/lang/python/da/LC_MESSAGES/python.po @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Dan Johansen (Strit) , 2017\n" +"Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: da\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Generere maskine-id." + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Dummy python-job." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Dummy python-trin {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "Forarbejder pakker (%(count)d / %(total)d)" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "Installerer én pakke." +msgstr[1] "Installer %(num)d pakker." + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "Fjerner én pakke." +msgstr[1] "Fjerne %(num)d pakker." + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "Installér pakker." diff --git a/lang/python/de/LC_MESSAGES/python.mo b/lang/python/de/LC_MESSAGES/python.mo new file mode 100644 index 000000000..aff49a3d1 Binary files /dev/null and b/lang/python/de/LC_MESSAGES/python.mo differ diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po new file mode 100644 index 000000000..654da411b --- /dev/null +++ b/lang/python/de/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/el/LC_MESSAGES/python.mo b/lang/python/el/LC_MESSAGES/python.mo new file mode 100644 index 000000000..c7d45e879 Binary files /dev/null and b/lang/python/el/LC_MESSAGES/python.mo differ diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po new file mode 100644 index 000000000..924667c68 --- /dev/null +++ b/lang/python/el/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: el\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/en_GB/LC_MESSAGES/python.mo b/lang/python/en_GB/LC_MESSAGES/python.mo new file mode 100644 index 000000000..b88e6d8f9 Binary files /dev/null and b/lang/python/en_GB/LC_MESSAGES/python.mo differ diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po new file mode 100644 index 000000000..9ced5a414 --- /dev/null +++ b/lang/python/en_GB/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/es/LC_MESSAGES/python.mo b/lang/python/es/LC_MESSAGES/python.mo new file mode 100644 index 000000000..9d1a6d89f Binary files /dev/null and b/lang/python/es/LC_MESSAGES/python.mo differ diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po new file mode 100644 index 000000000..440ead6b9 --- /dev/null +++ b/lang/python/es/LC_MESSAGES/python.po @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: strel , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Generar identificación-de-maquina." + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Tarea de python ficticia." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Paso {} de python ficticio" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "Procesando paquetes (%(count)d / %(total)d)" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "Instalando un paquete." +msgstr[1] "Instalando %(num)d paquetes." + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "Eliminando un paquete." +msgstr[1] "Eliminando %(num)d paquetes." + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "Instalar paquetes." diff --git a/lang/python/es_ES/LC_MESSAGES/python.mo b/lang/python/es_ES/LC_MESSAGES/python.mo new file mode 100644 index 000000000..35a601558 Binary files /dev/null and b/lang/python/es_ES/LC_MESSAGES/python.mo differ diff --git a/lang/python/es_ES/LC_MESSAGES/python.po b/lang/python/es_ES/LC_MESSAGES/python.po new file mode 100644 index 000000000..a07d525c7 --- /dev/null +++ b/lang/python/es_ES/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_ES\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/es_MX/LC_MESSAGES/python.mo b/lang/python/es_MX/LC_MESSAGES/python.mo new file mode 100644 index 000000000..73c58bb4a Binary files /dev/null and b/lang/python/es_MX/LC_MESSAGES/python.mo differ diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po new file mode 100644 index 000000000..72deb57ed --- /dev/null +++ b/lang/python/es_MX/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/es_PR/LC_MESSAGES/python.mo b/lang/python/es_PR/LC_MESSAGES/python.mo new file mode 100644 index 000000000..f3dd878be Binary files /dev/null and b/lang/python/es_PR/LC_MESSAGES/python.mo differ diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po new file mode 100644 index 000000000..14e075326 --- /dev/null +++ b/lang/python/es_PR/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_PR\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/et/LC_MESSAGES/python.mo b/lang/python/et/LC_MESSAGES/python.mo new file mode 100644 index 000000000..86e51fbf4 Binary files /dev/null and b/lang/python/et/LC_MESSAGES/python.mo differ diff --git a/lang/python/et/LC_MESSAGES/python.po b/lang/python/et/LC_MESSAGES/python.po new file mode 100644 index 000000000..3ade2d753 --- /dev/null +++ b/lang/python/et/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: et\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/eu/LC_MESSAGES/python.mo b/lang/python/eu/LC_MESSAGES/python.mo new file mode 100644 index 000000000..2b85ce42c Binary files /dev/null and b/lang/python/eu/LC_MESSAGES/python.mo differ diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po new file mode 100644 index 000000000..2f4c71e36 --- /dev/null +++ b/lang/python/eu/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: eu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/fa/LC_MESSAGES/python.mo b/lang/python/fa/LC_MESSAGES/python.mo new file mode 100644 index 000000000..be5db74c2 Binary files /dev/null and b/lang/python/fa/LC_MESSAGES/python.mo differ diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po new file mode 100644 index 000000000..9da47f1c0 --- /dev/null +++ b/lang/python/fa/LC_MESSAGES/python.po @@ -0,0 +1,51 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fa\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/fi_FI/LC_MESSAGES/python.mo b/lang/python/fi_FI/LC_MESSAGES/python.mo new file mode 100644 index 000000000..65215e4b3 Binary files /dev/null and b/lang/python/fi_FI/LC_MESSAGES/python.mo differ diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po new file mode 100644 index 000000000..98225c0f8 --- /dev/null +++ b/lang/python/fi_FI/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fi_FI\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/fr/LC_MESSAGES/python.mo b/lang/python/fr/LC_MESSAGES/python.mo new file mode 100644 index 000000000..2c39ac029 Binary files /dev/null and b/lang/python/fr/LC_MESSAGES/python.mo differ diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po new file mode 100644 index 000000000..f5af986a3 --- /dev/null +++ b/lang/python/fr/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/fr_CH/LC_MESSAGES/python.mo b/lang/python/fr_CH/LC_MESSAGES/python.mo new file mode 100644 index 000000000..44c786167 Binary files /dev/null and b/lang/python/fr_CH/LC_MESSAGES/python.mo differ diff --git a/lang/python/fr_CH/LC_MESSAGES/python.po b/lang/python/fr_CH/LC_MESSAGES/python.po new file mode 100644 index 000000000..5c665d8ab --- /dev/null +++ b/lang/python/fr_CH/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fr_CH\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/gl/LC_MESSAGES/python.mo b/lang/python/gl/LC_MESSAGES/python.mo new file mode 100644 index 000000000..b221e3812 Binary files /dev/null and b/lang/python/gl/LC_MESSAGES/python.mo differ diff --git a/lang/python/gl/LC_MESSAGES/python.po b/lang/python/gl/LC_MESSAGES/python.po new file mode 100644 index 000000000..a326be4be --- /dev/null +++ b/lang/python/gl/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: gl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/gu/LC_MESSAGES/python.mo b/lang/python/gu/LC_MESSAGES/python.mo new file mode 100644 index 000000000..e8861abe2 Binary files /dev/null and b/lang/python/gu/LC_MESSAGES/python.mo differ diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po new file mode 100644 index 000000000..557a796e5 --- /dev/null +++ b/lang/python/gu/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: gu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/he/LC_MESSAGES/python.mo b/lang/python/he/LC_MESSAGES/python.mo new file mode 100644 index 000000000..8db1c22da Binary files /dev/null and b/lang/python/he/LC_MESSAGES/python.mo differ diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po new file mode 100644 index 000000000..2c314f285 --- /dev/null +++ b/lang/python/he/LC_MESSAGES/python.po @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: he\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "חולל מספר סידורי של המכונה." + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "משימת דמה של Python." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "צעד דמה של Python {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "מעבד חבילות (%(count)d/%(total)d)" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "מתקין חבילה אחת." +msgstr[1] "מתקין %(num)d חבילות." + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "מסיר חבילה אחת." +msgstr[1] "מסיר %(num)d חבילות." + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "התקן חבילות." diff --git a/lang/python/hi/LC_MESSAGES/python.mo b/lang/python/hi/LC_MESSAGES/python.mo new file mode 100644 index 000000000..198aba348 Binary files /dev/null and b/lang/python/hi/LC_MESSAGES/python.mo differ diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po new file mode 100644 index 000000000..e108c12ac --- /dev/null +++ b/lang/python/hi/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/hr/LC_MESSAGES/python.mo b/lang/python/hr/LC_MESSAGES/python.mo new file mode 100644 index 000000000..4a4b060e1 Binary files /dev/null and b/lang/python/hr/LC_MESSAGES/python.mo differ diff --git a/lang/python/hr/LC_MESSAGES/python.po b/lang/python/hr/LC_MESSAGES/python.po new file mode 100644 index 000000000..61a1b53a2 --- /dev/null +++ b/lang/python/hr/LC_MESSAGES/python.po @@ -0,0 +1,56 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Lovro Kudelić , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Generiraj ID računala." + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Testni python posao." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Testni python korak {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "Obrađujem pakete (%(count)d / %(total)d)" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "Instaliram paket." +msgstr[1] "Instaliram %(num)d pakete." +msgstr[2] "Instaliram %(num)d pakete." + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "Uklanjam paket." +msgstr[1] "Uklanjam %(num)d pakete." +msgstr[2] "Uklanjam %(num)d pakete." + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "Instaliraj pakete." diff --git a/lang/python/hu/LC_MESSAGES/python.mo b/lang/python/hu/LC_MESSAGES/python.mo new file mode 100644 index 000000000..62231eb3e Binary files /dev/null and b/lang/python/hu/LC_MESSAGES/python.mo differ diff --git a/lang/python/hu/LC_MESSAGES/python.po b/lang/python/hu/LC_MESSAGES/python.po new file mode 100644 index 000000000..955764b81 --- /dev/null +++ b/lang/python/hu/LC_MESSAGES/python.po @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: miku84 , 2017\n" +"Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Számítógép azonosító generálása." + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Hamis PythonQt Job." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Hamis PythonQt {} lépés" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "Csomagok feldolgozása (%(count)d / %(total)d)" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "Csomagok telepítése." diff --git a/lang/python/id/LC_MESSAGES/python.mo b/lang/python/id/LC_MESSAGES/python.mo new file mode 100644 index 000000000..35b6cdcb0 Binary files /dev/null and b/lang/python/id/LC_MESSAGES/python.mo differ diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po new file mode 100644 index 000000000..9f7d9418a --- /dev/null +++ b/lang/python/id/LC_MESSAGES/python.po @@ -0,0 +1,52 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Wantoyo , 2017\n" +"Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: id\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Generate machine-id." + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Dummy python job." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Dummy python step {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/is/LC_MESSAGES/python.mo b/lang/python/is/LC_MESSAGES/python.mo new file mode 100644 index 000000000..26b8d0676 Binary files /dev/null and b/lang/python/is/LC_MESSAGES/python.mo differ diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po new file mode 100644 index 000000000..226a8deb3 --- /dev/null +++ b/lang/python/is/LC_MESSAGES/python.po @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: is\n" +"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Generate machine-id." + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Dummy python job." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Dummy python step {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "Vinnslupakkar (%(count)d / %(total)d)" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "Setja upp einn pakka." +msgstr[1] "Setur upp %(num)d pakka." + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "Fjarlægi einn pakka." +msgstr[1] "Fjarlægi %(num)d pakka." + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "Setja upp pakka." diff --git a/lang/python/it_IT/LC_MESSAGES/python.mo b/lang/python/it_IT/LC_MESSAGES/python.mo new file mode 100644 index 000000000..73aed3b46 Binary files /dev/null and b/lang/python/it_IT/LC_MESSAGES/python.mo differ diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po new file mode 100644 index 000000000..ff1f27430 --- /dev/null +++ b/lang/python/it_IT/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: it_IT\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/ja/LC_MESSAGES/python.mo b/lang/python/ja/LC_MESSAGES/python.mo new file mode 100644 index 000000000..828391d79 Binary files /dev/null and b/lang/python/ja/LC_MESSAGES/python.mo differ diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po new file mode 100644 index 000000000..8e24320fb --- /dev/null +++ b/lang/python/ja/LC_MESSAGES/python.po @@ -0,0 +1,52 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Takefumi Nagata , 2017\n" +"Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ja\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "machine-id の生成" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Dummy python job." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Dummy python step {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "パッケージの処理中 (%(count)d / %(total)d)" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] " %(num)d パッケージのインストール中。" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] " %(num)d パッケージの削除中。" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "パッケージのインストール" diff --git a/lang/python/kk/LC_MESSAGES/python.mo b/lang/python/kk/LC_MESSAGES/python.mo new file mode 100644 index 000000000..2b0afba0e Binary files /dev/null and b/lang/python/kk/LC_MESSAGES/python.mo differ diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po new file mode 100644 index 000000000..e1ffbb3e9 --- /dev/null +++ b/lang/python/kk/LC_MESSAGES/python.po @@ -0,0 +1,51 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: kk\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/lo/LC_MESSAGES/python.mo b/lang/python/lo/LC_MESSAGES/python.mo new file mode 100644 index 000000000..1a06a5e25 Binary files /dev/null and b/lang/python/lo/LC_MESSAGES/python.mo differ diff --git a/lang/python/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po new file mode 100644 index 000000000..b11a51f76 --- /dev/null +++ b/lang/python/lo/LC_MESSAGES/python.po @@ -0,0 +1,51 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: lo\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/lt/LC_MESSAGES/python.mo b/lang/python/lt/LC_MESSAGES/python.mo new file mode 100644 index 000000000..421ec7f2f Binary files /dev/null and b/lang/python/lt/LC_MESSAGES/python.mo differ diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po new file mode 100644 index 000000000..bda9e87c7 --- /dev/null +++ b/lang/python/lt/LC_MESSAGES/python.po @@ -0,0 +1,56 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Moo , 2017\n" +"Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: lt\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Generuoti machine-id." + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Fiktyvi python užduotis." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Fiktyvus python žingsnis {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "Apdorojami paketai (%(count)d / %(total)d)" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "Įdiegiamas %(num)d paketas." +msgstr[1] "Įdiegiami %(num)d paketai." +msgstr[2] "Įdiegiama %(num)d paketų." + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "Šalinamas %(num)d paketas." +msgstr[1] "Šalinami %(num)d paketai." +msgstr[2] "Šalinama %(num)d paketų." + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "Įdiegti paketus." diff --git a/lang/python/mr/LC_MESSAGES/python.mo b/lang/python/mr/LC_MESSAGES/python.mo new file mode 100644 index 000000000..ada8d963f Binary files /dev/null and b/lang/python/mr/LC_MESSAGES/python.mo differ diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po new file mode 100644 index 000000000..856d82b37 --- /dev/null +++ b/lang/python/mr/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: mr\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/nb/LC_MESSAGES/python.mo b/lang/python/nb/LC_MESSAGES/python.mo new file mode 100644 index 000000000..4a10eac44 Binary files /dev/null and b/lang/python/nb/LC_MESSAGES/python.mo differ diff --git a/lang/python/nb/LC_MESSAGES/python.po b/lang/python/nb/LC_MESSAGES/python.po new file mode 100644 index 000000000..40b2a710a --- /dev/null +++ b/lang/python/nb/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nb\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/nl/LC_MESSAGES/python.mo b/lang/python/nl/LC_MESSAGES/python.mo new file mode 100644 index 000000000..3ecd47e74 Binary files /dev/null and b/lang/python/nl/LC_MESSAGES/python.mo differ diff --git a/lang/python/nl/LC_MESSAGES/python.po b/lang/python/nl/LC_MESSAGES/python.po new file mode 100644 index 000000000..5bf84848d --- /dev/null +++ b/lang/python/nl/LC_MESSAGES/python.po @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Adriaan de Groot , 2017\n" +"Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Genereer machine-id" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Voorbeeld Python-taak" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Voorbeeld Python-stap {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/pl/LC_MESSAGES/python.mo b/lang/python/pl/LC_MESSAGES/python.mo new file mode 100644 index 000000000..fca89320a Binary files /dev/null and b/lang/python/pl/LC_MESSAGES/python.mo differ diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po new file mode 100644 index 000000000..ec6e5bbd2 --- /dev/null +++ b/lang/python/pl/LC_MESSAGES/python.po @@ -0,0 +1,58 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: m4sk1n , 2017\n" +"Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pl\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Generuj machine-id." + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Zadanie Dummy Python" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Krok dummy python {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "Przetwarzanie pakietów (%(count)d / %(total)d)" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "Instalowanie jednego pakietu." +msgstr[1] "Instalowanie %(num)d pakietów." +msgstr[2] "Instalowanie %(num)d pakietów." +msgstr[3] "Instalowanie pakietów (%(num)d)." + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "Usuwanie jednego pakietu." +msgstr[1] "Usuwanie %(num)d pakietów." +msgstr[2] "Usuwanie %(num)d pakietów." +msgstr[3] "Usuwanie pakietów (%(num)d)." + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "Zainstaluj pakiety." diff --git a/lang/python/pl_PL/LC_MESSAGES/python.mo b/lang/python/pl_PL/LC_MESSAGES/python.mo new file mode 100644 index 000000000..fc4620205 Binary files /dev/null and b/lang/python/pl_PL/LC_MESSAGES/python.mo differ diff --git a/lang/python/pl_PL/LC_MESSAGES/python.po b/lang/python/pl_PL/LC_MESSAGES/python.po new file mode 100644 index 000000000..35261da58 --- /dev/null +++ b/lang/python/pl_PL/LC_MESSAGES/python.po @@ -0,0 +1,57 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pl_PL\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/pt_BR/LC_MESSAGES/python.mo b/lang/python/pt_BR/LC_MESSAGES/python.mo new file mode 100644 index 000000000..e6c7bd3b9 Binary files /dev/null and b/lang/python/pt_BR/LC_MESSAGES/python.mo differ diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po new file mode 100644 index 000000000..11ee94ba9 --- /dev/null +++ b/lang/python/pt_BR/LC_MESSAGES/python.po @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: André Marcelo Alvarenga , 2017\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Gerar machine-id." + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Trabalho fictício python." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Etapa fictícia python {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "Processando pacotes (%(count)d / %(total)d)" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "Instalando um pacote." +msgstr[1] "Instalando %(num)d pacotes." + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "Removendo um pacote." +msgstr[1] "Removendo %(num)d pacotes." + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "Instalar pacotes." diff --git a/lang/python/pt_PT/LC_MESSAGES/python.mo b/lang/python/pt_PT/LC_MESSAGES/python.mo new file mode 100644 index 000000000..d1d52a7f9 Binary files /dev/null and b/lang/python/pt_PT/LC_MESSAGES/python.mo differ diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po new file mode 100644 index 000000000..485ecc10f --- /dev/null +++ b/lang/python/pt_PT/LC_MESSAGES/python.po @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Ricardo Simões , 2017\n" +"Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt_PT\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Gerar id-máquina" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Tarefa Dummy python." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Passo Dummy python {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "A processar pacotes (%(count)d / %(total)d)" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "A instalar um pacote." +msgstr[1] "A instalar %(num)d pacotes." + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "A remover um pacote." +msgstr[1] "A remover %(num)d pacotes." + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "Instalar pacotes." diff --git a/lang/python/ro/LC_MESSAGES/python.mo b/lang/python/ro/LC_MESSAGES/python.mo new file mode 100644 index 000000000..40d555edb Binary files /dev/null and b/lang/python/ro/LC_MESSAGES/python.mo differ diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po new file mode 100644 index 000000000..5a2d0706b --- /dev/null +++ b/lang/python/ro/LC_MESSAGES/python.po @@ -0,0 +1,55 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/ru/LC_MESSAGES/python.mo b/lang/python/ru/LC_MESSAGES/python.mo new file mode 100644 index 000000000..0faa2fe7c Binary files /dev/null and b/lang/python/ru/LC_MESSAGES/python.mo differ diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po new file mode 100644 index 000000000..215e7652d --- /dev/null +++ b/lang/python/ru/LC_MESSAGES/python.po @@ -0,0 +1,57 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/sk/LC_MESSAGES/python.mo b/lang/python/sk/LC_MESSAGES/python.mo new file mode 100644 index 000000000..405b02f88 Binary files /dev/null and b/lang/python/sk/LC_MESSAGES/python.mo differ diff --git a/lang/python/sk/LC_MESSAGES/python.po b/lang/python/sk/LC_MESSAGES/python.po new file mode 100644 index 000000000..edaf3ef4b --- /dev/null +++ b/lang/python/sk/LC_MESSAGES/python.po @@ -0,0 +1,55 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sk\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/sl/LC_MESSAGES/python.mo b/lang/python/sl/LC_MESSAGES/python.mo new file mode 100644 index 000000000..615d4b0b7 Binary files /dev/null and b/lang/python/sl/LC_MESSAGES/python.mo differ diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po new file mode 100644 index 000000000..75e1ce058 --- /dev/null +++ b/lang/python/sl/LC_MESSAGES/python.po @@ -0,0 +1,57 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/sr/LC_MESSAGES/python.mo b/lang/python/sr/LC_MESSAGES/python.mo new file mode 100644 index 000000000..d6f9d392c Binary files /dev/null and b/lang/python/sr/LC_MESSAGES/python.mo differ diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po new file mode 100644 index 000000000..3d7d8a376 --- /dev/null +++ b/lang/python/sr/LC_MESSAGES/python.po @@ -0,0 +1,55 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sr\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/sr@latin/LC_MESSAGES/python.mo b/lang/python/sr@latin/LC_MESSAGES/python.mo new file mode 100644 index 000000000..ec7faf311 Binary files /dev/null and b/lang/python/sr@latin/LC_MESSAGES/python.mo differ diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po new file mode 100644 index 000000000..2ec845ba1 --- /dev/null +++ b/lang/python/sr@latin/LC_MESSAGES/python.po @@ -0,0 +1,55 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sr@latin\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/sv/LC_MESSAGES/python.mo b/lang/python/sv/LC_MESSAGES/python.mo new file mode 100644 index 000000000..e27097ca7 Binary files /dev/null and b/lang/python/sv/LC_MESSAGES/python.mo differ diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po new file mode 100644 index 000000000..961a8dd0d --- /dev/null +++ b/lang/python/sv/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/th/LC_MESSAGES/python.mo b/lang/python/th/LC_MESSAGES/python.mo new file mode 100644 index 000000000..99aa63beb Binary files /dev/null and b/lang/python/th/LC_MESSAGES/python.mo differ diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po new file mode 100644 index 000000000..da9c4a44e --- /dev/null +++ b/lang/python/th/LC_MESSAGES/python.po @@ -0,0 +1,51 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: th\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/tr_TR/LC_MESSAGES/python.mo b/lang/python/tr_TR/LC_MESSAGES/python.mo new file mode 100644 index 000000000..046d5b5c9 Binary files /dev/null and b/lang/python/tr_TR/LC_MESSAGES/python.mo differ diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po new file mode 100644 index 000000000..9be847915 --- /dev/null +++ b/lang/python/tr_TR/LC_MESSAGES/python.po @@ -0,0 +1,52 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Demiray Muhterem , 2017\n" +"Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tr_TR\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "Makine kimliği oluştur." + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "Dummy python job." + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "Dummy python step {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "Paketler işleniyor (%(count)d / %(total)d)" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "%(num)d paket yükleniyor" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "%(num)d paket kaldırılıyor." + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "Paketleri yükle" diff --git a/lang/python/uk/LC_MESSAGES/python.mo b/lang/python/uk/LC_MESSAGES/python.mo new file mode 100644 index 000000000..d17a14087 Binary files /dev/null and b/lang/python/uk/LC_MESSAGES/python.mo differ diff --git a/lang/python/uk/LC_MESSAGES/python.po b/lang/python/uk/LC_MESSAGES/python.po new file mode 100644 index 000000000..c25e7e777 --- /dev/null +++ b/lang/python/uk/LC_MESSAGES/python.po @@ -0,0 +1,55 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: uk\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/ur/LC_MESSAGES/python.mo b/lang/python/ur/LC_MESSAGES/python.mo new file mode 100644 index 000000000..176215bcb Binary files /dev/null and b/lang/python/ur/LC_MESSAGES/python.mo differ diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po new file mode 100644 index 000000000..58ff76786 --- /dev/null +++ b/lang/python/ur/LC_MESSAGES/python.po @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ur\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/uz/LC_MESSAGES/python.mo b/lang/python/uz/LC_MESSAGES/python.mo new file mode 100644 index 000000000..037e2fa2a Binary files /dev/null and b/lang/python/uz/LC_MESSAGES/python.mo differ diff --git a/lang/python/uz/LC_MESSAGES/python.po b/lang/python/uz/LC_MESSAGES/python.po new file mode 100644 index 000000000..26cab9c97 --- /dev/null +++ b/lang/python/uz/LC_MESSAGES/python.po @@ -0,0 +1,51 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: uz\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/zh_CN/LC_MESSAGES/python.mo b/lang/python/zh_CN/LC_MESSAGES/python.mo new file mode 100644 index 000000000..7e0bff4f5 Binary files /dev/null and b/lang/python/zh_CN/LC_MESSAGES/python.mo differ diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po new file mode 100644 index 000000000..2d918d9bb --- /dev/null +++ b/lang/python/zh_CN/LC_MESSAGES/python.po @@ -0,0 +1,52 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "生成 machine-id。" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "占位 Python 任务。" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "占位 Python 步骤 {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "" diff --git a/lang/python/zh_TW/LC_MESSAGES/python.mo b/lang/python/zh_TW/LC_MESSAGES/python.mo new file mode 100644 index 000000000..2fb81f156 Binary files /dev/null and b/lang/python/zh_TW/LC_MESSAGES/python.mo differ diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po new file mode 100644 index 000000000..2d1398174 --- /dev/null +++ b/lang/python/zh_TW/LC_MESSAGES/python.po @@ -0,0 +1,52 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Jeff Huang , 2017\n" +"Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/modules/machineid/main.py:35 +msgid "Generate machine-id." +msgstr "生成 machine-id。" + +#: src/modules/dummypython/main.py:44 +msgid "Dummy python job." +msgstr "假的 python 工作。" + +#: src/modules/dummypython/main.py:97 +msgid "Dummy python step {}" +msgstr "假的 python step {}" + +#: src/modules/packages/main.py:59 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "正在處理軟體包 (%(count)d / %(total)d)" + +#: src/modules/packages/main.py:61 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "正在安裝 %(num)d 軟體包。" + +#: src/modules/packages/main.py:64 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "正在移除 %(num)d 軟體包。" + +#: src/modules/packages/main.py:68 +msgid "Install packages." +msgstr "安裝軟體包。" diff --git a/lang/translations.cmake b/lang/translations.cmake deleted file mode 100644 index dddad3149..000000000 --- a/lang/translations.cmake +++ /dev/null @@ -1,48 +0,0 @@ -macro(add_calamares_translations language) - list( APPEND CALAMARES_LANGUAGES ${ARGV} ) - - set( calamares_i18n_qrc_content "\n" ) - - # calamares and qt language files - set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}\n" ) - foreach( lang ${CALAMARES_LANGUAGES} ) - set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}calamares_${lang}.qm\n" ) - if( NOT lang STREQUAL "en" AND EXISTS ${QT_TRANSLATIONS_DIR}/qt_${lang}.qm ) - file( COPY ${QT_TRANSLATIONS_DIR}/qt_${lang}.qm DESTINATION ${CMAKE_CURRENT_BINARY_DIR} ) - set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}qt_${lang}.qm\n" ) - endif() - - # build explicitly enabled languages - list( APPEND TS_FILES "${CMAKE_SOURCE_DIR}/lang/calamares_${lang}.ts" ) - endforeach() - - set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}\n" ) - set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}\n" ) - - file( WRITE ${CMAKE_BINARY_DIR}/lang/calamares_i18n.qrc "${calamares_i18n_qrc_content}" ) - - qt5_add_translation(QM_FILES ${TS_FILES}) - - ## HACK HACK HACK - around rcc limitations to allow out of source-tree building - set( trans_file calamares_i18n ) - set( trans_srcfile ${CMAKE_BINARY_DIR}/lang/${trans_file}.qrc ) - set( trans_infile ${CMAKE_CURRENT_BINARY_DIR}/${trans_file}.qrc ) - set( trans_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${trans_file}.cxx ) - - # Copy the QRC file to the output directory - add_custom_command( - OUTPUT ${trans_infile} - COMMAND ${CMAKE_COMMAND} -E copy ${trans_srcfile} ${trans_infile} - MAIN_DEPENDENCY ${trans_srcfile} - ) - - # Run the resource compiler (rcc_options should already be set) - add_custom_command( - OUTPUT ${trans_outfile} - COMMAND "${Qt5Core_RCC_EXECUTABLE}" - ARGS ${rcc_options} -name ${trans_file} -o ${trans_outfile} ${trans_infile} - MAIN_DEPENDENCY ${trans_infile} - DEPENDS ${QM_FILES} - ) -endmacro() - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ff08b6ae5..c29a866d8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,16 +1,20 @@ -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 ) - -include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) -include_directories( ${CMAKE_CURRENT_LIST_DIR} ) +include_directories( + ${CMAKE_CURRENT_LIST_DIR} + ${CMAKE_CURRENT_LIST_DIR}/libcalamares + ${CMAKE_CURRENT_LIST_DIR}/libcalamaresui + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/libcalamares + ${CMAKE_CURRENT_BINARY_DIR}/libcalamaresui +) # library add_subdirectory( libcalamares ) -include_directories( ${CMAKE_CURRENT_BINARY_DIR}/libcalamaresui ) -include_directories( ${CMAKE_CURRENT_LIST_DIR}/libcalamaresui ) add_subdirectory( libcalamaresui ) # all things qml @@ -24,7 +28,3 @@ add_subdirectory( modules ) # branding components add_subdirectory( branding ) - -if( WITH_CRASHREPORTER ) - add_subdirectory( crashreporter ) -endif() diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index 4c14c9cae..c2d868c82 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -1,13 +1,24 @@ --- componentName: default +# This selects between different welcome texts. When false, uses +# the traditional "Welcome to the %1 installer.", and when true, +# uses "Welcome to the Calamares installer for %1." This allows +# to distinguish this installer from other installers for the +# same distribution. +welcomeStyleCalamares: false + +# Should the welcome image (productWelcome, below) be scaled +# up beyond its natural size? +welcomeExpandingLogo: true + strings: productName: Generic GNU/Linux shortProductName: Generic - version: 1.0 LTS - shortVersion: 1.0 - versionedName: Generic GNU/Linux 1.0 LTS "Rusty Trombone" - shortVersionedName: Generic 1.0 + version: 2017.8 LTS + shortVersion: 2017.8 + versionedName: Generic GNU/Linux 2017.8 LTS "Soapy Sousaphone" + shortVersionedName: Generic 2017.8 bootloaderEntryName: Generic productUrl: http://calamares.io/ supportUrl: http://calamares.io/bugs/ @@ -21,7 +32,16 @@ images: slideshow: "show.qml" +# Colors for text and background components. +# +# - sidebarBackground is the background of the sidebar +# - sidebarText is the (foreground) text color +# - sidebarTextHighlight sets the background of the selected (current) step. +# Optional, and defaults to the application palette. +# - sidebarSelect is the text color of the selected step. +# style: sidebarBackground: "#292F34" sidebarText: "#FFFFFF" sidebarTextSelect: "#292F34" + sidebarTextHighlight: "#D35400" diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt index 8248de6fb..6129aa553 100644 --- a/src/calamares/CMakeLists.txt +++ b/src/calamares/CMakeLists.txt @@ -27,8 +27,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../libcalamares - ${THIRDPARTY_DIR}/libcrashreporter-qt/src/ - ../libcalamares ../libcalamaresui ) @@ -37,10 +35,8 @@ include( GNUInstallDirs ) qt5_wrap_ui( calamaresUi_H ${calamaresUi} ) -#qt_add_resources( calamaresRc "../../resources.qrc" ) - # Translations -include( ${CMAKE_SOURCE_DIR}/lang/translations.cmake ) +include( CalamaresAddTranslations ) add_calamares_translations( ${CALAMARES_TRANSLATION_LANGUAGES} ) set( final_src ${calamaresUi_H} ${calamaresSources} ${calamaresRc} ${trans_outfile} ) @@ -53,11 +49,6 @@ SET_TARGET_PROPERTIES(calamares_bin RUNTIME_OUTPUT_NAME calamares ) -if( WITH_CRASHREPORTER ) - list( APPEND LINK_LIBRARIES ${LINK_LIBRARIES} pthread crashreporter-handler ) -endif() - -qt5_use_modules( calamares_bin Core Widgets ) target_link_libraries( calamares_bin PRIVATE ${CALAMARES_LIBRARIES} diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index 57f9286ae..eb3289083 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -42,16 +43,29 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) CALAMARES_RETRANSLATE( setWindowTitle( tr( "%1 Installer" ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ProductName ) ) ); + .arg( *Calamares::Branding::ProductName ) ); ) - setMinimumSize( 1010, 520 ); - QSize availableSize = qApp->desktop()->availableGeometry( this ).size(); - int w = qBound( 1010, CalamaresUtils::defaultFontHeight() * 60, availableSize.width() ); - int h = qBound( 520, CalamaresUtils::defaultFontHeight() * 36, availableSize.height() ); + using CalamaresUtils::windowMinimumHeight; + using CalamaresUtils::windowMinimumWidth; + using CalamaresUtils::windowPreferredHeight; + using CalamaresUtils::windowPreferredWidth; - cDebug() << "Proposed window size:" << w << h; + QSize availableSize = qApp->desktop()->availableGeometry( this ).size(); + + cDebug() << "Available size" << availableSize; + + if ( ( availableSize.width() < windowPreferredWidth ) || ( availableSize.height() < windowPreferredHeight ) ) + cDebug() << " Small screen detected."; + QSize minimumSize( qBound( windowMinimumWidth, availableSize.width(), windowPreferredWidth ), + qBound( windowMinimumHeight, availableSize.height(), windowPreferredHeight ) ); + setMinimumSize( minimumSize ); + + + int w = qBound( minimumSize.width(), CalamaresUtils::defaultFontHeight() * 60, availableSize.width() ); + int h = qBound( minimumSize.height(), CalamaresUtils::defaultFontHeight() * 36, availableSize.height() ); + + cDebug() << " Proposed window size:" << w << h; resize( w, h ); QBoxLayout* mainLayout = new QHBoxLayout; @@ -62,7 +76,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) QBoxLayout* sideLayout = new QVBoxLayout; sideBox->setLayout( sideLayout ); - sideBox->setFixedWidth( qMax( 190, CalamaresUtils::defaultFontHeight() * 12 ) ); + sideBox->setFixedWidth( qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) ); sideBox->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); QHBoxLayout* logoLayout = new QHBoxLayout; @@ -117,9 +131,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) else { if ( m_debugWindow ) - { m_debugWindow->deleteLater(); - } } } ); } @@ -127,7 +139,20 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) CalamaresUtils::unmarginLayout( sideLayout ); CalamaresUtils::unmarginLayout( mainLayout ); - Calamares::ViewManager* vm = new Calamares::ViewManager( this ); + Calamares::ViewManager* vm = Calamares::ViewManager::instance( this ); + connect( vm, &Calamares::ViewManager::enlarge, this, &CalamaresWindow::enlarge ); mainLayout->addWidget( vm->centralWidget() ); } + +void +CalamaresWindow::enlarge( QSize enlarge ) +{ + auto mainGeometry = this->geometry(); + QSize availableSize = qApp->desktop()->availableGeometry( this ).size(); + + auto h = qBound( 0, mainGeometry.height() + enlarge.height(), availableSize.height() ); + auto w = this->size().width(); + + resize( w, h ); +} diff --git a/src/calamares/CalamaresWindow.h b/src/calamares/CalamaresWindow.h index 7b2cfa6fa..00f790f5a 100644 --- a/src/calamares/CalamaresWindow.h +++ b/src/calamares/CalamaresWindow.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -37,6 +38,14 @@ public: CalamaresWindow( QWidget* parent = nullptr ); virtual ~CalamaresWindow() {} +public slots: + /** + * This asks the main window to grow by @p enlarge pixels, to accomodate + * larger-than-expected window contents. The enlargement may be silently + * ignored. + */ + void enlarge( QSize enlarge ); + private: QPointer< Calamares::DebugWindow > m_debugWindow; }; diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp index ec6c233a1..a265d1e31 100644 --- a/src/calamares/main.cpp +++ b/src/calamares/main.cpp @@ -23,9 +23,6 @@ #include "utils/CalamaresUtils.h" #include "utils/Logger.h" #include "CalamaresConfig.h" -#ifdef WITH_CRASHREPORTER - #include "libcrashreporter-handler/Handler.h" -#endif #include #include @@ -36,13 +33,6 @@ main( int argc, char* argv[] ) { CalamaresApplication a( argc, argv ); -#ifdef WITH_CRASHREPORTER - CrashReporter::Handler* handler = - new CrashReporter::Handler( QDir::tempPath(), - true, - "calamares_crash_reporter" ); -#endif - QCommandLineParser parser; parser.setApplicationDescription( "Distribution-independent installer framework" ); parser.addHelpOption(); diff --git a/src/calamares/progresstree/ProgressTreeDelegate.cpp b/src/calamares/progresstree/ProgressTreeDelegate.cpp index 4b2ab65bb..34835c8fa 100644 --- a/src/calamares/progresstree/ProgressTreeDelegate.cpp +++ b/src/calamares/progresstree/ProgressTreeDelegate.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -63,9 +64,7 @@ ProgressTreeDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const { - bool isFirstLevel = !index.parent().isValid(); - - QStyleOptionViewItemV4 opt = option; + QStyleOptionViewItem opt = option; painter->save(); @@ -104,7 +103,12 @@ ProgressTreeDelegate::paintViewStep( QPainter* painter, { painter->setPen( Calamares::Branding::instance()-> styleString( Calamares::Branding::SidebarTextSelect ) ); - painter->setBrush( APP->mainWindow()->palette().background() ); + QString textHighlight = Calamares::Branding::instance()-> + styleString( Calamares::Branding::SidebarTextHighlight ); + if ( textHighlight.isEmpty() ) + painter->setBrush( APP->mainWindow()->palette().background() ); + else + painter->setBrush( QColor( textHighlight ) ); } painter->fillRect( option.rect, painter->brush().color() ); diff --git a/src/calamares/progresstree/ProgressTreeModel.cpp b/src/calamares/progresstree/ProgressTreeModel.cpp index dbe8315eb..50a1b6e50 100644 --- a/src/calamares/progresstree/ProgressTreeModel.cpp +++ b/src/calamares/progresstree/ProgressTreeModel.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -96,6 +97,10 @@ ProgressTreeModel::data( const QModelIndex& index, int role ) const QVariant ProgressTreeModel::headerData( int section, Qt::Orientation orientation, int role ) const { + Q_UNUSED( section ); + Q_UNUSED( orientation ); + Q_UNUSED( role ); + return QVariant(); } @@ -146,12 +151,11 @@ ProgressTreeModel::indexFromItem( ProgressTreeItem* item ) if ( !item || !item->parent() ) return QModelIndex(); - // Reconstructs a QModelIndex from a ProgressTreeItem that is somewhere in the tree. - // Traverses the item to the root node, then rebuilds the qmodeindices from there + // Traverses the item to the root node, then rebuilds the qmodelindices from there // back down; each int is the row of that item in the parent. /** - * In this diagram, if the \param item is G, childIndexList will contain [0, 2, 0] + * In this diagram, if the item is G, childIndexList will contain [0, 2, 0] * * A * D diff --git a/src/calamares/progresstree/ProgressTreeModel.h b/src/calamares/progresstree/ProgressTreeModel.h index 60db77939..80ce6dc6b 100644 --- a/src/calamares/progresstree/ProgressTreeModel.h +++ b/src/calamares/progresstree/ProgressTreeModel.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Teo Mrnjavac + * 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 @@ -39,7 +40,7 @@ public: }; explicit ProgressTreeModel( QObject* parent = nullptr ); - virtual ~ProgressTreeModel(); + virtual ~ProgressTreeModel() override; // Reimplemented from QAbstractItemModel Qt::ItemFlags flags( const QModelIndex& index ) const override; diff --git a/src/calamares/progresstree/ProgressTreeView.h b/src/calamares/progresstree/ProgressTreeView.h index fae75d0dc..11738b193 100644 --- a/src/calamares/progresstree/ProgressTreeView.h +++ b/src/calamares/progresstree/ProgressTreeView.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Teo Mrnjavac + * 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 @@ -34,8 +35,8 @@ class ProgressTreeView : public QTreeView public: static ProgressTreeView* instance(); - explicit ProgressTreeView( QWidget* parent = 0 ); - virtual ~ProgressTreeView(); + explicit ProgressTreeView( QWidget* parent = nullptr ); + virtual ~ProgressTreeView() override; /** * @brief setModel assigns a model to this view. diff --git a/src/calamares/progresstree/ViewStepItem.cpp b/src/calamares/progresstree/ViewStepItem.cpp index d2fff08ca..b54fa07eb 100644 --- a/src/calamares/progresstree/ViewStepItem.cpp +++ b/src/calamares/progresstree/ViewStepItem.cpp @@ -46,6 +46,7 @@ void ViewStepItem::appendChild( ProgressTreeItem* item ) { Q_ASSERT( false ); + Q_UNUSED( item ); } diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt deleted file mode 100644 index 20f16575b..000000000 --- a/src/crashreporter/CMakeLists.txt +++ /dev/null @@ -1,47 +0,0 @@ -PROJECT( CrashReporter ) -cmake_policy(SET CMP0017 NEW) - -set(CALAMARES_CRASH_REPORTER_TARGET calamares_crash_reporter) - -list(APPEND crashreporter_SOURCES main.cpp) -list(APPEND crashreporter_RC resources.qrc) - -qt5_wrap_ui( crashreporter_UI_HEADERS ${crashreporter_UI} ) -qt5_add_resources( crashreporter_RC_RCC ${crashreporter_RC} ) - - -if(BUILD_RELEASE) - set(CRASHREPORTER_RELEASE_CHANNEL "release") -else() - set(CRASHREPORTER_RELEASE_CHANNEL "nightly") -endif() - -set(CRASHREPORTER_SUBMIT_URL "https://calamares.io/oops/addreport.php") -set(CRASHREPORTER_ICON ":/squid.svg") -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CrashReporterConfig.h.in - ${CMAKE_CURRENT_BINARY_DIR}/CrashReporterConfig.h) - - -include_directories(${CMAKE_CURRENT_BINARY_DIR} - ../../libcalamares - ../../libcalamaresui - ../../thirdparty/libcrashreporter-qt/src -) - -add_executable( ${CALAMARES_CRASH_REPORTER_TARGET} - ${crashreporter_SOURCES} - ${crashreporter_HEADERS_MOC} - ${crashreporter_UI_HEADERS} - ${crashreporter_RC_RCC} -) - -target_link_libraries( ${CALAMARES_CRASH_REPORTER_TARGET} - ${CALAMARES_LIBRARIES} - crashreporter-gui - ${QT_LIBRARIES} -) - -set_target_properties(${CALAMARES_CRASH_REPORTER_TARGET} PROPERTIES AUTOMOC ON) -install(TARGETS ${CALAMARES_CRASH_REPORTER_TARGET} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) - -qt5_use_modules(${CALAMARES_CRASH_REPORTER_TARGET} Widgets Network) diff --git a/src/crashreporter/CrashReporterConfig.h.in b/src/crashreporter/CrashReporterConfig.h.in deleted file mode 100644 index c1df8f8df..000000000 --- a/src/crashreporter/CrashReporterConfig.h.in +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef CRASHREPORTERCONFIG_H -#define CRASHREPORTERCONFIG_H - -// QCoreApplication settings for QSettings -#cmakedefine CALAMARES_ORGANIZATION_NAME "${CALAMARES_ORGANIZATION_NAME}" -#cmakedefine CALAMARES_ORGANIZATION_DOMAIN "${CALAMARES_ORGANIZATION_DOMAIN}" -#cmakedefine CALAMARES_APPLICATION_NAME "${CALAMARES_APPLICATION_NAME}" -#cmakedefine CALAMARES_VERSION "${CALAMARES_VERSION}" - - -#define CRASHREPORTER_BUILD_ID "@CMAKE_DATESTAMP_YEAR@@CMAKE_DATESTAMP_MONTH@@CMAKE_DATESTAMP_DAY@000000" - -#define CRASHREPORTER_RELEASE_CHANNEL "@CRASHREPORTER_RELEASE_CHANNEL@" - -#define CRASHREPORTER_PRODUCT_NAME "@CALAMARES_APPLICATION_NAME@" - -#define CRASHREPORTER_VERSION_STRING "@CALAMARES_VERSION_STRING@" - -#define CRASHREPORTER_SUBMIT_URL "@CRASHREPORTER_SUBMIT_URL@" - -#define CRASHREPORTER_ICON "@CRASHREPORTER_ICON@" - -#endif // CRASHREPORTERCONFIG_H diff --git a/src/crashreporter/main.cpp b/src/crashreporter/main.cpp deleted file mode 100644 index 17e6fd13b..000000000 --- a/src/crashreporter/main.cpp +++ /dev/null @@ -1,166 +0,0 @@ -/* === This file is part of Calamares - === - * - * Copyright 2010-2011, Christian Muehlhaeuser - * Copyright 2015-2016, Teo Mrnjavac - * - * Calamares is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Calamares is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calamares. If not, see . - */ - -#include - -#include - -#include "CrashReporterConfig.h" - -#include -#include -#include -#include -#include - -#include "utils/CalamaresUtils.h" -#include "utils/Logger.h" - -#include - -#ifdef Q_OS_WIN - #include - #include -#endif - - -#ifdef Q_OS_LINUX -const char* k_usage = - "Usage:\n" - " CrashReporter \n"; -#else -const char* k_usage = - "Usage:\n" - " CrashReporter \n"; -#endif - -int main( int argc, char* argv[] ) -{ -#ifdef Q_OS_WIN // log to console window - if ( fileno( stdout ) != -1 && _get_osfhandle( fileno( stdout ) ) != -1 ) - { - /* stdout is fine, presumably redirected to a file or pipe */ - } - else - { - typedef BOOL (WINAPI * AttachConsole_t) (DWORD); - AttachConsole_t p_AttachConsole = (AttachConsole_t) GetProcAddress( GetModuleHandleW( L"kernel32.dll" ), "AttachConsole" ); - - if ( p_AttachConsole != NULL && p_AttachConsole( ATTACH_PARENT_PROCESS ) ) - { - _wfreopen ( L"CONOUT$", L"w", stdout ); - dup2( fileno( stdout ), 1 ); - _wfreopen ( L"CONOUT$", L"w", stderr ); - dup2( fileno( stderr ), 2 ); - } - } -#endif - - // used by some Qt stuff, eg QSettings - // leave first! As Settings object is created quickly - QCoreApplication::setOrganizationName( QLatin1String( CALAMARES_ORGANIZATION_NAME ) ); - QCoreApplication::setOrganizationDomain( QLatin1String( CALAMARES_ORGANIZATION_DOMAIN ) ); - QCoreApplication::setApplicationName( QLatin1String( CALAMARES_APPLICATION_NAME ) ); - QCoreApplication::setApplicationVersion( QLatin1String( CALAMARES_VERSION ) ); - - QApplication app( argc, argv ); - CalamaresUtils::installTranslator( QLocale::system(), QString(), &app ); - -#ifdef Q_OS_LINUX - if ( app.arguments().size() != 8 ) -#else - if ( app.arguments().size() != 2 ) -#endif - { - std::cout << k_usage; - return 1; - } - cDebug() << "Arguments list:" << app.arguments().join( ", " ); - - CrashReporter reporter( QUrl( CRASHREPORTER_SUBMIT_URL ), app.arguments() ); - - #ifdef CRASHREPORTER_ICON - reporter.setLogo( QPixmap( CRASHREPORTER_ICON ) ); - #endif - reporter.setWindowTitle( CRASHREPORTER_PRODUCT_NAME ); - reporter.setText("

Sorry!" - " " CRASHREPORTER_PRODUCT_NAME " crashed. Please tell us " - "about it! " CRASHREPORTER_PRODUCT_NAME " has created an error " - "report for you that can help improve the stability in the " - "future. You can now send this report directly to the " - CRASHREPORTER_PRODUCT_NAME " developers.

Can you tell us " - "what you were doing when this happened?

"); - reporter.setBottomText(QString()); - - reporter.setReportData( "BuildID", CRASHREPORTER_BUILD_ID ); - reporter.setReportData( "ProductName", CRASHREPORTER_PRODUCT_NAME ); - reporter.setReportData( "Version", CRASHREPORTER_VERSION_STRING ); - reporter.setReportData( "ReleaseChannel", CRASHREPORTER_RELEASE_CHANNEL); - - //reporter.setReportData( "timestamp", QByteArray::number( QDateTime::currentDateTime().toTime_t() ) ); - - - - // add parameters - -// QList pairs; -// pairs //<< Pair( "BuildID", buildId.toUtf8() ) -// << Pair( ) -// //<< Pair( "Version", CalamaresUtils::appFriendlyVersion().toLocal8Bit() ) -// //<< Pair( "Vendor", "Tomahawk" ) -// //<< Pair( ) - - // << Pair("InstallTime", "1357622062") - // << Pair("Theme", "classic/1.0") - // << Pair("Version", "30") - // << Pair("id", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") - // << Pair("Vendor", "Mozilla") - // << Pair("EMCheckCompatibility", "true") - // << Pair("Throttleable", "0") - // << Pair("URL", "http://code.google.com/p/crashme/") - // << Pair("version", "20.0a1") - // << Pair("CrashTime", "1357770042") - // << Pair("submitted_timestamp", "2013-01-09T22:21:18.646733+00:00") - // << Pair("buildid", "20130107030932") - // << Pair("timestamp", "1357770078.646789") - // << Pair("Notes", "OpenGL: NVIDIA Corporation -- GeForce 8600M GT/PCIe/SSE2 -- 3.3.0 NVIDIA 313.09 -- texture_from_pixmap\r\n") - // << Pair("StartupTime", "1357769913") - // << Pair("FramePoisonSize", "4096") - // << Pair("FramePoisonBase", "7ffffffff0dea000") - // << Pair("Add-ons", "%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:20.0a1,crashme%40ted.mielczarek.org:0.4") - // << Pair("SecondsSinceLastCrash", "1831736") - // << Pair("ProductName", "WaterWolf") - // << Pair("legacy_processing", "0") - // << Pair("ProductID", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") - - ; - - // send log - QFile logFile( CalamaresUtils::appLogDir().filePath( "Calamares.log" ) ); - logFile.open( QFile::ReadOnly ); - reporter.setReportData( "upload_file_calamareslog", - gzip_compress( logFile.readAll() ), - "application/x-gzip", - QFileInfo( logFile ).fileName().toUtf8()); - logFile.close(); - - reporter.show(); - - return app.exec(); -} diff --git a/src/crashreporter/resources.qrc b/src/crashreporter/resources.qrc deleted file mode 100644 index 4618c8f94..000000000 --- a/src/crashreporter/resources.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - ../../data/images/squid.svg - - diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index fd94e3eab..d52e60bfa 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -1,9 +1,11 @@ -project( libcalamares ) +project( libcalamares CXX ) -add_definitions( ${QT_DEFINITIONS} ) -add_definitions( -DQT_SHARED ) -add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS ) -add_definitions( -DDLLEXPORT_PRO ) +add_definitions( + ${QT_DEFINITIONS} + -DQT_SHARED + -DQT_SHAREDPOINTER_TRACK_POINTERS + -DDLLEXPORT_PRO +) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresConfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h ) @@ -16,27 +18,27 @@ set( libSources Job.cpp JobQueue.cpp ProcessJob.cpp - - kdsingleapplicationguard/kdsingleapplicationguard.cpp - kdsingleapplicationguard/kdsharedmemorylocker.cpp - kdsingleapplicationguard/kdtoolsglobal.cpp - kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp - +) +set( utilsSources utils/CalamaresUtils.cpp utils/CalamaresUtilsSystem.cpp utils/Logger.cpp utils/PluginFactory.cpp utils/Retranslator.cpp ) +set( kdsagSources + kdsingleapplicationguard/kdsingleapplicationguard.cpp + kdsingleapplicationguard/kdsharedmemorylocker.cpp + kdsingleapplicationguard/kdtoolsglobal.cpp + kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp +) +mark_thirdparty_code( ${kdsagSources} ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - - ${QT_INCLUDE_DIR} ) - if( WITH_PYTHON ) set( libSources ${libSources} @@ -44,6 +46,9 @@ if( WITH_PYTHON ) PythonJob.cpp PythonJobApi.cpp ) + set_source_files_properties( PythonJob.cpp + PROPERTIES COMPILE_FLAGS "${SUPPRESS_BOOST_WARNINGS}" + ) include_directories(${PYTHON_INCLUDE_DIRS}) link_directories(${PYTHON_LIBRARIES}) @@ -73,7 +78,7 @@ if( WITH_PYTHONQT ) endif() -add_library( calamares SHARED ${libSources} ) +add_library( calamares SHARED ${libSources} ${kdsagSources} ${utilsSources} ) set_target_properties( calamares PROPERTIES AUTOMOC TRUE @@ -81,17 +86,9 @@ set_target_properties( calamares SOVERSION ${CALAMARES_VERSION_SHORT} ) -qt5_use_modules( calamares Core ) - - target_link_libraries( calamares - LINK_PRIVATE - # internal deps, if any - ${OPTIONAL_PRIVATE_LIBRARIES} - - LINK_PUBLIC - # External deps - Qt5::Core + LINK_PRIVATE ${OPTIONAL_PRIVATE_LIBRARIES} + LINK_PUBLIC Qt5::Core ) install( TARGETS calamares diff --git a/src/libcalamares/CalamaresConfig.h.in b/src/libcalamares/CalamaresConfig.h.in index f278853a9..6fbab422c 100644 --- a/src/libcalamares/CalamaresConfig.h.in +++ b/src/libcalamares/CalamaresConfig.h.in @@ -10,7 +10,6 @@ //cmakedefines for CMake variables (e.g. for optdepends) go here #cmakedefine WITH_PYTHON -#cmakedefine WITH_CRASHREPORTER #cmakedefine WITH_PYTHONQT #endif // CALAMARESCONFIG_H diff --git a/src/libcalamares/CppJob.cpp b/src/libcalamares/CppJob.cpp index 1925e398b..73868799a 100644 --- a/src/libcalamares/CppJob.cpp +++ b/src/libcalamares/CppJob.cpp @@ -40,6 +40,8 @@ CppJob::setModuleInstanceKey( const QString& instanceKey ) void CppJob::setConfigurationMap( const QVariantMap& configurationMap ) -{} +{ + Q_UNUSED( configurationMap ); +} } diff --git a/src/libcalamares/GlobalStorage.cpp b/src/libcalamares/GlobalStorage.cpp index 1ade3d3bc..36405ce87 100644 --- a/src/libcalamares/GlobalStorage.cpp +++ b/src/libcalamares/GlobalStorage.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -17,12 +18,14 @@ */ #include "GlobalStorage.h" +#include "JobQueue.h" #include "utils/Logger.h" #ifdef WITH_PYTHON #include "PythonHelper.h" + #undef slots #include #include @@ -98,9 +101,22 @@ GlobalStorage::debugDump() const namespace CalamaresPython { +Calamares::GlobalStorage* GlobalStoragePythonWrapper::s_gs_instance = nullptr; + +// The special handling for nullptr is only for the testing +// script for the python bindings, which passes in None; +// normal use will have a GlobalStorage from JobQueue::instance() +// passed in. Testing use will leak the allocated GlobalStorage +// object, but that's OK for testing. GlobalStoragePythonWrapper::GlobalStoragePythonWrapper( Calamares::GlobalStorage* gs ) - : m_gs( gs ) -{} + : m_gs( gs ? gs : s_gs_instance ) +{ + if (!m_gs) + { + s_gs_instance = new Calamares::GlobalStorage; + m_gs = s_gs_instance; + } +} bool GlobalStoragePythonWrapper::contains( const std::string& key ) const @@ -124,7 +140,6 @@ GlobalStoragePythonWrapper::insert( const std::string& key, CalamaresPython::variantFromPyObject( value ) ); } - bp::list GlobalStoragePythonWrapper::keys() const { diff --git a/src/libcalamares/GlobalStorage.h b/src/libcalamares/GlobalStorage.h index 301800adc..0ff56ac62 100644 --- a/src/libcalamares/GlobalStorage.h +++ b/src/libcalamares/GlobalStorage.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -85,8 +86,15 @@ public: boost::python::list keys() const; int remove( const std::string& key ); boost::python::api::object value( const std::string& key ) const; + + // This is a helper for scripts that do not go through + // the JobQueue (i.e. the module testpython script), + // which allocate their own (singleton) GlobalStorage. + static Calamares::GlobalStorage* globalStorageInstance() { return s_gs_instance; } + private: Calamares::GlobalStorage* m_gs; + static Calamares::GlobalStorage* s_gs_instance; // See globalStorageInstance() }; } // namespace CalamaresPython diff --git a/src/libcalamares/Job.cpp b/src/libcalamares/Job.cpp index bf9229f7c..26ee94464 100644 --- a/src/libcalamares/Job.cpp +++ b/src/libcalamares/Job.cpp @@ -21,6 +21,12 @@ namespace Calamares { +JobResult::JobResult( JobResult&& rhs ) : + m_ok( rhs.m_ok ) + , m_message( std::move( rhs.m_message ) ) + , m_details( std::move( rhs.m_details ) ) +{ +} JobResult::operator bool() const { @@ -55,7 +61,6 @@ JobResult::setDetails( const QString& details ) m_details = details; } - JobResult JobResult::ok() { diff --git a/src/libcalamares/Job.h b/src/libcalamares/Job.h index b9d3baf85..218abb72b 100644 --- a/src/libcalamares/Job.h +++ b/src/libcalamares/Job.h @@ -29,6 +29,9 @@ namespace Calamares { class DLLEXPORT JobResult { public: + JobResult( const JobResult& rhs ) = delete; + JobResult( JobResult&& rhs ); + virtual ~JobResult() {} virtual operator bool() const; diff --git a/src/libcalamares/ProcessJob.h b/src/libcalamares/ProcessJob.h index ba6e650f6..43fdf254e 100644 --- a/src/libcalamares/ProcessJob.h +++ b/src/libcalamares/ProcessJob.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Teo Mrnjavac + * 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 @@ -32,7 +33,7 @@ public: bool runInChroot = false, int secondsTimeout = 30, QObject* parent = nullptr ); - virtual ~ProcessJob(); + virtual ~ProcessJob() override; QString prettyName() const override; QString prettyStatusMessage() const override; diff --git a/src/libcalamares/PythonHelper.cpp b/src/libcalamares/PythonHelper.cpp index b252f90b2..14a63f4d3 100644 --- a/src/libcalamares/PythonHelper.cpp +++ b/src/libcalamares/PythonHelper.cpp @@ -316,4 +316,4 @@ Helper::handleLastError() } -} // namespace Calamares +} // namespace CalamaresPython diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp index 32e019eb0..1a8a9701a 100644 --- a/src/libcalamares/PythonJob.cpp +++ b/src/libcalamares/PythonJob.cpp @@ -215,6 +215,19 @@ BOOST_PYTHON_MODULE( libcalamares ) "Applying the function to a string obscured by this function will result " "in the original string." ); + + + bp::def( + "gettext_languages", + &CalamaresPython::gettext_languages, + "Returns list of languages (most to least-specific) for gettext." + ); + + bp::def( + "gettext_path", + &CalamaresPython::gettext_path, + "Returns path for gettext search." + ); } @@ -228,6 +241,7 @@ PythonJob::PythonJob( const QString& scriptFile, : Job( parent ) , m_scriptFile( scriptFile ) , m_workingPath( workingPath ) + , m_description() , m_configurationMap( moduleConfiguration ) { } @@ -247,8 +261,11 @@ PythonJob::prettyName() const QString PythonJob::prettyStatusMessage() const { - return tr( "Running %1 operation." ) - .arg( QDir( m_workingPath ).dirName() ); + if ( m_description.isEmpty() ) + return tr( "Running %1 operation." ) + .arg( QDir( m_workingPath ).dirName() ); + else + return m_description; } @@ -293,6 +310,37 @@ PythonJob::exec() scriptNamespace ); bp::object entryPoint = scriptNamespace[ "run" ]; + bp::object prettyNameFunc = bp::getattr(scriptNamespace, "pretty_name", bp::object()); + + cDebug() << "Job file" << scriptFI.absoluteFilePath(); + if ( !prettyNameFunc.is_none() ) + { + bp::extract< std::string > prettyNameResult( prettyNameFunc() ); + if ( prettyNameResult.check() ) + { + m_description = QString::fromStdString( prettyNameResult() ).trimmed(); + } + if ( !m_description.isEmpty() ) + { + cDebug() << "Job" << prettyName() << "(func) ->" << m_description; + emit progress( 0 ); + } + } + + if ( m_description.isEmpty() ) + { + bp::extract< std::string > entryPoint_doc_attr(entryPoint.attr( "__doc__" ) ); + + if ( entryPoint_doc_attr.check() ) + { + m_description = QString::fromStdString( entryPoint_doc_attr() ).trimmed(); + auto i_newline = m_description.indexOf('\n'); + if ( i_newline > 0 ) + m_description.truncate( i_newline ); + cDebug() << "Job" << prettyName() << "(doc) ->" << m_description; + emit progress( 0 ); + } + } bp::object runResult = entryPoint(); diff --git a/src/libcalamares/PythonJob.h b/src/libcalamares/PythonJob.h index 9bc9ddb0b..2f0dbee07 100644 --- a/src/libcalamares/PythonJob.h +++ b/src/libcalamares/PythonJob.h @@ -39,7 +39,7 @@ public: const QString& workingPath, const QVariantMap& moduleConfiguration = QVariantMap(), QObject* parent = nullptr ); - virtual ~PythonJob(); + virtual ~PythonJob() override; QString prettyName() const override; QString prettyStatusMessage() const override; @@ -53,6 +53,7 @@ private: CalamaresPython::Helper* helper(); QString m_scriptFile; QString m_workingPath; + QString m_description; QVariantMap m_configurationMap; }; diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp index 9e2161c92..595f53a76 100644 --- a/src/libcalamares/PythonJobApi.cpp +++ b/src/libcalamares/PythonJobApi.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2016, Teo Mrnjavac + * 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 @@ -23,7 +24,12 @@ #include "utils/CalamaresUtilsSystem.h" #include "utils/CalamaresUtils.h" +#include "GlobalStorage.h" +#include "JobQueue.h" + +#include #include +#include #undef slots #include @@ -40,50 +46,50 @@ mount( const std::string& device_path, const std::string& options ) { return CalamaresUtils::System::instance()-> - mount( QString::fromStdString( device_path ), - QString::fromStdString( mount_point ), - QString::fromStdString( filesystem_name ), - QString::fromStdString( options ) ); + mount( QString::fromStdString( device_path ), + QString::fromStdString( mount_point ), + QString::fromStdString( filesystem_name ), + QString::fromStdString( options ) ); } int target_env_call( const std::string& command, - const std::string& stdin, - int timeout ) + const std::string& stdin, + int timeout ) { return CalamaresUtils::System::instance()-> - targetEnvCall( QString::fromStdString( command ), - QString(), - QString::fromStdString( stdin ), - timeout ); + targetEnvCall( QString::fromStdString( command ), + QString(), + QString::fromStdString( stdin ), + timeout ); } int target_env_call( const bp::list& args, - const std::string& stdin, - int timeout ) + const std::string& stdin, + int timeout ) { QStringList list; for ( int i = 0; i < bp::len( args ); ++i ) { list.append( QString::fromStdString( - bp::extract< std::string >( args[ i ] ) ) ); + bp::extract< std::string >( args[ i ] ) ) ); } return CalamaresUtils::System::instance()-> - targetEnvCall( list, - QString(), - QString::fromStdString( stdin ), - timeout ); + targetEnvCall( list, + QString(), + QString::fromStdString( stdin ), + timeout ); } int check_target_env_call( const std::string& command, - const std::string& stdin, - int timeout ) + const std::string& stdin, + int timeout ) { int ec = target_env_call( command, stdin, timeout ); return _handle_check_target_env_call_error( ec, QString::fromStdString( command ) ); @@ -92,8 +98,8 @@ check_target_env_call( const std::string& command, int check_target_env_call( const bp::list& args, - const std::string& stdin, - int timeout ) + const std::string& stdin, + int timeout ) { int ec = target_env_call( args, stdin, timeout ); if ( !ec ) @@ -103,7 +109,7 @@ check_target_env_call( const bp::list& args, for ( int i = 0; i < bp::len( args ); ++i ) { failedCmdList.append( QString::fromStdString( - bp::extract< std::string >( args[ i ] ) ) ); + bp::extract< std::string >( args[ i ] ) ) ); } return _handle_check_target_env_call_error( ec, failedCmdList.join( ' ' ) ); @@ -112,8 +118,8 @@ check_target_env_call( const bp::list& args, std::string check_target_env_output( const std::string& command, - const std::string& stdin, - int timeout ) + const std::string& stdin, + int timeout ) { QString output; int ec = CalamaresUtils::System::instance()-> @@ -129,15 +135,15 @@ check_target_env_output( const std::string& command, std::string check_target_env_output( const bp::list& args, - const std::string& stdin, - int timeout ) + const std::string& stdin, + int timeout ) { QString output; QStringList list; for ( int i = 0; i < bp::len( args ); ++i ) { list.append( QString::fromStdString( - bp::extract< std::string >( args[ i ] ) ) ); + bp::extract< std::string >( args[ i ] ) ) ); } int ec = CalamaresUtils::System::instance()-> @@ -159,8 +165,8 @@ _handle_check_target_env_call_error( int ec, const QString& cmd ) QString raise = QString( "import subprocess\n" "raise subprocess.CalledProcessError(%1,\"%2\")" ) - .arg( ec ) - .arg( cmd ); + .arg( ec ) + .arg( cmd ); bp::exec( raise.toStdString().c_str() ); bp::throw_error_already_set(); return ec; @@ -177,7 +183,8 @@ debug( const std::string& s ) PythonJobInterface::PythonJobInterface( Calamares::PythonJob* parent ) : m_parent( parent ) { - moduleName = QDir( m_parent->m_workingPath ).dirName().toStdString(); + auto moduleDir = QDir( m_parent->m_workingPath ); + moduleName = moduleDir.dirName().toStdString(); prettyName = m_parent->prettyName().toStdString(); workingPath = m_parent->m_workingPath.toStdString(); configuration = CalamaresPython::variantMapToPyDict( m_parent->m_configurationMap ); @@ -198,4 +205,91 @@ obscure( const std::string& string ) return CalamaresUtils::obscure( QString::fromStdString( string ) ).toStdString(); } +static QStringList +_gettext_languages() +{ + QStringList languages; + + // There are two ways that Python jobs can be initialised: + // - through JobQueue, in which case that has an instance which holds + // a GlobalStorage object, or + // - through the Python test-script, which initialises its + // own GlobalStoragePythonWrapper, which then holds a + // GlobalStorage object for all of Python. + Calamares::JobQueue* jq = Calamares::JobQueue::instance(); + Calamares::GlobalStorage* gs = jq ? jq->globalStorage() : CalamaresPython::GlobalStoragePythonWrapper::globalStorageInstance(); + + QVariant localeConf_ = gs->value( "localeConf" ); + if ( localeConf_.canConvert< QVariantMap >() ) + { + QVariant lang_ = localeConf_.value< QVariantMap >()[ "LANG" ]; + if ( lang_.canConvert< QString >() ) + { + QString lang = lang_.value< QString >(); + languages.append( lang ); + if ( lang.indexOf( '.' ) > 0 ) + { + lang.truncate( lang.indexOf( '.' ) ); + languages.append( lang ); + } + if ( lang.indexOf( '_' ) > 0 ) + { + lang.truncate( lang.indexOf( '_' ) ); + languages.append( lang ); + } + } + } + return languages; +} + +bp::list +gettext_languages() +{ + bp::list pyList; + for ( auto lang : _gettext_languages() ) + pyList.append( lang.toStdString() ); + return pyList; +} + +static void +_add_localedirs( QStringList& pathList, const QString& candidate ) +{ + if ( !candidate.isEmpty() && !pathList.contains( candidate ) ) + { + pathList.prepend( candidate ); + if ( QDir( candidate ).cd( "lang" ) ) + pathList.prepend( candidate + "/lang" ); + } +} + +bp::object +gettext_path() +{ + // TODO: distinguish between -d runs and normal runs + // TODO: can we detect DESTDIR-installs? + QStringList candidatePaths = QStandardPaths::locateAll( QStandardPaths::GenericDataLocation, "locale", QStandardPaths::LocateDirectory ); + QString extra = QCoreApplication::applicationDirPath(); + _add_localedirs( candidatePaths, extra ); // Often /usr/local/bin + if ( !extra.isEmpty() ) + { + QDir d( extra ); + if ( d.cd( "../share/locale" ) ) // Often /usr/local/bin/../share/locale -> /usr/local/share/locale + _add_localedirs( candidatePaths, d.canonicalPath() ); + } + _add_localedirs( candidatePaths, QDir().canonicalPath() ); // . + + cDebug() << "Standard paths" << candidatePaths; + + for ( auto lang : _gettext_languages() ) + for ( auto localedir : candidatePaths ) + { + QDir ldir( localedir ); + cDebug() << "Checking" << lang << "in" < === * * Copyright 2014-2016, Teo Mrnjavac + * 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 @@ -60,10 +61,14 @@ std::string check_target_env_output( const boost::python::list& args, std::string obscure( const std::string& string ); -inline int _handle_check_target_env_call_error( int ec, const QString& cmd ); +boost::python::object gettext_path(); + +boost::python::list gettext_languages(); void debug( const std::string& s ); +inline int _handle_check_target_env_call_error( int ec, const QString& cmd ); + class PythonJobInterface { public: diff --git a/src/libcalamares/utils/CalamaresUtils.cpp b/src/libcalamares/utils/CalamaresUtils.cpp index 139636cf7..db748ec94 100644 --- a/src/libcalamares/utils/CalamaresUtils.cpp +++ b/src/libcalamares/utils/CalamaresUtils.cpp @@ -47,8 +47,7 @@ static bool s_isAppDataDirOverridden = false; static QTranslator* s_brandingTranslator = nullptr; static QTranslator* s_translator = nullptr; -static QTranslator* s_qtTranslator = nullptr; -static QString s_translatorLocaleName = QString(); +static QString s_translatorLocaleName; static bool @@ -207,25 +206,6 @@ installTranslator( const QLocale& locale, QCoreApplication::installTranslator( translator ); s_translator = translator; - // Qt translations - translator = new QTranslator( parent ); - if ( translator->load( QString( ":/lang/qt_" ) + localeName ) ) - { - qDebug() << "Translation: Qt: Using system locale:" << localeName; - } - else - { - qDebug() << "Translation: Qt: Using default locale, system locale one not found:" << localeName; - } - - if ( s_qtTranslator ) - { - QCoreApplication::removeTranslator( s_qtTranslator ); - delete s_qtTranslator; - } - QCoreApplication::installTranslator( translator ); - s_qtTranslator = translator; - s_translatorLocaleName = localeName; } @@ -342,7 +322,7 @@ obscure( const QString& string ) void crash() { - volatile int* a = (int*)(NULL); + volatile int* a = nullptr; *a = 1; } diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/CalamaresUtilsSystem.cpp index 176771e36..656a57c10 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp +++ b/src/libcalamares/utils/CalamaresUtilsSystem.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Teo Mrnjavac + * 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 @@ -26,6 +27,15 @@ #include #include +#ifdef Q_OS_LINUX +#include +#endif + +#ifdef Q_OS_FREEBSD +#include +#include +#endif + namespace CalamaresUtils { @@ -195,8 +205,14 @@ System::targetEnvOutput( const QStringList& args, return -1; } - cLog() << "Finished. Exit code:" << process.exitCode(); - return process.exitCode(); + auto r = process.exitCode(); + cLog() << "Finished. Exit code:" << r; + if ( r != 0 ) + { + cLog() << "Target cmd" << args; + cLog() << "Target out" << output; + } + return r; } @@ -215,50 +231,29 @@ System::targetEnvOutput( const QString& command, } -qint64 -System::getPhysicalMemoryB() -{ - QProcess p; - p.start( "dmidecode", { "-t", "17" } ); - p.waitForFinished(); - QStringList lines = QString::fromLocal8Bit( p.readAllStandardOutput() ).split( '\n' ); - lines = lines.filter( QRegularExpression( "^\\W*Size:\\W\\d*\\WMB" ) ); - if ( !lines.isEmpty() ) - return 0; - - qint64 availableRamMb = 0; - foreach( const QString& line, lines ) - { - bool ok = false; - availableRamMb += line.simplified() - .split( ' ' ) - .value( 1 ) - .toInt( &ok ); - if ( !ok ) - return 0; - } - qint64 availableRam = availableRamMb * 1024 * 1024; - return availableRam; -} - - -qint64 +QPair System::getTotalMemoryB() { - // A line in meminfo looks like this, with {print $2} we grab the second column. - // MemTotal: 8133432 kB +#ifdef Q_OS_LINUX + struct sysinfo i; + int r = sysinfo( &i ); - QProcess p; - p.start( "awk", { "/MemTotal/ {print $2}", "/proc/meminfo" } ); - p.waitForFinished(); - QString memoryLine = p.readAllStandardOutput().simplified(); + if (r) + return qMakePair(0, 0.0); - bool ok = false; - qint64 availableRam = memoryLine.toLongLong( &ok ) * 1024; - if ( !ok ) - return 0; + return qMakePair(quint64( i.mem_unit ) * quint64( i.totalram ), 1.1); +#elif defined( Q_OS_FREEBSD ) + unsigned long memsize; + size_t s = sizeof(memsize); - return availableRam; + int r = sysctlbyname("vm.kmem_size", &memsize, &s, NULL, 0); + if (r) + return qMakePair(0, 0.0); + + return qMakePair(memsize, 1.01); +#else + return qMakePair(0, 0.0); // Unsupported +#endif } diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.h b/src/libcalamares/utils/CalamaresUtilsSystem.h index bf3acb41c..1ccdfb516 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.h +++ b/src/libcalamares/utils/CalamaresUtilsSystem.h @@ -100,9 +100,19 @@ public: /** * @brief getTotalMemoryB returns the total main memory, in bytes. + * + * Since it is difficult to get the RAM memory size exactly -- either + * by reading information from the DIMMs, which may fail on virtual hosts + * or from asking the kernel, which doesn't report some memory areas -- + * this returns a pair of guessed-size (in bytes) and a "guesstimate factor" + * which says how good the guess is. Generally, assume the *real* memory + * available is size * guesstimate. + * + * If nothing can be found, returns a 0 size and 0 guesstimate. + * + * @return size, guesstimate-factor */ - DLLEXPORT qint64 getTotalMemoryB(); //Always underguessed, but always works on Linux - DLLEXPORT qint64 getPhysicalMemoryB(); //Better guess, doesn't work in VirualBox + DLLEXPORT QPair getTotalMemoryB(); private: static System* s_instance; diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp index 4acafa1cf..7caf2a18c 100644 --- a/src/libcalamares/utils/Logger.cpp +++ b/src/libcalamares/utils/Logger.cpp @@ -2,6 +2,7 @@ * * Copyright 2010-2011, Christian Muehlhaeuser * Copyright 2014, Teo Mrnjavac + * 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 @@ -38,9 +39,9 @@ using namespace std; -ofstream logfile; -static int s_threshold = -1; -QMutex s_mutex; +static ofstream logfile; +static unsigned int s_threshold = 0; +static QMutex s_mutex; namespace Logger { @@ -48,20 +49,22 @@ namespace Logger static void log( const char* msg, unsigned int debugLevel, bool toDisk = true ) { - if ( s_threshold < 0 ) + if ( !s_threshold ) { if ( qApp->arguments().contains( "--debug" ) || qApp->arguments().contains( "-d" ) ) s_threshold = LOGVERBOSE; else - #ifdef QT_NO_DEBUG +#ifdef QT_NO_DEBUG s_threshold = RELEASE_LEVEL_THRESHOLD; - #else +#else s_threshold = DEBUG_LEVEL_THRESHOLD; - #endif +#endif + // Comparison is < threshold, below + ++s_threshold; } - if ( toDisk || (int)debugLevel <= s_threshold ) + if ( toDisk || debugLevel < s_threshold ) { QMutexLocker lock( &s_mutex ); @@ -77,7 +80,7 @@ log( const char* msg, unsigned int debugLevel, bool toDisk = true ) logfile.flush(); } - if ( debugLevel <= LOGEXTRA || (int)debugLevel <= s_threshold ) + if ( debugLevel <= LOGEXTRA || debugLevel < s_threshold ) { QMutexLocker lock( &s_mutex ); @@ -95,6 +98,8 @@ CalamaresLogHandler( QtMsgType type, const QMessageLogContext& context, const QS { static QMutex s_mutex; + Q_UNUSED( context ); + QByteArray ba = msg.toUtf8(); const char* message = ba.constData(); @@ -105,14 +110,12 @@ CalamaresLogHandler( QtMsgType type, const QMessageLogContext& context, const QS log( message, LOGVERBOSE ); break; + case QtInfoMsg: + log( message, 1 ); + break; + case QtCriticalMsg: - log( message, 0 ); - break; - case QtWarningMsg: - log( message, 0 ); - break; - case QtFatalMsg: log( message, 0 ); break; @@ -172,3 +175,6 @@ CLog::~CLog() log( m_msg.toUtf8().data(), m_debugLevel ); } +Logger::CDebug::~CDebug() +{ +} diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h index 466ba7be5..0cf4b4ad3 100644 --- a/src/libcalamares/utils/Logger.h +++ b/src/libcalamares/utils/Logger.h @@ -2,6 +2,7 @@ * * Copyright 2010-2011, Christian Muehlhaeuser * Copyright 2014, Teo Mrnjavac + * 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,9 +49,10 @@ namespace Logger CDebug( unsigned int debugLevel = LOGDEBUG ) : CLog( debugLevel ) { } + virtual ~CDebug(); }; - DLLEXPORT void CalamaresLogHandler( QtMsgType type, const char* msg ); + DLLEXPORT void CalamaresLogHandler( QtMsgType type, const QMessageLogContext& context, const QString& msg ); DLLEXPORT void setupLogfile(); DLLEXPORT QString logFile(); } diff --git a/src/libcalamares/utils/PluginFactory.cpp b/src/libcalamares/utils/PluginFactory.cpp index 30a5bf4bf..b1c3a0793 100644 --- a/src/libcalamares/utils/PluginFactory.cpp +++ b/src/libcalamares/utils/PluginFactory.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2015, Teo Mrnjavac + * Copyright 2017, Adriaan de Groot * * Based on KPluginFactory from KCoreAddons, KDE project * Copyright 2007, Matthias Kretz @@ -26,7 +27,7 @@ #include #include -Q_GLOBAL_STATIC(QObjectCleanupHandler, factorycleanup) +Q_GLOBAL_STATIC( QObjectCleanupHandler, factorycleanup ) extern int kLibraryDebugArea(); @@ -34,18 +35,18 @@ namespace Calamares { PluginFactory::PluginFactory() - : d_ptr(new PluginFactoryPrivate) + : d_ptr( new PluginFactoryPrivate ) { - Q_D(PluginFactory); + Q_D( PluginFactory ); d->q_ptr = this; - factorycleanup()->add(this); + factorycleanup()->add( this ); } -PluginFactory::PluginFactory(PluginFactoryPrivate &d) - : d_ptr(&d) +PluginFactory::PluginFactory( PluginFactoryPrivate& d ) + : d_ptr( &d ) { - factorycleanup()->add(this); + factorycleanup()->add( this ); } PluginFactory::~PluginFactory() @@ -53,70 +54,77 @@ PluginFactory::~PluginFactory() delete d_ptr; } -void PluginFactory::doRegisterPlugin(const QString &keyword, const QMetaObject *metaObject, CreateInstanceFunction instanceFunction) +void PluginFactory::doRegisterPlugin( const QString& keyword, const QMetaObject* metaObject, CreateInstanceFunction instanceFunction ) { - Q_D(PluginFactory); + Q_D( PluginFactory ); - Q_ASSERT(metaObject); + Q_ASSERT( metaObject ); // we allow different interfaces to be registered without keyword - if (!keyword.isEmpty()) { - if (d->createInstanceHash.contains(keyword)) { + if ( !keyword.isEmpty() ) + { + if ( d->createInstanceHash.contains( keyword ) ) qWarning() << "A plugin with the keyword" << keyword << "was already registered. A keyword must be unique!"; - } - d->createInstanceHash.insert(keyword, PluginFactoryPrivate::Plugin(metaObject, instanceFunction)); - } else { - const QList clashes(d->createInstanceHash.values(keyword)); - const QMetaObject *superClass = metaObject->superClass(); - if (superClass) { - for (const PluginFactoryPrivate::Plugin &plugin : clashes) { - for (const QMetaObject *otherSuper = plugin.first->superClass(); otherSuper; - otherSuper = otherSuper->superClass()) { - if (superClass == otherSuper) { + d->createInstanceHash.insert( keyword, PluginFactoryPrivate::Plugin( metaObject, instanceFunction ) ); + } + else + { + const QList clashes( d->createInstanceHash.values( keyword ) ); + const QMetaObject* superClass = metaObject->superClass(); + if ( superClass ) + { + for ( const PluginFactoryPrivate::Plugin& plugin : clashes ) + { + for ( const QMetaObject* otherSuper = plugin.first->superClass(); otherSuper; + otherSuper = otherSuper->superClass() ) + { + if ( superClass == otherSuper ) qWarning() << "Two plugins with the same interface(" << superClass->className() << ") were registered. Use keywords to identify the plugins."; - } } } } - for (const PluginFactoryPrivate::Plugin &plugin : clashes) { + for ( const PluginFactoryPrivate::Plugin& plugin : clashes ) + { superClass = plugin.first->superClass(); - if (superClass) { - for (const QMetaObject *otherSuper = metaObject->superClass(); otherSuper; - otherSuper = otherSuper->superClass()) { - if (superClass == otherSuper) { + if ( superClass ) + { + for ( const QMetaObject* otherSuper = metaObject->superClass(); otherSuper; + otherSuper = otherSuper->superClass() ) + { + if ( superClass == otherSuper ) qWarning() << "Two plugins with the same interface(" << superClass->className() << ") were registered. Use keywords to identify the plugins."; - } } } } - d->createInstanceHash.insertMulti(keyword, PluginFactoryPrivate::Plugin(metaObject, instanceFunction)); + d->createInstanceHash.insertMulti( keyword, PluginFactoryPrivate::Plugin( metaObject, instanceFunction ) ); } } -QObject *PluginFactory::create(const char *iface, QWidget *parentWidget, QObject *parent, const QString &keyword) +QObject* PluginFactory::create( const char* iface, QWidget* parentWidget, QObject* parent, const QString& keyword ) { - Q_D(PluginFactory); + Q_D( PluginFactory ); - QObject *obj = 0; + QObject* obj = nullptr; - const QList candidates(d->createInstanceHash.values(keyword)); + const QList candidates( d->createInstanceHash.values( keyword ) ); // for !keyword.isEmpty() candidates.count() is 0 or 1 - for (const PluginFactoryPrivate::Plugin &plugin : candidates) { - for (const QMetaObject *current = plugin.first; current; current = current->superClass()) { - if (0 == qstrcmp(iface, current->className())) { - if (obj) { + for ( const PluginFactoryPrivate::Plugin& plugin : candidates ) + { + for ( const QMetaObject* current = plugin.first; current; current = current->superClass() ) + { + if ( 0 == qstrcmp( iface, current->className() ) ) + { + if ( obj ) qWarning() << "ambiguous interface requested from a DSO containing more than one plugin"; - } - obj = plugin.second(parentWidget, parent); + obj = plugin.second( parentWidget, parent ); break; } } } - if (obj) { - emit objectCreated(obj); - } + if ( obj ) + emit objectCreated( obj ); return obj; } diff --git a/src/libcalamares/utils/PluginFactory.h b/src/libcalamares/utils/PluginFactory.h index c0053ba38..55c44249c 100644 --- a/src/libcalamares/utils/PluginFactory.h +++ b/src/libcalamares/utils/PluginFactory.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2015, Teo Mrnjavac + * Copyright 2017, Adriaan de Groot * * Based on KPluginFactory from KCoreAddons, KDE project * Copyright 2007, Matthias Kretz @@ -193,13 +194,13 @@ namespace Calamares * } * \endcode * - * \author Matthias Kretz - * \author Bernhard Loos + * \author Matthias Kretz + * \author Bernhard Loos */ class DLLEXPORT PluginFactory : public QObject { Q_OBJECT - Q_DECLARE_PRIVATE(PluginFactory) + Q_DECLARE_PRIVATE( PluginFactory ) public: /** * This constructor creates a factory for a plugin. @@ -222,7 +223,7 @@ public: * \returns A pointer to the created object is returned, or 0 if an error occurred. */ template - T *create(QObject *parent = 0); + T* create( QObject* parent = nullptr ); /** * Use this method to create an object. It will try to create an object which inherits @@ -235,34 +236,35 @@ public: * \returns A pointer to the created object is returned, or 0 if an error occurred. */ template - T *create(const QString &keyword, QObject *parent = 0); + T* create( const QString& keyword, QObject* parent = nullptr ); Q_SIGNALS: - void objectCreated(QObject *object); + void objectCreated( QObject* object ); protected: /** * Function pointer type to a function that instantiates a plugin. */ - typedef QObject *(*CreateInstanceFunction)(QWidget *, QObject *); + typedef QObject* ( *CreateInstanceFunction )( QWidget*, QObject* ); /** * This is used to detect the arguments need for the constructor of plugin classes. * You can inherit it, if you want to add new classes and still keep support for the old ones. */ template - struct InheritanceChecker { - CreateInstanceFunction createInstanceFunction(QWidget *) + struct InheritanceChecker + { + CreateInstanceFunction createInstanceFunction( QWidget* ) { return &createInstance; } - CreateInstanceFunction createInstanceFunction(...) + CreateInstanceFunction createInstanceFunction( ... ) { return &createInstance; } }; - explicit PluginFactory(PluginFactoryPrivate &dd); + explicit PluginFactory( PluginFactoryPrivate& dd ); /** * Registers a plugin with the factory. Call this function from the constructor of the @@ -292,14 +294,14 @@ protected: * \endcode */ template - void registerPlugin(const QString &keyword = QString(), - CreateInstanceFunction instanceFunction - = InheritanceChecker().createInstanceFunction(reinterpret_cast(0))) + void registerPlugin( const QString& keyword = QString(), + CreateInstanceFunction instanceFunction + = InheritanceChecker().createInstanceFunction( reinterpret_cast( 0 ) ) ) { - doRegisterPlugin(keyword, &T::staticMetaObject, instanceFunction); + doRegisterPlugin( keyword, &T::staticMetaObject, instanceFunction ); } - PluginFactoryPrivate *const d_ptr; + PluginFactoryPrivate* const d_ptr; /** * This function is called when the factory asked to create an Object. @@ -311,60 +313,58 @@ protected: * was requested. E.g. for KCModule plugins this string will be "KCModule". * \param parentWidget Only used if the requested plugin is a KPart. * \param parent The parent object for the plugin object. - * \param args A plugin specific list of arbitrary arguments. * \param keyword A string that uniquely identifies the plugin. If a KService is used this * keyword is read from the X-KDE-PluginKeyword entry in the .desktop file. */ - virtual QObject *create(const char *iface, QWidget *parentWidget, QObject *parent, const QString &keyword); + virtual QObject* create( const char* iface, QWidget* parentWidget, QObject* parent, const QString& keyword ); template - static QObject *createInstance(QWidget *parentWidget, QObject *parent) + static QObject* createInstance( QWidget* parentWidget, QObject* parent ) { - Q_UNUSED(parentWidget); - ParentType *p = 0; - if (parent) { - p = qobject_cast(parent); - Q_ASSERT(p); + Q_UNUSED( parentWidget ); + ParentType* p = nullptr; + if ( parent ) + { + p = qobject_cast( parent ); + Q_ASSERT( p ); } - return new impl(p); + return new impl( p ); } private: - void doRegisterPlugin(const QString &keyword, const QMetaObject *metaObject, CreateInstanceFunction instanceFunction); + void doRegisterPlugin( const QString& keyword, const QMetaObject* metaObject, CreateInstanceFunction instanceFunction ); }; template -inline T *PluginFactory::create(QObject *parent) +inline T* PluginFactory::create( QObject* parent ) { - QObject *o = create(T::staticMetaObject.className(), - parent && parent->isWidgetType() ? reinterpret_cast(parent) : 0, - parent, - QString()); + QObject* o = create( T::staticMetaObject.className(), + parent && parent->isWidgetType() ? reinterpret_cast( parent ) : nullptr, + parent, + QString() ); - T *t = qobject_cast(o); - if (!t) { + T* t = qobject_cast( o ); + if ( !t ) delete o; - } return t; } template -inline T *PluginFactory::create(const QString &keyword, QObject *parent) +inline T* PluginFactory::create( const QString& keyword, QObject* parent ) { - QObject *o = create(T::staticMetaObject.className(), - parent && parent->isWidgetType() ? reinterpret_cast(parent) : 0, - parent, - keyword); + QObject* o = create( T::staticMetaObject.className(), + parent && parent->isWidgetType() ? reinterpret_cast( parent ) : nullptr, + parent, + keyword ); - T *t = qobject_cast(o); - if (!t) { + T* t = qobject_cast( o ); + if ( !t ) delete o; - } return t; } } -Q_DECLARE_INTERFACE(Calamares::PluginFactory, CalamaresPluginFactory_iid) +Q_DECLARE_INTERFACE( Calamares::PluginFactory, CalamaresPluginFactory_iid ) #endif // CALAMARESPLUGINFACTORY_H diff --git a/src/libcalamares/utils/Units.h b/src/libcalamares/utils/Units.h new file mode 100644 index 000000000..391d67194 --- /dev/null +++ b/src/libcalamares/utils/Units.h @@ -0,0 +1,65 @@ +/* === This file is part of Calamares - === + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Calamares is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + */ + +#ifndef LIBCALAMARES_UTILS_UNITS_H +#define LIBCALAMARES_UTILS_UNITS_H + +#include + +namespace CalamaresUtils +{ + +/** User defined literals, 1_MiB is 1 MibiByte (= 2^20 bytes) */ +constexpr qint64 operator ""_MiB( unsigned long long m ) +{ + return qint64(m) * 1024 * 1024; +} + +/** User defined literals, 1_GiB is 1 GibiByte (= 2^30 bytes) */ +constexpr qint64 operator ""_GiB( unsigned long long m ) +{ + return operator ""_MiB(m) * 1024; +} + +constexpr qint64 MiBtoBytes( unsigned long long m ) +{ + return operator ""_MiB( m ); +} + +constexpr qint64 GiBtoBytes( unsigned long long m ) +{ + return operator ""_GiB( m ); +} + +constexpr qint64 MiBToBytes( double m ) +{ + return qint64(m * 1024 * 1024); +} + +constexpr qint64 GiBtoBytes( double m ) +{ + return qint64(m * 1024 * 1024 * 1024); +} + +constexpr int BytesToMiB( qint64 b ) +{ + return int( b / 1024 / 1024 ); +} + +} // namespace +#endif diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 8814b1b7e..6d559c6fb 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -71,7 +72,8 @@ const QStringList Branding::s_styleEntryStrings = { "sidebarBackground", "sidebarText", - "sidebarTextSelect" + "sidebarTextSelect", + "sidebarTextHighlight" }; @@ -79,6 +81,9 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent ) : QObject( parent ) , m_descriptorPath( brandingFilePath ) + , m_componentName() + , m_welcomeStyleCalamares( false ) + , m_welcomeExpandingLogo( true ) { cDebug() << "Using Calamares branding file at" << brandingFilePath; QFile file( brandingFilePath ); @@ -105,6 +110,9 @@ Branding::Branding( const QString& brandingFilePath, if ( !doc[ "strings" ].IsMap() ) bail( "Syntax error in strings map." ); + m_welcomeStyleCalamares = doc[ "welcomeStyleCalamares" ].as< bool >( false ); + m_welcomeExpandingLogo = doc[ "welcomeExpandingLogo" ].as< bool >( true ); + QVariantMap strings = CalamaresUtils::yamlMapToVariant( doc[ "strings" ] ).toMap(); m_strings.clear(); @@ -171,7 +179,7 @@ Branding::Branding( const QString& brandingFilePath, } catch ( YAML::Exception& e ) { - cDebug() << "WARNING: YAML parser error " << e.what(); + cDebug() << "WARNING: YAML parser error " << e.what() << "in" << file.fileName(); } QDir translationsDir( componentDir.filePath( "lang" ) ); @@ -188,7 +196,14 @@ Branding::Branding( const QString& brandingFilePath, } s_instance = this; - cDebug() << "Loaded branding component" << m_componentName; + if ( m_componentName.isEmpty() ) + { + cDebug() << "WARNING: failed to load component from" << brandingFilePath; + } + else + { + cDebug() << "Loaded branding component" << m_componentName; + } } @@ -263,7 +278,6 @@ Branding::slideshowPath() const return m_slideshowPath; } - void Branding::setGlobals( GlobalStorage* globalStorage ) const { diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index 09e12ecda..c56db2db2 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -36,6 +37,11 @@ class UIDLLEXPORT Branding : public QObject { Q_OBJECT public: + /** + * Descriptive strings in the configuration file. use + * e.g. *Branding::ProductName to get the string value for + * the product name. + */ enum StringEntry : short { ProductName, @@ -62,7 +68,8 @@ public: { SidebarBackground, SidebarText, - SidebarTextSelect + SidebarTextSelect, + SidebarTextHighlight }; static Branding* instance(); @@ -81,6 +88,9 @@ public: QPixmap image( Branding::ImageEntry imageEntry, const QSize& size ) const; QString slideshowPath() const; + bool welcomeStyleCalamares() const { return m_welcomeStyleCalamares; } + bool welcomeExpandingLogo() const { return m_welcomeExpandingLogo; } + /** * Creates a map called "branding" in the global storage, and inserts an * entry for each of the branding strings. This makes the branding @@ -104,8 +114,13 @@ private: QMap< QString, QString > m_style; QString m_slideshowPath; QString m_translationsPathPrefix; + + bool m_welcomeStyleCalamares; + bool m_welcomeExpandingLogo; }; +template inline QString operator*(U e) { return Branding::instance()->string( e ); } + } #endif // BRANDING_H diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt index ee039b46d..ccc46f2f3 100644 --- a/src/libcalamaresui/CMakeLists.txt +++ b/src/libcalamaresui/CMakeLists.txt @@ -1,6 +1,6 @@ -set( CALAMARESUI_LIBRARY_TARGET calamaresui ) +project( libcalamaresui CXX ) -list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_SOURCES +set( calamaresui_SOURCES modulesystem/CppJobModule.cpp modulesystem/Module.cpp modulesystem/ModuleManager.cpp @@ -20,7 +20,7 @@ list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_SOURCES widgets/ClickableLabel.cpp widgets/FixedAspectRatioLabel.cpp - widgets/QtWaitingSpinner.cpp + widgets/waitingspinnerwidget.cpp widgets/WaitingWidget.cpp ExecutionViewStep.cpp @@ -29,12 +29,20 @@ list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_SOURCES ViewManager.cpp ) -list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_UI +# Don't warn about third-party sources +mark_thirdparty_code( + utils/ImageRegistry.cpp + utils/qjsonitem.cpp + utils/qjsonmodel.cpp + widgets/waitingspinnerwidget.cpp +) + +set( calamaresui_UI utils/DebugWindow.ui ) if( WITH_PYTHON ) - list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_SOURCES + list( APPEND calamaresui_SOURCES modulesystem/PythonJobModule.cpp ) endif() @@ -43,7 +51,7 @@ if( WITH_PYTHONQT ) include_directories(${PYTHON_INCLUDE_DIRS}) include_directories(${PYTHONQT_INCLUDE_DIR}) - list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_SOURCES + list( APPEND calamaresui_SOURCES modulesystem/PythonQtViewModule.cpp utils/PythonQtUtils.cpp viewpages/PythonQtJob.cpp @@ -58,12 +66,12 @@ if( WITH_PYTHONQT ) ) endif() -calamares_add_library( ${CALAMARESUI_LIBRARY_TARGET} - SOURCES ${${CALAMARESUI_LIBRARY_TARGET}_SOURCES} - UI ${${CALAMARESUI_LIBRARY_TARGET}_UI} +calamares_add_library( calamaresui + SOURCES ${calamaresui_SOURCES} + UI ${calamaresui_UI} EXPORT_MACRO UIDLLEXPORT_PRO LINK_PRIVATE_LIBRARIES - yaml-cpp + ${YAMLCPP_LIBRARY} Qt5::Svg Qt5::QuickWidgets ${OPTIONAL_PRIVATE_LIBRARIES} diff --git a/src/libcalamaresui/ExecutionViewStep.cpp b/src/libcalamaresui/ExecutionViewStep.cpp index fb43122b9..37c2318d0 100644 --- a/src/libcalamaresui/ExecutionViewStep.cpp +++ b/src/libcalamaresui/ExecutionViewStep.cpp @@ -165,7 +165,7 @@ ExecutionViewStep::appendJobModuleInstanceKey( const QString& instanceKey ) void ExecutionViewStep::updateFromJobQueue( qreal percent, const QString& message ) { - m_progressBar->setValue( percent * m_progressBar->maximum() ); + m_progressBar->setValue( int( percent * m_progressBar->maximum() ) ); m_label->setText( message ); } diff --git a/src/libcalamaresui/Settings.cpp b/src/libcalamaresui/Settings.cpp index 102026a33..ce01bf42d 100644 --- a/src/libcalamaresui/Settings.cpp +++ b/src/libcalamaresui/Settings.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -46,8 +47,8 @@ Settings::Settings( const QString& settingsFilePath, QObject* parent ) : QObject( parent ) , m_debug( debugMode ) - , m_promptInstall( false ) , m_doChroot( true ) + , m_promptInstall( false ) { cDebug() << "Using Calamares settings file at" << settingsFilePath; QFile file( settingsFilePath ); @@ -155,7 +156,7 @@ Settings::Settings( const QString& settingsFilePath, } catch ( YAML::Exception& e ) { - cDebug() << "WARNING: YAML parser error " << e.what(); + cDebug() << "WARNING: YAML parser error " << e.what() << "in" << file.fileName(); } } else diff --git a/src/libcalamaresui/Settings.h b/src/libcalamaresui/Settings.h index 58f2a61b2..4c99eb811 100644 --- a/src/libcalamaresui/Settings.h +++ b/src/libcalamaresui/Settings.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -57,9 +58,6 @@ public: private: static Settings* s_instance; - bool m_debug; - bool m_doChroot; - QStringList m_modulesSearchPaths; QList< QMap< QString, QString > > m_customModuleInstances; @@ -67,6 +65,8 @@ private: QString m_brandingComponentName; + bool m_debug; + bool m_doChroot; bool m_promptInstall; }; diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index ad433d2fa..7b5df155b 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -42,13 +43,20 @@ ViewManager::instance() return s_instance; } -ViewManager::ViewManager( QObject* parent ) - : QObject( parent ) - , m_widget( new QWidget() ) - , m_currentStep( 0 ) +ViewManager* +ViewManager::instance( QObject* parent ) +{ + Q_ASSERT( !s_instance ); + s_instance = new ViewManager( parent ); + return s_instance; +} + +ViewManager::ViewManager( QObject* parent ) + : QObject( parent ) + , m_currentStep( 0 ) + , m_widget( new QWidget() ) { Q_ASSERT( !s_instance ); - s_instance = this; QBoxLayout* mainLayout = new QVBoxLayout; m_widget->setLayout( mainLayout ); @@ -65,6 +73,7 @@ ViewManager::ViewManager( QObject* parent ) m_back->setText( tr( "&Back" ) ); m_next->setText( tr( "&Next" ) ); m_quit->setText( tr( "&Cancel" ) ); + m_quit->setToolTip( tr( "Cancel installation without changing the system." ) ); ) QBoxLayout* bottomLayout = new QHBoxLayout; @@ -86,19 +95,21 @@ ViewManager::ViewManager( QObject* parent ) if ( !( m_currentStep == m_steps.count() -1 && m_steps.last()->isAtEnd() ) ) { - int response = QMessageBox::question( m_widget, + QMessageBox mb( QMessageBox::Question, tr( "Cancel installation?" ), tr( "Do you really want to cancel the current install process?\n" "The installer will quit and all changes will be lost." ), QMessageBox::Yes | QMessageBox::No, - QMessageBox::No ); + m_widget ); + mb.setDefaultButton( QMessageBox::No ); + mb.button( QMessageBox::Yes )->setText( tr( "&Yes" ) ); + mb.button( QMessageBox::No )->setText( tr( "&No" ) ); + int response = mb.exec(); if ( response == QMessageBox::Yes ) qApp->quit(); } else // Means we're at the end, no need to confirm. - { qApp->quit(); - } } ); connect( JobQueue::instance(), &JobQueue::failed, @@ -132,16 +143,15 @@ ViewManager::addViewStep( ViewStep* step ) void -ViewManager::insertViewStep( int before, ViewStep* step) +ViewManager::insertViewStep( int before, ViewStep* step ) { m_steps.insert( before, step ); QLayout* layout = step->widget()->layout(); if ( layout ) - { layout->setContentsMargins( 0, 0, 0, 0 ); - } m_stack->insertWidget( before, step->widget() ); + connect( step, &ViewStep::enlarge, this, &ViewManager::enlarge ); connect( step, &ViewStep::nextStatusChanged, this, [this]( bool status ) { @@ -165,22 +175,21 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail cLog() << "- message:" << message; cLog() << "- details:" << details; - QMessageBox msgBox; - msgBox.setIcon( QMessageBox::Critical ); - msgBox.setWindowTitle( tr("Error") ); - msgBox.setText( "" + tr( "Installation Failed" ) + "" ); - msgBox.setStandardButtons( QMessageBox::Close ); + QMessageBox* msgBox = new QMessageBox(); + msgBox->setIcon( QMessageBox::Critical ); + msgBox->setWindowTitle( tr( "Error" ) ); + msgBox->setText( "" + tr( "Installation Failed" ) + "" ); + msgBox->setStandardButtons( QMessageBox::Close ); + msgBox->button( QMessageBox::Close )->setText( tr( "&Close" ) ); QString text = "

" + message + "

"; if ( !details.isEmpty() ) - { text += "

" + details + "

"; - } - msgBox.setInformativeText( text ); + msgBox->setInformativeText( text ); - msgBox.exec(); - cLog() << "Calamares will now quit."; - qApp->quit(); + connect( msgBox, &QMessageBox::buttonClicked, qApp, &QApplication::quit ); + cLog() << "Calamares will quit when the dialog closes."; + msgBox->show(); } @@ -216,8 +225,8 @@ ViewManager::next() // and right before switching to an execution phase. // Depending on Calamares::Settings, we show an "are you sure" prompt or not. if ( Calamares::Settings::instance()->showPromptBeforeExecution() && - m_currentStep + 1 < m_steps.count() && - qobject_cast< ExecutionViewStep* >( m_steps.at( m_currentStep + 1 ) ) ) + m_currentStep + 1 < m_steps.count() && + qobject_cast< ExecutionViewStep* >( m_steps.at( m_currentStep + 1 ) ) ) { int reply = QMessageBox::question( m_widget, @@ -225,10 +234,8 @@ ViewManager::next() tr( "The %1 installer is about to make changes to your " "disk in order to install %2.
You will not be able " "to undo these changes." ) - .arg( Calamares::Branding::instance()->string( - Calamares::Branding::ShortProductName ) ) - .arg( Calamares::Branding::instance()->string( - Calamares::Branding::ShortVersionedName ) ), + .arg( *Calamares::Branding::ShortProductName ) + .arg( *Calamares::Branding::ShortVersionedName ), tr( "&Install now" ), tr( "Go &back" ), QString(), @@ -251,17 +258,16 @@ ViewManager::next() } } else - { step->next(); - } m_next->setEnabled( !executing && m_steps.at( m_currentStep )->isNextEnabled() ); m_back->setEnabled( !executing && m_steps.at( m_currentStep )->isBackEnabled() ); if ( m_currentStep == m_steps.count() -1 && - m_steps.last()->isAtEnd() ) + m_steps.last()->isAtEnd() ) { - m_quit->setText( tr( "&Quit" ) ); + m_quit->setText( tr( "&Done" ) ); + m_quit->setToolTip( tr( "The installation is complete. Close the installer." ) ); } } @@ -279,9 +285,7 @@ ViewManager::back() emit currentStepChanged(); } else if ( !step->isAtBeginning() ) - { step->back(); - } else return; m_next->setEnabled( m_steps.at( m_currentStep )->isNextEnabled() ); @@ -292,7 +296,10 @@ ViewManager::back() if ( !( m_currentStep == m_steps.count() -1 && m_steps.last()->isAtEnd() ) ) + { m_quit->setText( tr( "&Cancel" ) ); + m_quit->setToolTip( tr( "Cancel installation without changing the system." ) ); + } } } diff --git a/src/libcalamaresui/ViewManager.h b/src/libcalamaresui/ViewManager.h index 6e694a14a..38ddda70a 100644 --- a/src/libcalamaresui/ViewManager.h +++ b/src/libcalamaresui/ViewManager.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -43,12 +44,10 @@ class UIDLLEXPORT ViewManager : public QObject public: /** * @brief instance access to the ViewManager singleton. - * @return + * @return pointer to the singleton instance. */ static ViewManager* instance(); - - explicit ViewManager( QObject* parent = nullptr ); - virtual ~ViewManager(); + static ViewManager* instance( QObject* parent ); /** * @brief centralWidget always returns the central widget in the Calamares main @@ -113,8 +112,12 @@ public slots: signals: void currentStepChanged(); + void enlarge( QSize enlarge ) const; // See ViewStep::enlarge() private: + explicit ViewManager( QObject* parent = nullptr ); + virtual ~ViewManager(); + void insertViewStep( int before, ViewStep* step ); static ViewManager* s_instance; diff --git a/src/libcalamaresui/modulesystem/CppJobModule.h b/src/libcalamaresui/modulesystem/CppJobModule.h index 127614ec5..46d27bf8b 100644 --- a/src/libcalamaresui/modulesystem/CppJobModule.h +++ b/src/libcalamaresui/modulesystem/CppJobModule.h @@ -2,6 +2,7 @@ * * Copyright 2014, Teo Mrnjavac * Copyright 2016, Kevin Kofler + * 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 @@ -25,7 +26,8 @@ class QPluginLoader; -namespace Calamares { +namespace Calamares +{ class UIDLLEXPORT CppJobModule : public Module { @@ -42,7 +44,7 @@ protected: private: friend class Module; //so only the superclass can instantiate explicit CppJobModule(); - virtual ~CppJobModule(); + virtual ~CppJobModule() override; QPluginLoader* m_loader; job_ptr m_job; diff --git a/src/libcalamaresui/modulesystem/Module.cpp b/src/libcalamaresui/modulesystem/Module.cpp index 1b3da87e8..96ec0cceb 100644 --- a/src/libcalamaresui/modulesystem/Module.cpp +++ b/src/libcalamaresui/modulesystem/Module.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -75,18 +76,22 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor, << instanceId; return nullptr; } - if ( typeString == "view" ) + if ( ( typeString == "view" ) || ( typeString == "viewmodule" ) ) { if ( intfString == "qtplugin" ) { m = new ViewModule(); } -#ifdef WITH_PYTHONQT else if ( intfString == "pythonqt" ) { +#ifdef WITH_PYTHONQT m = new PythonQtViewModule(); - } +#else + 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" ) { @@ -98,17 +103,25 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor, { m = new ProcessJobModule(); } -#ifdef WITH_PYTHON else if ( intfString == "python" ) { +#ifdef WITH_PYTHON m = new PythonJobModule(); - } +#else + 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() << Q_FUNC_INFO << "bad module type or interface string" - << instanceId << typeString << intfString; + cLog() << "Bad module type (" << typeString + << ") or interface string (" << intfString + << ") for module " << instanceId; return nullptr; } diff --git a/src/libcalamaresui/modulesystem/Module.h b/src/libcalamaresui/modulesystem/Module.h index 7c331351d..5f756938f 100644 --- a/src/libcalamaresui/modulesystem/Module.h +++ b/src/libcalamaresui/modulesystem/Module.h @@ -100,9 +100,9 @@ public: /** * @brief instanceKey returns the instance key of this module. * @return a string with the instance key. - * A module instance's instance key is modulename@instanceid. - * @example "partition@partition" (default configuration) or - * "locale@someconfig" (custom configuration) + * A module instance's instance key is modulename\@instanceid. + * For instance, "partition\@partition" (default configuration) or + * "locale\@someconfig" (custom configuration) */ virtual QString instanceKey() const final; diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp index dd7abdf29..44eed30f0 100644 --- a/src/libcalamaresui/modulesystem/ModuleManager.cpp +++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp @@ -57,7 +57,13 @@ ModuleManager::ModuleManager( const QStringList& paths, QObject* parent ) ModuleManager::~ModuleManager() -{} +{ + // The map is populated with Module::fromDescriptor(), which allocates on the heap. + for( auto moduleptr : m_loadedModulesByInstanceKey ) + { + delete moduleptr; + } +} void @@ -213,14 +219,14 @@ ModuleManager::loadModules() } auto findCustomInstance = - [ customInstances ]( const QString& moduleName, - const QString& instanceId ) -> int + [ customInstances ]( const QString& module, + const QString& id) -> int { for ( int i = 0; i < customInstances.count(); ++i ) { auto thisInstance = customInstances[ i ]; - if ( thisInstance.value( "module" ) == moduleName && - thisInstance.value( "id" ) == instanceId ) + if ( thisInstance.value( "module" ) == module && + thisInstance.value( "id" ) == id ) return i; } return -1; diff --git a/src/libcalamaresui/modulesystem/ProcessJobModule.h b/src/libcalamaresui/modulesystem/ProcessJobModule.h index b160fd25f..af9a46bd5 100644 --- a/src/libcalamaresui/modulesystem/ProcessJobModule.h +++ b/src/libcalamaresui/modulesystem/ProcessJobModule.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Teo Mrnjavac + * 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 @@ -23,7 +24,8 @@ #include "UiDllMacro.h" -namespace Calamares { +namespace Calamares +{ class UIDLLEXPORT ProcessJobModule : public Module { @@ -40,7 +42,7 @@ protected: private: friend class Module; explicit ProcessJobModule(); - virtual ~ProcessJobModule(); + virtual ~ProcessJobModule() override; QString m_command; QString m_workingPath; diff --git a/src/libcalamaresui/modulesystem/PythonJobModule.h b/src/libcalamaresui/modulesystem/PythonJobModule.h index e47d777c9..c82137cb8 100644 --- a/src/libcalamaresui/modulesystem/PythonJobModule.h +++ b/src/libcalamaresui/modulesystem/PythonJobModule.h @@ -40,7 +40,7 @@ protected: private: friend class Module; explicit PythonJobModule(); - virtual ~PythonJobModule(); + virtual ~PythonJobModule() override; QString m_scriptFileName; QString m_workingPath; diff --git a/src/libcalamaresui/modulesystem/ViewModule.h b/src/libcalamaresui/modulesystem/ViewModule.h index 177c1eba1..6b2e381a2 100644 --- a/src/libcalamaresui/modulesystem/ViewModule.h +++ b/src/libcalamaresui/modulesystem/ViewModule.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Teo Mrnjavac + * 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 @@ -24,7 +25,8 @@ class QPluginLoader; -namespace Calamares { +namespace Calamares +{ class ViewStep; @@ -43,7 +45,7 @@ protected: private: friend class Module; //so only the superclass can instantiate explicit ViewModule(); - virtual ~ViewModule(); + virtual ~ViewModule() override; QPluginLoader* m_loader; ViewStep* m_viewStep = nullptr; diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp index 9307ba389..3b04897ae 100644 --- a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp +++ b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp @@ -39,6 +39,7 @@ static int s_defaultFontHeight = 0; QPixmap defaultPixmap( ImageType type, ImageMode mode, const QSize& size ) { + Q_UNUSED( mode ); QPixmap pixmap; switch ( type ) @@ -106,9 +107,6 @@ defaultPixmap( ImageType type, ImageMode mode, const QSize& size ) case Squid: pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/squid.svg", size ); break; - - default: - break; } if ( pixmap.isNull() ) @@ -142,7 +140,7 @@ createRoundedImage( const QPixmap& pixmap, const QSize& size, float frameWidthPc return QPixmap(); QPixmap scaledAvatar = pixmap.scaled( width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ); - if ( frameWidthPct == 0.00 ) + if ( frameWidthPct == 0.00f ) return scaledAvatar; QPixmap frame( width, height ); @@ -159,7 +157,7 @@ createRoundedImage( const QPixmap& pixmap, const QSize& size, float frameWidthPc painter.setBrush( brush ); painter.setPen( pen ); - painter.drawRoundedRect( outerRect, frameWidthPct * 100.0, frameWidthPct * 100.0, Qt::RelativeSize ); + painter.drawRoundedRect( outerRect, qreal(frameWidthPct) * 100.0, qreal(frameWidthPct) * 100.0, Qt::RelativeSize ); /* painter.setBrush( Qt::transparent ); painter.setPen( Qt::white ); @@ -225,7 +223,7 @@ setDefaultFontSize( int points ) QSize defaultIconSize() { - const int w = defaultFontHeight() * 1.6; + const int w = int(defaultFontHeight() * 1.6); return QSize( w, w ); } diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h index d838024f2..e675d0672 100644 --- a/src/libcalamaresui/utils/CalamaresUtilsGui.h +++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -92,7 +93,7 @@ UIDLLEXPORT QPixmap defaultPixmap( ImageType type, */ UIDLLEXPORT QPixmap createRoundedImage( const QPixmap& avatar, const QSize& size, - float frameWidthPct = 0.20 ); + float frameWidthPct = 0.20f ); /** * @brief unmarginLayout recursively walks the QLayout tree and removes all margins. @@ -113,6 +114,13 @@ UIDLLEXPORT int defaultFontHeight(); // in pixels, DPI-specific UIDLLEXPORT QFont defaultFont(); UIDLLEXPORT QSize defaultIconSize(); +/** + * @brief Size constants for the main Calamares window. + */ +constexpr int windowMinimumWidth = 800; +constexpr int windowMinimumHeight = 520; +constexpr int windowPreferredWidth = 1024; +constexpr int windowPreferredHeight = 520; } #endif // CALAMARESUTILSGUI_H diff --git a/src/libcalamaresui/utils/ImageRegistry.cpp b/src/libcalamaresui/utils/ImageRegistry.cpp index ad3e606ab..442017048 100644 --- a/src/libcalamaresui/utils/ImageRegistry.cpp +++ b/src/libcalamaresui/utils/ImageRegistry.cpp @@ -1,31 +1,31 @@ -/* === This file is part of Calamares - === +/* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac - * - * Originally from Tomahawk, - * Copyright 2012, Christian Muehlhaeuser - * - * Calamares is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Calamares is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calamares. If not, see . + * SPDX-License-Identifier: GPLv3+ + * License-Filename: LICENSES/GPLv3+-ImageRegistry */ +/* + * Copyright 2012, Christian Muehlhaeuser + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "ImageRegistry.h" #include #include -#include - -#include "utils/Logger.h" +#include static QHash< QString, QHash< int, QHash< qint64, QPixmap > > > s_cache; ImageRegistry* ImageRegistry::s_instance = 0; @@ -61,6 +61,12 @@ ImageRegistry::cacheKey( const QSize& size, float opacity, QColor tint ) QPixmap ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode, float opacity, QColor tint ) { + if ( size.width() < 0 || size.height() < 0 ) + { + Q_ASSERT( false ); + return QPixmap(); + } + QHash< qint64, QPixmap > subsubcache; QHash< int, QHash< qint64, QPixmap > > subcache; @@ -82,11 +88,10 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils:: // Image not found in cache. Let's load it. QPixmap pixmap; - if ( image.toLower().endsWith( ".svg" ) || - image.toLower().endsWith( ".svgz" ) ) + if ( image.toLower().endsWith( ".svg" ) ) { QSvgRenderer svgRenderer( image ); - QPixmap p( size.isNull() ? svgRenderer.defaultSize() : size ); + QPixmap p( size.isNull() || size.height() == 0 || size.width() == 0 ? svgRenderer.defaultSize() : size ); p.fill( Qt::transparent ); QPainter pixPainter( &p ); @@ -105,7 +110,7 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils:: resultImage.setAlphaChannel( p.toImage().alphaChannel() ); p = QPixmap::fromImage( resultImage ); - } + } pixmap = p; } @@ -125,7 +130,18 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils:: } if ( !size.isNull() && pixmap.size() != size ) - pixmap = pixmap.scaled( size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ); + { + if ( size.width() == 0 ) + { + pixmap = pixmap.scaledToHeight( size.height(), Qt::SmoothTransformation ); + } + else if ( size.height() == 0 ) + { + pixmap = pixmap.scaledToWidth( size.width(), Qt::SmoothTransformation ); + } + else + pixmap = pixmap.scaled( size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ); + } putInCache( image, size, mode, opacity, pixmap, tint ); } @@ -137,8 +153,6 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils:: void ImageRegistry::putInCache( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode, float opacity, const QPixmap& pixmap, QColor tint ) { -// cDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Adding to image cache:" << image << size << mode; - QHash< qint64, QPixmap > subsubcache; QHash< int, QHash< qint64, QPixmap > > subcache; diff --git a/src/libcalamaresui/utils/ImageRegistry.h b/src/libcalamaresui/utils/ImageRegistry.h index 41ed2d6ac..e35eaf74a 100644 --- a/src/libcalamaresui/utils/ImageRegistry.h +++ b/src/libcalamaresui/utils/ImageRegistry.h @@ -1,24 +1,26 @@ -/* === This file is part of Calamares - === +/* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac - * - * Originally from Tomahawk, - * Copyright 2012, Christian Muehlhaeuser - * - * Calamares is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Calamares is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calamares. If not, see . + * SPDX-License-Identifier: GPLv3+ + * License-Filename: LICENSES/GPLv3+-ImageRegistry */ +/* + * Copyright 2012, Christian Muehlhaeuser + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #ifndef IMAGE_REGISTRY_H #define IMAGE_REGISTRY_H diff --git a/src/libcalamaresui/utils/YamlUtils.cpp b/src/libcalamaresui/utils/YamlUtils.cpp index 5003e98c7..4b1a8fd86 100644 --- a/src/libcalamaresui/utils/YamlUtils.cpp +++ b/src/libcalamaresui/utils/YamlUtils.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Teo Mrnjavac + * 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 @@ -17,14 +18,17 @@ */ #include "YamlUtils.h" +#include "utils/Logger.h" + #include +#include #include void operator>>( const YAML::Node& node, QStringList& v ) { - for ( int i = 0; i < node.size(); ++i ) + for ( size_t i = 0; i < node.size(); ++i ) { v.append( QString::fromStdString( node[ i ].as< std::string >() ) ); } @@ -51,9 +55,11 @@ yamlToVariant( const YAML::Node& node ) return yamlMapToVariant( node ); case YAML::NodeType::Null: + case YAML::NodeType::Undefined: return QVariant(); } + // NOTREACHED return QVariant(); } @@ -102,4 +108,42 @@ yamlMapToVariant( const YAML::Node& mapNode ) } +void +explainYamlException( const YAML::Exception& e, const QByteArray& yamlData, const char *label ) +{ + cDebug() << "WARNING: YAML error " << e.what() << "in" << label << '.'; + if ( ( e.mark.line >= 0 ) && ( e.mark.column >= 0 ) ) + { + // Try to show the line where it happened. + int linestart = 0; + for ( int linecount = 0; linecount < e.mark.line; ++linecount ) + { + linestart = yamlData.indexOf( '\n', linestart ); + // No more \ns found, weird + if ( linestart < 0 ) + break; + linestart += 1; // Skip that \n + } + int lineend = linestart; + if ( linestart >= 0 ) + { + lineend = yamlData.indexOf( '\n', linestart ); + if ( lineend < 0 ) + lineend = yamlData.length(); + } + + int rangestart = linestart; + int rangeend = lineend; + // Adjust range (linestart..lineend) so it's not too long + if ( ( linestart >= 0 ) && ( e.mark.column > 30 ) ) + rangestart += ( e.mark.column - 30 ); + if ( ( linestart >= 0 ) && ( rangeend - rangestart > 40 ) ) + rangeend = rangestart + 40; + + if ( linestart >= 0 ) + cDebug() << "WARNING: offending YAML data:" << yamlData.mid( rangestart, rangeend-rangestart ).constData(); + + } } + +} // namespace diff --git a/src/libcalamaresui/utils/YamlUtils.h b/src/libcalamaresui/utils/YamlUtils.h index a39934f51..1da36178c 100644 --- a/src/libcalamaresui/utils/YamlUtils.h +++ b/src/libcalamaresui/utils/YamlUtils.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Teo Mrnjavac + * 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 @@ -22,9 +23,12 @@ #include #include +class QByteArray; + namespace YAML { class Node; +class Exception; } void operator>>( const YAML::Node& node, QStringList& v ); @@ -37,6 +41,13 @@ QVariant yamlScalarToVariant( const YAML::Node& scalarNode ); QVariant yamlSequenceToVariant( const YAML::Node& sequenceNode ); QVariant yamlMapToVariant( const YAML::Node& mapNode ); +/** + * Given an exception from the YAML parser library, explain + * what is going on in terms of the data passed to the parser. + * Uses @p label when labeling the data source (e.g. "netinstall data") + */ +void explainYamlException( const YAML::Exception& e, const QByteArray& data, const char *label ); + } //ns #endif // YAMLUTILS_H diff --git a/src/libcalamaresui/utils/qjsonitem.cpp b/src/libcalamaresui/utils/qjsonitem.cpp index 35c9725dd..24494f0fd 100644 --- a/src/libcalamaresui/utils/qjsonitem.cpp +++ b/src/libcalamaresui/utils/qjsonitem.cpp @@ -1,27 +1,31 @@ -/* === This file is part of Calamares - === +/* === This file is part of Calamares - === * - * Originally from QJsonModel - * Copyright 2015, Sacha Schutz - * - * Calamares is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Calamares is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calamares. If not, see . + * SPDX-License-Identifier: GPL-3.0+ + * License-Filename: LICENSES/GPLv3+-QJsonModel */ +/*********************************************** + Copyright (C) 2014 Schutz Sacha + This file is part of QJsonModel (https://github.com/dridk/QJsonmodel). + + QJsonModel is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QJsonModel is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QJsonModel. If not, see . + +**********************************************/ #include "qjsonitem.h" QJsonTreeItem::QJsonTreeItem(QJsonTreeItem *parent) - : mType( QJsonValue::Null ) { mParent = parent; @@ -104,8 +108,7 @@ QJsonTreeItem* QJsonTreeItem::load(const QJsonValue& value, QJsonTreeItem* paren { //Get all QJsonValue childs - const auto keys = value.toObject().keys(); - for (const QString &key : keys){ + foreach (QString key , value.toObject().keys()){ QJsonValue v = value.toObject().value(key); QJsonTreeItem * child = load(v,rootItem); child->setKey(key); @@ -120,8 +123,7 @@ QJsonTreeItem* QJsonTreeItem::load(const QJsonValue& value, QJsonTreeItem* paren { //Get all QJsonValue childs int index = 0; - const auto valueArray = value.toArray(); - for (const QJsonValue &v : valueArray) { + foreach (QJsonValue v , value.toArray()){ QJsonTreeItem * child = load(v,rootItem); child->setKey(QString::number(index)); diff --git a/src/libcalamaresui/utils/qjsonitem.h b/src/libcalamaresui/utils/qjsonitem.h index 58ea02d32..5a8b2134f 100644 --- a/src/libcalamaresui/utils/qjsonitem.h +++ b/src/libcalamaresui/utils/qjsonitem.h @@ -1,20 +1,7 @@ -/* === This file is part of Calamares - === +/* === This file is part of Calamares - === * - * Originally from QJsonModel - * Copyright 2015, Sacha Schutz - * - * Calamares is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Calamares is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calamares. If not, see . + * SPDX-License-Identifier: GPL-3.0+ + * License-Filename: LICENSES/GPLv3+-QJsonModel */ #ifndef JSONITEM_H @@ -27,7 +14,7 @@ class QJsonTreeItem { public: QJsonTreeItem(QJsonTreeItem * parent = 0); - virtual ~QJsonTreeItem(); + ~QJsonTreeItem(); void appendChild(QJsonTreeItem * item); QJsonTreeItem *child(int row); QJsonTreeItem *parent(); diff --git a/src/libcalamaresui/utils/qjsonmodel.cpp b/src/libcalamaresui/utils/qjsonmodel.cpp index 3d427d0fb..5ce0cd695 100644 --- a/src/libcalamaresui/utils/qjsonmodel.cpp +++ b/src/libcalamaresui/utils/qjsonmodel.cpp @@ -1,22 +1,27 @@ -/* === This file is part of Calamares - === +/* === This file is part of Calamares - === * - * Originally from QJsonModel - * Copyright 2015, Sacha Schutz - * - * Calamares is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Calamares is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calamares. If not, see . + * SPDX-License-Identifier: GPL-3.0+ + * License-Filename: LICENSES/GPLv3+-QJsonModel */ +/*********************************************** + Copyright (C) 2014 Schutz Sacha + This file is part of QJsonModel (https://github.com/dridk/QJsonmodel). + + QJsonModel is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QJsonModel is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QJsonModel. If not, see . + +**********************************************/ #include "qjsonmodel.h" #include @@ -36,13 +41,6 @@ QJsonModel::QJsonModel(QObject *parent) : } - -QJsonModel::~QJsonModel() -{ - delete mRootItem; -} - - bool QJsonModel::load(const QString &fileName) { QFile file(fileName); @@ -68,7 +66,11 @@ bool QJsonModel::loadJson(const QByteArray &json) if (!mDocument.isNull()) { beginResetModel(); - mRootItem = QJsonTreeItem::load(QJsonValue(mDocument.object())); + if (mDocument.isArray()) { + mRootItem = QJsonTreeItem::load(QJsonValue(mDocument.array())); + } else { + mRootItem = QJsonTreeItem::load(QJsonValue(mDocument.object())); + } endResetModel(); return true; } diff --git a/src/libcalamaresui/utils/qjsonmodel.h b/src/libcalamaresui/utils/qjsonmodel.h index a76d807d8..6a2399287 100644 --- a/src/libcalamaresui/utils/qjsonmodel.h +++ b/src/libcalamaresui/utils/qjsonmodel.h @@ -1,23 +1,9 @@ -/* === This file is part of Calamares - === +/* === This file is part of Calamares - === * - * Originally from QJsonModel - * Copyright 2015, Sacha Schutz - * - * Calamares is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Calamares is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calamares. If not, see . + * SPDX-License-Identifier: GPL-3.0+ + * License-Filename: LICENSES/GPLv3+-QJsonModel */ - #ifndef QJSONMODEL_H #define QJSONMODEL_H @@ -31,7 +17,6 @@ class QJsonModel : public QAbstractItemModel Q_OBJECT public: explicit QJsonModel(QObject *parent = 0); - virtual ~QJsonModel(); bool load(const QString& fileName); bool load(QIODevice * device); bool loadJson(const QByteArray& json); diff --git a/src/libcalamaresui/viewpages/ViewStep.cpp b/src/libcalamaresui/viewpages/ViewStep.cpp index 6d5a5f746..96d80cb5f 100644 --- a/src/libcalamaresui/viewpages/ViewStep.cpp +++ b/src/libcalamaresui/viewpages/ViewStep.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Teo Mrnjavac + * 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 @@ -61,6 +62,8 @@ ViewStep::setModuleInstanceKey( const QString& instanceKey ) void ViewStep::setConfigurationMap( const QVariantMap& configurationMap ) -{} +{ + Q_UNUSED( configurationMap ); +} } diff --git a/src/libcalamaresui/viewpages/ViewStep.h b/src/libcalamaresui/viewpages/ViewStep.h index c68ae31f5..617d64fe1 100644 --- a/src/libcalamaresui/viewpages/ViewStep.h +++ b/src/libcalamaresui/viewpages/ViewStep.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -34,20 +35,33 @@ 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 { Q_OBJECT public: explicit ViewStep( QObject* parent = nullptr ); - virtual ~ViewStep(); + virtual ~ViewStep() override; 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; @@ -80,7 +94,10 @@ public: virtual QList< job_ptr > jobs() const = 0; void setModuleInstanceKey( const QString& instanceKey ); - QString moduleInstanceKey() const { return m_instanceKey; } + QString moduleInstanceKey() const + { + return m_instanceKey; + } virtual void setConfigurationMap( const QVariantMap& configurationMap ); @@ -88,6 +105,12 @@ signals: void nextStatusChanged( bool status ); void done(); + /* Emitted when the viewstep thinks it needs more space than is currently + * available for display. @p enlarge is the requested additional space, + * e.g. 24px vertical. This request may be silently ignored. + */ + void enlarge( QSize enlarge ) const; + protected: QString m_instanceKey; }; diff --git a/src/libcalamaresui/widgets/ClickableLabel.h b/src/libcalamaresui/widgets/ClickableLabel.h index fc198b98b..42af076f5 100644 --- a/src/libcalamaresui/widgets/ClickableLabel.h +++ b/src/libcalamaresui/widgets/ClickableLabel.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Teo Mrnjavac + * 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 @@ -28,14 +29,14 @@ class ClickableLabel : public QLabel public: explicit ClickableLabel( QWidget* parent = nullptr, Qt::WindowFlags f = 0 ); explicit ClickableLabel( const QString& text, QWidget* parent = nullptr, Qt::WindowFlags f = 0 ); - virtual ~ClickableLabel(); + virtual ~ClickableLabel() override; signals: void clicked(); protected: - virtual void mousePressEvent( QMouseEvent* event ); - virtual void mouseReleaseEvent( QMouseEvent* event ); + virtual void mousePressEvent( QMouseEvent* event ) override; + virtual void mouseReleaseEvent( QMouseEvent* event ) override; private: QTime m_time; diff --git a/src/libcalamaresui/widgets/FixedAspectRatioLabel.cpp b/src/libcalamaresui/widgets/FixedAspectRatioLabel.cpp index 4920605bc..f07491bcd 100644 --- a/src/libcalamaresui/widgets/FixedAspectRatioLabel.cpp +++ b/src/libcalamaresui/widgets/FixedAspectRatioLabel.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2015, Teo Mrnjavac + * 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 @@ -42,6 +43,7 @@ FixedAspectRatioLabel::setPixmap( const QPixmap& pixmap ) void FixedAspectRatioLabel::resizeEvent( QResizeEvent* event ) { + Q_UNUSED( event ); QLabel::setPixmap( m_pixmap.scaled( contentsRect().size(), Qt::KeepAspectRatio, diff --git a/src/libcalamaresui/widgets/FixedAspectRatioLabel.h b/src/libcalamaresui/widgets/FixedAspectRatioLabel.h index 71fc6e9d3..33cc4708f 100644 --- a/src/libcalamaresui/widgets/FixedAspectRatioLabel.h +++ b/src/libcalamaresui/widgets/FixedAspectRatioLabel.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2015, Teo Mrnjavac + * 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 @@ -27,10 +28,10 @@ class FixedAspectRatioLabel : public QLabel Q_OBJECT public: explicit FixedAspectRatioLabel( QWidget* parent = nullptr ); - virtual ~FixedAspectRatioLabel(); + virtual ~FixedAspectRatioLabel() override; public slots: - virtual void setPixmap( const QPixmap &pixmap ); + void setPixmap( const QPixmap &pixmap ); void resizeEvent( QResizeEvent* event ) override; private: diff --git a/src/libcalamaresui/widgets/QtWaitingSpinner.cpp b/src/libcalamaresui/widgets/QtWaitingSpinner.cpp deleted file mode 100644 index c298a61ec..000000000 --- a/src/libcalamaresui/widgets/QtWaitingSpinner.cpp +++ /dev/null @@ -1,176 +0,0 @@ -/* === This file is part of Calamares - === - * - * Copyright 2014, Teo Mrnjavac - * - * Originally from https://github.com/snowwlex/QtWaitingSpinner - * Copyright 2012, Alex Turkin - * - * Calamares is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Calamares is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calamares. If not, see . - */ - -#include -#include - -#include - -#include "QtWaitingSpinner.h" - -QtWaitingSpinner::QtWaitingSpinner(int linesNumber, int length, int width, int radius, QWidget* parent) : QWidget(parent), - myLinesNumber(linesNumber), - myLength(length + width), - myWidth(width), - myRadius(radius), - myRoundness(70.0), - myColor(Qt::black), - mySpeed(1), - myTrail(70), - myOpacity(15) -{ - myCurrentCounter = 0; - myTimer = new QTimer(this); - connect(myTimer,SIGNAL(timeout()), this, SLOT(rotate())); - updateSize(); - updateTimer(); - this->hide(); -} - -void QtWaitingSpinner::paintEvent(QPaintEvent* /*ev*/) { - QPainter painter(this); - painter.fillRect(this->rect(), Qt::transparent); - painter.setRenderHint(QPainter::Antialiasing, true); - - if (myCurrentCounter >= myLinesNumber) { - myCurrentCounter = 0; - } - painter.setPen(Qt::NoPen); - for (int i = 0; i < myLinesNumber; ++i) { - painter.save(); - painter.translate(myRadius + myLength, myRadius + myLength); - qreal rotateAngle = (qreal)360 * qreal(i) / qreal(myLinesNumber); - painter.rotate(rotateAngle); - painter.translate(myRadius, 0); - int distance = lineDistance(i, myCurrentCounter, myLinesNumber); - QColor color = countTrailColor(distance, myLinesNumber, myTrail, myOpacity, myColor); - painter.setBrush(color); - //TODO improve the way rounded rect is painted - painter.drawRoundedRect(QRect(0, -myWidth/2, myLength, myWidth), myRoundness, myRoundness, Qt::RelativeSize); - painter.restore(); - } -} - -void QtWaitingSpinner::start() { - this->show(); - if (!myTimer->isActive()) { - myTimer->start(); - myCurrentCounter = 0; - } -} - -void QtWaitingSpinner::finish() { - this->hide(); - if (myTimer->isActive()) { - myTimer->stop(); - myCurrentCounter = 0; - } -} - -void QtWaitingSpinner::setLinesNumber(int linesNumber) { - myLinesNumber = linesNumber; - myCurrentCounter = 0; - updateTimer(); -} - -void QtWaitingSpinner::setLength(int length){ - myLength = length; - updateSize(); -} - -void QtWaitingSpinner::setWidth(int width) { - myWidth = width; - updateSize(); -} - -void QtWaitingSpinner::setRadius(int radius) { - myRadius = radius; - updateSize(); -} - -void QtWaitingSpinner::setRoundness(qreal roundness) { - myRoundness = std::max(0.0, std::min(100.0, roundness)); -} - -void QtWaitingSpinner::setColor(QColor color) { - myColor = color; -} - -void QtWaitingSpinner::setSpeed(qreal speed) { - mySpeed = speed; - updateTimer(); -} - -void QtWaitingSpinner::setTrail(int trail) { - myTrail = trail; -} - -void QtWaitingSpinner::setOpacity(int minOpacity) { - myOpacity = minOpacity; -} - -void QtWaitingSpinner::rotate() { - ++myCurrentCounter; - if (myCurrentCounter >= myLinesNumber) { - myCurrentCounter = 0; - } - update(); -} - -void QtWaitingSpinner::updateSize() { - int size = (myRadius + myLength) * 2; - setFixedSize(size, size); -} - -void QtWaitingSpinner::updateTimer() { - myTimer->setInterval(countTimeout(myLinesNumber, mySpeed)); -} - -int QtWaitingSpinner::countTimeout(int lines, qreal speed) { - return 1000 / (lines * speed); -} - -int QtWaitingSpinner::lineDistance(int from, int to, int lines) { - int result = to - from; - if (result < 0) { - result += lines; - } - return result; -} - -QColor QtWaitingSpinner::countTrailColor(int distance, int lines, int trail, int minOpacity, QColor color) { - if (distance == 0) { - return color; - } - const qreal minAlphaF = (qreal)minOpacity / 100; - int distanceThreshold = ceil( (lines - 1) * (qreal)trail / 100); - if (distance > distanceThreshold) { - color.setAlphaF(minAlphaF); - return color; - } - qreal alphaDiff = color.alphaF() - (qreal)minAlphaF; - qreal gradation = alphaDiff / (qreal)(distanceThreshold + 1); - qreal resultAlpha = color.alphaF() - gradation * distance; - resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds - color.setAlphaF(resultAlpha); - return color; -} - diff --git a/src/libcalamaresui/widgets/QtWaitingSpinner.h b/src/libcalamaresui/widgets/QtWaitingSpinner.h deleted file mode 100644 index b01ebd1a8..000000000 --- a/src/libcalamaresui/widgets/QtWaitingSpinner.h +++ /dev/null @@ -1,82 +0,0 @@ -/* === This file is part of Calamares - === - * - * Copyright 2014, Teo Mrnjavac - * - * Originally from https://github.com/snowwlex/QtWaitingSpinner - * Copyright 2012, Alex Turkin - * - * Calamares is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Calamares is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calamares. If not, see . - */ - -#ifndef QTWAITINGSPINNER_H -#define QTWAITINGSPINNER_H - -#include "UiDllMacro.h" - -#include - -#include -#include - -class UIDLLEXPORT QtWaitingSpinner : public QWidget { - Q_OBJECT - -public: - explicit QtWaitingSpinner(int linesNumber = 12, int length = 7, int width = 5, int radius = 10, QWidget* parent = 0); - -public Q_SLOTS: - void start(); - void finish(); - -public: - void setLinesNumber(int linesNumber); - void setLength(int length); - void setWidth(int width); - void setRadius(int radius); - void setRoundness(qreal roundness); - void setColor(QColor color); - void setSpeed(qreal speed); - void setTrail(int trail); - void setOpacity(int minOpacity); - -private Q_SLOTS: - void rotate(); - void updateSize(); - void updateTimer(); - -protected: - void paintEvent(QPaintEvent* ev); - -private: - static int countTimeout(int lines, qreal speed); - static int lineDistance(int from, int to, int lines); - static QColor countTrailColor(int distance, int lines, int trail, int minOpacity, QColor color); - -private: - int myLinesNumber; - int myLength; - int myWidth; - int myRadius; - qreal myRoundness; //0..100 - QColor myColor; - qreal mySpeed; // in rounds per second - int myTrail; - int myOpacity; - -private: - QTimer* myTimer; - int myCurrentCounter; -}; - -#endif // QTWAITINGSPINNER_H diff --git a/src/libcalamaresui/widgets/WaitingWidget.cpp b/src/libcalamaresui/widgets/WaitingWidget.cpp index 55471eff3..03c977691 100644 --- a/src/libcalamaresui/widgets/WaitingWidget.cpp +++ b/src/libcalamaresui/widgets/WaitingWidget.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Teo Mrnjavac + * 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 @@ -19,7 +20,7 @@ #include "WaitingWidget.h" #include "utils/CalamaresUtilsGui.h" -#include "QtWaitingSpinner.h" +#include "waitingspinnerwidget.h" #include #include @@ -34,7 +35,7 @@ WaitingWidget::WaitingWidget( const QString& text, QWidget* parent ) waitingLayout->addLayout( pbLayout ); pbLayout->addStretch(); - QtWaitingSpinner* spnr = new QtWaitingSpinner(); + WaitingSpinnerWidget* spnr = new WaitingSpinnerWidget(); pbLayout->addWidget( spnr ); pbLayout->addStretch(); @@ -43,9 +44,9 @@ WaitingWidget::WaitingWidget( const QString& text, QWidget* parent ) int spnrSize = m_waitingLabel->fontMetrics().height() * 4; spnr->setFixedSize( spnrSize, spnrSize ); - spnr->setRadius( spnrSize / 2 ); - spnr->setLength( spnrSize / 2 ); - spnr->setWidth( spnrSize / 8 ); + spnr->setInnerRadius( spnrSize / 2 ); + spnr->setLineLength( spnrSize / 2 ); + spnr->setLineWidth( spnrSize / 8 ); spnr->start(); m_waitingLabel->setAlignment( Qt::AlignCenter ); diff --git a/src/libcalamaresui/widgets/waitingspinnerwidget.cpp b/src/libcalamaresui/widgets/waitingspinnerwidget.cpp new file mode 100644 index 000000000..317d83807 --- /dev/null +++ b/src/libcalamaresui/widgets/waitingspinnerwidget.cpp @@ -0,0 +1,283 @@ +/* === This file is part of Calamares - === + * + * SPDX-License-Identifier: MIT + * License-Filename: LICENSES/MIT-QtWaitingSpinner + */ + +/* Original Work Copyright (c) 2012-2014 Alexander Turkin + Modified 2014 by William Hallatt + Modified 2015 by Jacob Dawid + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +// Own includes +#include "waitingspinnerwidget.h" + +// Standard includes +#include +#include + +// Qt includes +#include +#include + +WaitingSpinnerWidget::WaitingSpinnerWidget(QWidget *parent, + bool centerOnParent, + bool disableParentWhenSpinning) + : QWidget(parent), + _centerOnParent(centerOnParent), + _disableParentWhenSpinning(disableParentWhenSpinning) { + initialize(); +} + +WaitingSpinnerWidget::WaitingSpinnerWidget(Qt::WindowModality modality, + QWidget *parent, + bool centerOnParent, + bool disableParentWhenSpinning) + : QWidget(parent, Qt::Dialog | Qt::FramelessWindowHint), + _centerOnParent(centerOnParent), + _disableParentWhenSpinning(disableParentWhenSpinning){ + initialize(); + + // We need to set the window modality AFTER we've hidden the + // widget for the first time since changing this property while + // the widget is visible has no effect. + setWindowModality(modality); + setAttribute(Qt::WA_TranslucentBackground); +} + +void WaitingSpinnerWidget::initialize() { + _color = Qt::black; + _roundness = 100.0; + _minimumTrailOpacity = 3.14159265358979323846; + _trailFadePercentage = 80.0; + _revolutionsPerSecond = 1.57079632679489661923; + _numberOfLines = 20; + _lineLength = 10; + _lineWidth = 2; + _innerRadius = 10; + _currentCounter = 0; + _isSpinning = false; + + _timer = new QTimer(this); + connect(_timer, SIGNAL(timeout()), this, SLOT(rotate())); + updateSize(); + updateTimer(); + hide(); +} + +void WaitingSpinnerWidget::paintEvent(QPaintEvent *) { + updatePosition(); + QPainter painter(this); + painter.fillRect(this->rect(), Qt::transparent); + painter.setRenderHint(QPainter::Antialiasing, true); + + if (_currentCounter >= _numberOfLines) { + _currentCounter = 0; + } + + painter.setPen(Qt::NoPen); + for (int i = 0; i < _numberOfLines; ++i) { + painter.save(); + painter.translate(_innerRadius + _lineLength, + _innerRadius + _lineLength); + qreal rotateAngle = + static_cast(360 * i) / static_cast(_numberOfLines); + painter.rotate(rotateAngle); + painter.translate(_innerRadius, 0); + int distance = + lineCountDistanceFromPrimary(i, _currentCounter, _numberOfLines); + QColor color = + currentLineColor(distance, _numberOfLines, _trailFadePercentage, + _minimumTrailOpacity, _color); + painter.setBrush(color); + // TODO improve the way rounded rect is painted + painter.drawRoundedRect( + QRect(0, -_lineWidth / 2, _lineLength, _lineWidth), _roundness, + _roundness, Qt::RelativeSize); + painter.restore(); + } +} + +void WaitingSpinnerWidget::start() { + updatePosition(); + _isSpinning = true; + show(); + + if(parentWidget() && _disableParentWhenSpinning) { + parentWidget()->setEnabled(false); + } + + if (!_timer->isActive()) { + _timer->start(); + _currentCounter = 0; + } +} + +void WaitingSpinnerWidget::stop() { + _isSpinning = false; + hide(); + + if(parentWidget() && _disableParentWhenSpinning) { + parentWidget()->setEnabled(true); + } + + if (_timer->isActive()) { + _timer->stop(); + _currentCounter = 0; + } +} + +void WaitingSpinnerWidget::setNumberOfLines(int lines) { + _numberOfLines = lines; + _currentCounter = 0; + updateTimer(); +} + +void WaitingSpinnerWidget::setLineLength(int length) { + _lineLength = length; + updateSize(); +} + +void WaitingSpinnerWidget::setLineWidth(int width) { + _lineWidth = width; + updateSize(); +} + +void WaitingSpinnerWidget::setInnerRadius(int radius) { + _innerRadius = radius; + updateSize(); +} + +QColor WaitingSpinnerWidget::color() { + return _color; +} + +qreal WaitingSpinnerWidget::roundness() { + return _roundness; +} + +qreal WaitingSpinnerWidget::minimumTrailOpacity() { + return _minimumTrailOpacity; +} + +qreal WaitingSpinnerWidget::trailFadePercentage() { + return _trailFadePercentage; +} + +qreal WaitingSpinnerWidget::revolutionsPersSecond() { + return _revolutionsPerSecond; +} + +int WaitingSpinnerWidget::numberOfLines() { + return _numberOfLines; +} + +int WaitingSpinnerWidget::lineLength() { + return _lineLength; +} + +int WaitingSpinnerWidget::lineWidth() { + return _lineWidth; +} + +int WaitingSpinnerWidget::innerRadius() { + return _innerRadius; +} + +bool WaitingSpinnerWidget::isSpinning() const { + return _isSpinning; +} + +void WaitingSpinnerWidget::setRoundness(qreal roundness) { + _roundness = std::max(0.0, std::min(100.0, roundness)); +} + +void WaitingSpinnerWidget::setColor(QColor color) { + _color = color; +} + +void WaitingSpinnerWidget::setRevolutionsPerSecond(qreal revolutionsPerSecond) { + _revolutionsPerSecond = revolutionsPerSecond; + updateTimer(); +} + +void WaitingSpinnerWidget::setTrailFadePercentage(qreal trail) { + _trailFadePercentage = trail; +} + +void WaitingSpinnerWidget::setMinimumTrailOpacity(qreal minimumTrailOpacity) { + _minimumTrailOpacity = minimumTrailOpacity; +} + +void WaitingSpinnerWidget::rotate() { + ++_currentCounter; + if (_currentCounter >= _numberOfLines) { + _currentCounter = 0; + } + update(); +} + +void WaitingSpinnerWidget::updateSize() { + int size = (_innerRadius + _lineLength) * 2; + setFixedSize(size, size); +} + +void WaitingSpinnerWidget::updateTimer() { + _timer->setInterval(1000 / (_numberOfLines * _revolutionsPerSecond)); +} + +void WaitingSpinnerWidget::updatePosition() { + if (parentWidget() && _centerOnParent) { + move(parentWidget()->width() / 2 - width() / 2, + parentWidget()->height() / 2 - height() / 2); + } +} + +int WaitingSpinnerWidget::lineCountDistanceFromPrimary(int current, int primary, + int totalNrOfLines) { + int distance = primary - current; + if (distance < 0) { + distance += totalNrOfLines; + } + return distance; +} + +QColor WaitingSpinnerWidget::currentLineColor(int countDistance, int totalNrOfLines, + qreal trailFadePerc, qreal minOpacity, + QColor color) { + if (countDistance == 0) { + return color; + } + const qreal minAlphaF = minOpacity / 100.0; + int distanceThreshold = + static_cast(ceil((totalNrOfLines - 1) * trailFadePerc / 100.0)); + if (countDistance > distanceThreshold) { + color.setAlphaF(minAlphaF); + } else { + qreal alphaDiff = color.alphaF() - minAlphaF; + qreal gradient = alphaDiff / static_cast(distanceThreshold + 1); + qreal resultAlpha = color.alphaF() - gradient * countDistance; + + // If alpha is out of bounds, clip it. + resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); + color.setAlphaF(resultAlpha); + } + return color; +} diff --git a/src/libcalamaresui/widgets/waitingspinnerwidget.h b/src/libcalamaresui/widgets/waitingspinnerwidget.h new file mode 100644 index 000000000..0ed8e69d3 --- /dev/null +++ b/src/libcalamaresui/widgets/waitingspinnerwidget.h @@ -0,0 +1,120 @@ +/* === This file is part of Calamares - === + * + * SPDX-License-Identifier: MIT + * License-Filename: LICENSES/MIT-QtWaitingSpinner + */ + +/* Original Work Copyright (c) 2012-2014 Alexander Turkin + Modified 2014 by William Hallatt + Modified 2015 by Jacob Dawid +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +#pragma once + +// Qt includes +#include +#include +#include + +class WaitingSpinnerWidget : public QWidget { + Q_OBJECT +public: + /*! Constructor for "standard" widget behaviour - use this + * constructor if you wish to, e.g. embed your widget in another. */ + WaitingSpinnerWidget(QWidget *parent = 0, + bool centerOnParent = true, + bool disableParentWhenSpinning = true); + + /*! Constructor - use this constructor to automatically create a modal + * ("blocking") spinner on top of the calling widget/window. If a valid + * parent widget is provided, "centreOnParent" will ensure that + * QtWaitingSpinner automatically centres itself on it, if not, + * "centreOnParent" is ignored. */ + WaitingSpinnerWidget(Qt::WindowModality modality, + QWidget *parent = 0, + bool centerOnParent = true, + bool disableParentWhenSpinning = true); + +public slots: + void start(); + void stop(); + +public: + void setColor(QColor color); + void setRoundness(qreal roundness); + void setMinimumTrailOpacity(qreal minimumTrailOpacity); + void setTrailFadePercentage(qreal trail); + void setRevolutionsPerSecond(qreal revolutionsPerSecond); + void setNumberOfLines(int lines); + void setLineLength(int length); + void setLineWidth(int width); + void setInnerRadius(int radius); + void setText(QString text); + + QColor color(); + qreal roundness(); + qreal minimumTrailOpacity(); + qreal trailFadePercentage(); + qreal revolutionsPersSecond(); + int numberOfLines(); + int lineLength(); + int lineWidth(); + int innerRadius(); + + bool isSpinning() const; + +private slots: + void rotate(); + +protected: + void paintEvent(QPaintEvent *paintEvent); + +private: + static int lineCountDistanceFromPrimary(int current, int primary, + int totalNrOfLines); + static QColor currentLineColor(int distance, int totalNrOfLines, + qreal trailFadePerc, qreal minOpacity, + QColor color); + + void initialize(); + void updateSize(); + void updateTimer(); + void updatePosition(); + +private: + QColor _color; + qreal _roundness; // 0..100 + qreal _minimumTrailOpacity; + qreal _trailFadePercentage; + qreal _revolutionsPerSecond; + int _numberOfLines; + int _lineLength; + int _lineWidth; + int _innerRadius; + +private: + WaitingSpinnerWidget(const WaitingSpinnerWidget&); + WaitingSpinnerWidget& operator=(const WaitingSpinnerWidget&); + + QTimer *_timer; + bool _centerOnParent; + bool _disableParentWhenSpinning; + int _currentCounter; + bool _isSpinning; +}; diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index ab4033aa1..48cda5c72 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -13,3 +13,6 @@ foreach( SUBDIRECTORY ${SUBDIRECTORIES} ) calamares_add_module_subdirectory( ${SUBDIRECTORY} ) endif() endforeach() + +include( CalamaresAddTranslations ) +add_calamares_python_translations( ${CALAMARES_TRANSLATION_LANGUAGES} ) 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/bootloader/main.py b/src/modules/bootloader/main.py index fd5990490..c2cdc1108 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -11,6 +11,8 @@ # Copyright 2015, Philip Mueller # Copyright 2016-2017, Teo Mrnjavac # Copyright 2017, Alf Gaida +# Copyright 2017, Adriaan de Groot +# Copyright 2017, Gabriel Craciunescu # # Calamares is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -104,16 +106,22 @@ def create_systemd_boot_conf(uuid, conf_path, kernel_line): cryptdevice_params = [] + # Take over swap settings: + # - unencrypted swap partition sets swap_uuid + # - encrypted root sets cryptdevice_params for partition in partitions: - if partition["fs"] == "linuxswap": + has_luks = "luksMapperName" in partition + if partition["fs"] == "linuxswap" and not has_luks: swap_uuid = partition["uuid"] - if partition["mountPoint"] == "/" and "luksMapperName" in partition: + if partition["mountPoint"] == "/" and has_luks: cryptdevice_params = ["cryptdevice=UUID=" + partition["luksUuid"] + ":" + partition["luksMapperName"], "root=/dev/mapper/" + + partition["luksMapperName"], + "resume=/dev/mapper/" + partition["luksMapperName"]] if cryptdevice_params: diff --git a/src/modules/displaymanager/displaymanager.conf b/src/modules/displaymanager/displaymanager.conf index 59ad061dc..1c30ed637 100644 --- a/src/modules/displaymanager/displaymanager.conf +++ b/src/modules/displaymanager/displaymanager.conf @@ -20,3 +20,7 @@ displaymanagers: #display manager are set up correctly. This is normally done by the distribution #packages, and best left to them. Therefore, it is disabled by default. basicSetup: false + +#If true, setup autologin for openSUSE. This only makes sense on openSUSE +#derivatives or other systems where /etc/sysconfig/displaymanager exists. +sysconfigSetup: false diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 3f7ffe0f6..3282982d7 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -3,10 +3,12 @@ # # === This file is part of Calamares - === # -# Copyright 2014-2016, Philip Müller +# Copyright 2014-2017, Philip Müller # Copyright 2014-2015, Teo Mrnjavac # Copyright 2014, Kevin Kofler # Copyright 2017, Alf Gaida +# Copyright 2017, Bernhard Landauer +# 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 @@ -89,14 +91,15 @@ def have_dm(dm_name, root_mount_point): def set_autologin(username, - displaymanagers, + displaymanager, default_desktop_environment, root_mount_point): """ Enables automatic login for the installed desktop managers. :param username: - :param displaymanagers: + :param displaymanager: str + The displaymanager for which to configure autologin. :param default_desktop_environment: :param root_mount_point: """ @@ -105,7 +108,7 @@ def set_autologin(username, if username is None: do_autologin = False - if "mdm" in displaymanagers: + if "mdm" == displaymanager: # Systems with MDM as Desktop Manager mdm_conf_path = os.path.join(root_mount_point, "etc/mdm/custom.conf") @@ -142,7 +145,7 @@ def set_autologin(username, else: mdm_conf.write('AutomaticLoginEnable=False\n') - if "gdm" in displaymanagers: + if "gdm" == displaymanager: # Systems with GDM as Desktop Manager gdm_conf_path = os.path.join(root_mount_point, "etc/gdm/custom.conf") @@ -176,40 +179,37 @@ def set_autologin(username, else: gdm_conf.write('AutomaticLoginEnable=False\n') - if (do_autologin - and os.path.exists("{!s}/var/lib/AccountsService/users".format( + if (do_autologin): + accountservice_dir = "{!s}/var/lib/AccountsService/users".format( root_mount_point ) - )): - os.system( - "echo \"[User]\" > " - "{!s}/var/lib/AccountsService/users/{!s}".format( - root_mount_point, - username - ) - ) + userfile_path = "{!s}/{!s}".format(accountservice_dir, username) + if os.path.exists(accountservice_dir): + with open(userfile_path, "w") as userfile: + userfile.write("[User]\n") - if default_desktop_environment is not None: - os.system( - "echo \"XSession={!s}\" >> " - "{!s}/var/lib/AccountsService/users/{!s}".format( - default_desktop_environment.desktop_file, - root_mount_point, username - ) - ) + if default_desktop_environment is not None: + userfile.write("XSession={!s}\n".format( + default_desktop_environment.desktop_file)) - os.system( - "echo \"Icon=\" >> " - "{!s}/var/lib/AccountsService/users/{!s}".format( - root_mount_point, username - ) - ) + userfile.write("Icon=\n") - if "kdm" in displaymanagers: + if "kdm" == displaymanager: # Systems with KDM as Desktop Manager kdm_conf_path = os.path.join( root_mount_point, "usr/share/config/kdm/kdmrc" ) + # Check which path is in use: SUSE does something else. + # Also double-check the default setting. Pick the first + # one that exists in the target. + for candidate_kdmrc in ( + "usr/share/config/kdm/kdmrc", + "usr/share/kde4/config/kdm/kdmrc", + ): + p = os.path.join(root_mount_point, candidate_kdmrc) + if os.path.exists(p): + kdm_conf_path = p + break text = [] if os.path.exists(kdm_conf_path): @@ -234,7 +234,7 @@ def set_autologin(username, "KDM config file {!s} does not exist".format(kdm_conf_path) ) - if "lxdm" in displaymanagers: + if "lxdm" == displaymanager: # Systems with LXDM as Desktop Manager lxdm_conf_path = os.path.join(root_mount_point, "etc/lxdm/lxdm.conf") text = [] @@ -258,7 +258,7 @@ def set_autologin(username, "LXDM config file {!s} does not exist".format(lxdm_conf_path) ) - if "lightdm" in displaymanagers: + if "lightdm" == displaymanager: # Systems with LightDM as Desktop Manager # Ideally, we should use configparser for the ini conf file, # but we just do a simple text replacement for now, as it @@ -282,14 +282,25 @@ def set_autologin(username, lightdm_conf.write(line) else: - return ( - "Cannot write LightDM configuration file", - "LightDM config file {!s} does not exist".format( - lightdm_conf_path + try: + # Create a new lightdm.conf file; this is documented to be + # read last, after aeverything in lightdm.conf.d/ + with open(lightdm_conf_path, 'w') as lightdm_conf: + if do_autologin: + lightdm_conf.write( + "autologin-user={!s}\n".format(username)) + else: + lightdm_conf.write( + "#autologin-user=\n") + except FileNotFoundError: + return ( + "Cannot write LightDM configuration file", + "LightDM config file {!s} does not exist".format( + lightdm_conf_path + ) ) - ) - if "slim" in displaymanagers: + if "slim" == displaymanager: # Systems with Slim as Desktop Manager slim_conf_path = os.path.join(root_mount_point, "etc/slim.conf") text = [] @@ -316,11 +327,11 @@ def set_autologin(username, "SLIM config file {!s} does not exist".format(slim_conf_path) ) - if "sddm" in displaymanagers: + if "sddm" == displaymanager: # Systems with Sddm as Desktop Manager sddm_conf_path = os.path.join(root_mount_point, "etc/sddm.conf") - sddm_config = configparser.ConfigParser() + sddm_config = configparser.ConfigParser(strict=False) # Make everything case sensitive sddm_config.optionxform = str @@ -345,6 +356,18 @@ def set_autologin(username, with open(sddm_conf_path, 'w') as sddm_config_file: sddm_config.write(sddm_config_file, space_around_delimiters=False) + if "sysconfig" == displaymanager: + dmauto = "DISPLAYMANAGER_AUTOLOGIN" + + os.system( + "sed -i -e 's|^{!s}=.*|{!s}=\"{!s}\"|' " + "{!s}/etc/sysconfig/displaymanager".format( + dmauto, dmauto, + username if do_autologin else "", + root_mount_point + ) + ) + return None @@ -405,6 +428,10 @@ def run(): # setup lightdm if "lightdm" in displaymanagers: if have_dm("lightdm", root_mount_point): + lightdm_conf_path = os.path.join( + root_mount_point, "etc/lightdm/lightdm.conf" + ) + if enable_basic_setup: libcalamares.utils.target_env_call( ['mkdir', '-p', '/run/lightdm'] @@ -442,21 +469,38 @@ def run(): if default_desktop_environment is not None: os.system( "sed -i -e \"s/^.*user-session=.*/user-session={!s}/\" " - "{!s}/etc/lightdm/lightdm.conf".format( + "{!s}".format( default_desktop_environment.desktop_file, - root_mount_point + lightdm_conf_path ) ) - if default_desktop_environment.desktop_file == "deepin": - os.system( - "sed -i -e \"s/^.greeter-session=.* " - "/greeter-session=lightdm-deepin-greeter/\" " - "{!s}/etc/lightdm/lightdm.conf".format( - root_mount_point - ) - ) + # configure lightdm-greeter + greeter_path = os.path.join( + root_mount_point, "usr/share/xgreeters" + ) + if (os.path.exists(greeter_path)): + # configure first found lightdm-greeter + for entry in os.listdir(greeter_path): + if entry.endswith('.desktop'): + greeter = entry.split('.')[0] + libcalamares.utils.debug( + "found greeter {!s}".format(greeter) + ) + os.system( + "sed -i -e \"s/^.*greeter-session=.*" + "/greeter-session={!s}/\" {!s}".format( + greeter, + lightdm_conf_path + ) + ) + libcalamares.utils.debug( + "{!s} configured as greeter.".format(greeter) + ) + break + else: + return ("No lightdm greeter installed.") else: libcalamares.utils.debug("lightdm selected but not installed") displaymanagers.remove("lightdm") @@ -618,8 +662,20 @@ def run(): libcalamares.globalstorage.insert("displayManagers", displaymanagers) - return set_autologin( - username, displaymanagers, - default_desktop_environment, - root_mount_point - ) + dm_setup_message = [] + for dm in displaymanagers: + dm_message = set_autologin( + username, dm, + default_desktop_environment, + root_mount_point + ) + if dm_message is not None: + dm_setup_message.append("{!s}: {!s}".format(*dm_message)) + + if ("sysconfigSetup" in libcalamares.job.configuration + and libcalamares.job.configuration["sysconfigSetup"]): + set_autologin(username, "sysconfig", None, root_mount_point) + + if dm_setup_message: + return ("Display manager configuration was incomplete", + "\n".join(dm_setup_message)) diff --git a/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp b/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp index 0b66ca671..601a1e49e 100644 --- a/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp +++ b/src/modules/dracutlukscfg/DracutLuksCfgJob.cpp @@ -30,7 +30,7 @@ #include "utils/Logger.h" // static -const QString DracutLuksCfgJob::CONFIG_FILE = QStringLiteral( "/etc/dracut.conf.d/calamares-luks.conf" ); +const QLatin1Literal DracutLuksCfgJob::CONFIG_FILE( "/etc/dracut.conf.d/calamares-luks.conf" ); // static const char *DracutLuksCfgJob::CONFIG_FILE_HEADER = @@ -50,7 +50,7 @@ const char *DracutLuksCfgJob::CONFIG_FILE_CRYPTTAB_LINE = "install_items+=\" /etc/crypttab \"\n"; // static -const QString DracutLuksCfgJob::CONFIG_FILE_SWAPLINE = QStringLiteral( "# enable automatic resume from swap\nadd_device+=\" /dev/disk/by-uuid/%1 \"\n" ); +const QLatin1Literal DracutLuksCfgJob::CONFIG_FILE_SWAPLINE( "# enable automatic resume from swap\nadd_device+=\" /dev/disk/by-uuid/%1 \"\n" ); // static QString @@ -156,7 +156,7 @@ DracutLuksCfgJob::exec() if ( ! swapOuterUuid.isEmpty() ) { cDebug() << "[DRACUTLUKSCFG]: Swap outer UUID" << swapOuterUuid; - outStream << CONFIG_FILE_SWAPLINE.arg( swapOuterUuid ).toLatin1(); + outStream << QString(CONFIG_FILE_SWAPLINE).arg( swapOuterUuid ).toLatin1(); } cDebug() << "[DRACUTLUKSCFG]: Wrote config to" << realConfigFilePath; } else diff --git a/src/modules/dracutlukscfg/DracutLuksCfgJob.h b/src/modules/dracutlukscfg/DracutLuksCfgJob.h index 6d5eae884..2d438fa0b 100644 --- a/src/modules/dracutlukscfg/DracutLuksCfgJob.h +++ b/src/modules/dracutlukscfg/DracutLuksCfgJob.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2016, Kevin Kofler + * 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 @@ -34,18 +35,18 @@ class PLUGINDLLEXPORT DracutLuksCfgJob : public Calamares::CppJob public: explicit DracutLuksCfgJob( QObject* parent = nullptr ); - virtual ~DracutLuksCfgJob(); + virtual ~DracutLuksCfgJob() override; QString prettyName() const override; Calamares::JobResult exec() override; private: - static const QString CONFIG_FILE; + static const QLatin1Literal CONFIG_FILE; static const char *CONFIG_FILE_HEADER; static const char *CONFIG_FILE_CRYPTTAB_KEYFILE_LINE; static const char *CONFIG_FILE_CRYPTTAB_LINE; - static const QString CONFIG_FILE_SWAPLINE; + static const QLatin1Literal CONFIG_FILE_SWAPLINE; static QString rootMountPoint(); static QVariantList partitions(); 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/DummyCppJob.h b/src/modules/dummycpp/DummyCppJob.h index 2b2a51a75..fecc2699b 100644 --- a/src/modules/dummycpp/DummyCppJob.h +++ b/src/modules/dummycpp/DummyCppJob.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2016, Kevin Kofler + * 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 @@ -34,7 +35,7 @@ class PLUGINDLLEXPORT DummyCppJob : public Calamares::CppJob public: explicit DummyCppJob( QObject* parent = nullptr ); - virtual ~DummyCppJob(); + virtual ~DummyCppJob() override; QString prettyName() const override; 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 4a68cf963..ec6b02bfd 100644 --- a/src/modules/dummypython/main.py +++ b/src/modules/dummypython/main.py @@ -5,6 +5,7 @@ # # Copyright 2014, Teo Mrnjavac # 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 @@ -19,48 +20,87 @@ # You should have received a copy of the GNU General Public License # along with Calamares. If not, see . +""" +=== Example Python jobmodule. + +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. +""" + import libcalamares import os from time import gmtime, strftime, sleep +import gettext +_ = gettext.translation("calamares-python", + localedir=libcalamares.utils.gettext_path(), + languages=libcalamares.utils.gettext_languages(), + fallback=True).gettext + + +def pretty_name(): + return _("Dummy python job.") + def run(): - """ - Example Python jobmodule. + """Dummy python job.""" + libcalamares.utils.debug("LocaleDir=" + + str(libcalamares.utils.gettext_path())) + libcalamares.utils.debug("Languages=" + + str(libcalamares.utils.gettext_languages())) - 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. - - :return: - """ os.system("/bin/sh -c \"touch ~/calamares-dummypython\"") 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")), str(libcalamares.globalstorage.value("item2")), str(libcalamares.globalstorage.value("item3"))) - - libcalamares.job.setprogress(0.1) libcalamares.utils.debug(accumulator) + libcalamares.utils.debug("Run dummy python") + + sleep(1) + + try: + configlist = list(libcalamares.job.configuration["a_list"]) + except KeyError: + configlist = ["no list"] + + c = 1 + for k in configlist: + libcalamares.utils.debug(_("Dummy python step {}").format(str(k))) + sleep(1) + libcalamares.job.setprogress(c * 1.0 / len(configlist)) + c += 1 + sleep(3) + # To indicate an error, return a tuple of: # (message, detailed-error-message) return None 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 46dea2a63..8a59291af 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 9a705dd8b..311e75830 100644 --- a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.mo index bb0413d21..a195bf917 100644 Binary files a/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po index 1fd65108b..91c49166c 100644 --- a/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# enolp , 2017 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: ast\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -26,6 +26,10 @@ msgstr "¡Prímime!" msgid "A new QLabel." msgstr "Una QLabel nueva." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "El trabayu maniquín de PythonQt" diff --git a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo index 7c4c41f21..470525ae3 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 9239b247b..9d8734987 100644 --- a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.mo index 1f3e7bde0..c8a3196f8 100644 Binary files a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po index c71aed372..c56b01736 100644 --- a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Davidmp , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -26,6 +26,10 @@ msgstr "Clica'm!" msgid "A new QLabel." msgstr "Una etiqueta Q nova." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "Vistes de Dummy PythonQt" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "La tasca Dummy PythonQt" diff --git a/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.mo index dca706224..ef66ad1d6 100644 Binary files a/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.mo differ 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 62925041f..40d7f9f95 100644 --- a/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# pavelrz , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" @@ -26,6 +26,10 @@ msgstr "Klikni na mě!" msgid "A new QLabel." msgstr "Nový QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "Testovací PythonQt ViewStep" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "Testovací úloha PythonQt" diff --git a/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.mo index aa8d8916c..ad17f4d68 100644 Binary files a/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po index a312b4143..7d2d647bd 100644 --- a/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# scootergrisen , 2017 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -26,6 +26,10 @@ msgstr "Klik på mig!" msgid "A new QLabel." msgstr "En ny QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "Dummy PythonQt-visningstrin" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "Dummy PythonQt-jobbet" diff --git a/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.mo index 0ba5db33b..28d4bf048 100644 Binary files a/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po index 63efe3401..c361beac9 100644 --- a/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Christian Spaan , 2017 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -26,6 +26,10 @@ msgstr "Klick mich!" msgid "A new QLabel." msgstr "Ein neues QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "Der Dummy-PythonQt-Job" diff --git a/src/modules/dummypythonqt/lang/dummypythonqt.pot b/src/modules/dummypythonqt/lang/dummypythonqt.pot index 801b1dcca..14e65bd02 100644 --- a/src/modules/dummypythonqt/lang/dummypythonqt.pot +++ b/src/modules/dummypythonqt/lang/dummypythonqt.pot @@ -1,18 +1,21 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" +"Language: \n" #: src/modules/dummypythonqt/main.py:84 msgid "Click me!" @@ -22,6 +25,10 @@ msgstr "Click me!" msgid "A new QLabel." msgstr "A new QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "Dummy PythonQt ViewStep" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "The Dummy PythonQt Job" diff --git a/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.mo index cb02af99a..c7d45e879 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 c11ead0aa..7b55d6c65 100644 --- a/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" 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 a03348e9e..b88e6d8f9 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 cab32b772..241b0063b 100644 --- a/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.mo index aca1de3f4..f441bc205 100644 Binary files a/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po index a53aee705..bdca039dd 100644 --- a/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# strel , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -26,6 +26,10 @@ msgstr "¡Púlsame!" msgid "A new QLabel." msgstr "Una nueva QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "ViewStep de PythonQt Ficticia" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "La Tarea PythonQt Ficticia" 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 dd547e792..35a601558 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 2869f0a0d..5aa724d08 100644 --- a/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: es_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" 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 9f6fbe8cb..73c58bb4a 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 fff85e06e..22412c347 100644 --- a/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: es_MX\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" 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 33d279431..f3dd878be 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 f686631b1..5c08c2df3 100644 --- a/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: es_PR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.mo index cc2e6af53..86e51fbf4 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 f204dd288..50ed84e86 100644 --- a/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo index dabe5ab5b..2b85ce42c 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 6241c27fa..d5ec7a719 100644 --- a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.mo index 6fcca2b10..be5db74c2 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 58f7dd5d2..9561d2d7f 100644 --- a/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" 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 23488fa25..65215e4b3 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 004082146..34d69c2f6 100644 --- a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: fi_FI\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo index ef02a633c..2c39ac029 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 c9551b02f..7efacecd5 100644 --- a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" 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 540fad299..44c786167 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 8c37697c0..4a4a91099 100644 --- a/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: fr_CH\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.mo index 6b34d3d6c..b221e3812 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 b34235471..27a6260ca 100644 --- a/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.mo index fda2618e4..e8861abe2 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 db156af4e..114f3cbe8 100644 --- a/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: gu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/he/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/he/LC_MESSAGES/dummypythonqt.mo new file mode 100644 index 000000000..98b589db3 Binary files /dev/null and b/src/modules/dummypythonqt/lang/he/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/he/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/he/LC_MESSAGES/dummypythonqt.po new file mode 100644 index 000000000..f5e9b6389 --- /dev/null +++ b/src/modules/dummypythonqt/lang/he/LC_MESSAGES/dummypythonqt.po @@ -0,0 +1,43 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: he\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/dummypythonqt/main.py:84 +msgid "Click me!" +msgstr "לחץ עליי!" + +#: src/modules/dummypythonqt/main.py:94 +msgid "A new QLabel." +msgstr "QLabel חדש." + +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "שלב הצפייה של משימת הדמה של PythonQt" + +#: src/modules/dummypythonqt/main.py:183 +msgid "The Dummy PythonQt Job" +msgstr "משימת הדמה של PythonQt" + +#: src/modules/dummypythonqt/main.py:186 +msgid "This is the Dummy PythonQt Job. The dummy job says: {}" +msgstr "זוהי משימת הדמה של PythonQt. משימת הדמה אומרת: {}" + +#: src/modules/dummypythonqt/main.py:190 +msgid "A status message for Dummy PythonQt Job." +msgstr "הודעת מצב עבור משימת דמה של PythonQt." diff --git a/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.mo index cd32a6e24..198aba348 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 e7590dd7f..9ea1aecd6 100644 --- a/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.mo index cc1235d79..5368309b9 100644 Binary files a/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po index 78140b3fa..1353a19b3 100644 --- a/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Lovro Kudelić , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: hr\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" @@ -26,6 +26,10 @@ msgstr "Klikni me!" msgid "A new QLabel." msgstr "Novi QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "Testni PythonQt ViewStep" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "Testni PythonQt posao" diff --git a/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.mo index 206bf7b4a..32f7ed24b 100644 Binary files a/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po index eba74a555..19d609feb 100644 --- a/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Lajos Pasztor , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Lajos Pasztor , 2016\n" +"Last-Translator: miku84 , 2017\n" "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -26,6 +26,10 @@ msgstr "Kattints ide!" msgid "A new QLabel." msgstr "Egy új QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "Hamis PythonQt ViewStep" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "Egy PythonQt Job teszt" diff --git a/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.mo index 4f2cb2c65..4c66c3fee 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 b5e544468..6e391eaf8 100644 --- a/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Kukuh Syafaat , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Kukuh Syafaat , 2016\n" +"Last-Translator: Wantoyo , 2016\n" "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -24,7 +24,11 @@ msgstr "Klik saya!" #: src/modules/dummypythonqt/main.py:94 msgid "A new QLabel." -msgstr "QLabel baru." +msgstr "Sebuah QLabel baru." + +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "Dummy PythonQt ViewStep" #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" diff --git a/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.mo index f9585197d..d30364d9c 100644 Binary files a/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po index 6cb621d8b..5b87a423f 100644 --- a/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Kristján Magnússon , 2017 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: is\n" "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" @@ -26,6 +26,10 @@ msgstr "Smelltu mig!" msgid "A new QLabel." msgstr "Nýtt QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "Dummy PythonQt ViewStep" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "Dummy PythonQt Job" diff --git a/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.mo index ea87ff9f0..73b11b8a0 100644 Binary files a/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.mo differ 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 ff356e035..58908a127 100644 --- a/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po @@ -1,21 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Teo Mrnjavac , 2016 -# Saverio , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: it_IT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -27,6 +26,10 @@ msgstr "Clicca qui!" msgid "A new QLabel." msgstr "Una nuova QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "Il Job Dummy PythonQt" diff --git a/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.mo index 0aa5dd177..eb678c581 100644 Binary files a/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po index 79f40e504..241b9392d 100644 --- a/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Takefumi Nagata , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -26,13 +26,17 @@ msgstr "クリックしてください!" msgid "A new QLabel." msgstr "新しいQLabel" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "Dummy PythonQt ViewStep" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" -msgstr "ダミーのPythonQtジョブ" +msgstr "The Dummy PythonQt Job" #: src/modules/dummypythonqt/main.py:186 msgid "This is the Dummy PythonQt Job. The dummy job says: {}" -msgstr "これはダミーのPythonQtジョブです。ダミーのジョブの出力: {}" +msgstr "これはDummy PythonQtジョブです。Dummy ジョブの出力: {}" #: src/modules/dummypythonqt/main.py:190 msgid "A status message for Dummy PythonQt Job." diff --git a/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.mo index 500d4bd84..2b0afba0e 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 6f56e679c..6a6cae92a 100644 --- a/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: kk\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.mo index 919ec5d2e..1a06a5e25 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 d1872258d..23b688386 100644 --- a/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: lo\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.mo index 3b7f8fd94..1ca9f2801 100644 Binary files a/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po index da0638c91..97f6e6b33 100644 --- a/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Moo , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: lt\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -26,6 +26,10 @@ msgstr "Spustelėkite mane!" msgid "A new QLabel." msgstr "Naujas QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "Fiktyvi PythonQt ViewStep" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "Fiktyvi PythonQt užduotis" diff --git a/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.mo index 982397ab6..ada8d963f 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 15acfe815..27d9d9e26 100644 --- a/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: mr\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.mo index a823e543f..4a10eac44 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 35d818e7f..0807d247f 100644 --- a/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.mo index 552dc9093..990bbe8a4 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 65f5b2383..a6862fbb6 100644 --- a/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# De Zeeappel , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -26,6 +26,10 @@ msgstr "Klik mij!" msgid "A new QLabel." msgstr "Een nieuw QLabel" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "Dummy PythonQt ViewStep" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "De Dummy PythonQt opdracht" diff --git a/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.mo index 6d4cd2613..63f2677da 100644 Binary files a/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po index dc4b8b3ae..0f67ae374 100644 --- a/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po @@ -1,22 +1,22 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# m4sk1n , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: pl\n" -"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" #: src/modules/dummypythonqt/main.py:84 msgid "Click me!" @@ -26,6 +26,10 @@ msgstr "Naciśnij mnie!" msgid "A new QLabel." msgstr "Nowy QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "Dummy PythonQt ViewStep" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "Zadanie Dummy PythonQt" 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 cd09dc758..fc4620205 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 5fe02ba9f..2b06f9e75 100644 --- a/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.po @@ -1,19 +1,21 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: pl_PL\n" -"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" #: src/modules/dummypythonqt/main.py:84 msgid "Click me!" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.mo index 820ff3855..657f514f9 100644 Binary files a/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.mo differ 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 84d5dad01..da698f595 100644 --- a/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Rodrigo de Almeida Sottomaior Macedo , 2017 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Rodrigo de Almeida Sottomaior Macedo , 2017\n" +"Last-Translator: Guilherme M.S. , 2017\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -26,6 +26,10 @@ msgstr "Clique em mim!" msgid "A new QLabel." msgstr "Uma nova QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "ViewStep do PythonQt fictício" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "O trabalho de modelo do PythonQt" @@ -36,4 +40,4 @@ msgstr "Este é o trabalho do modelo PythonQt. O trabalho fictício diz: {}" #: src/modules/dummypythonqt/main.py:190 msgid "A status message for Dummy PythonQt Job." -msgstr "Uma mensagem de status para Dummy PythonQt Job." +msgstr "Uma mensagem de status para Trabalho Fictício PythonQt." diff --git a/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.mo index 489edf85f..4df6a2005 100644 Binary files a/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.mo differ 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 950646043..3766e35b8 100644 --- a/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Ricardo Simões , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -26,6 +26,10 @@ msgstr "Clique-me!" msgid "A new QLabel." msgstr "Uma nova QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "Dummy PythonQt ViewStep" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "A Tarefa Dummy PythonQt" diff --git a/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.mo index a08e64acc..f881f640c 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 52ba86c07..0e927e99d 100644 --- a/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Baadur Jobava , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" @@ -26,6 +26,10 @@ msgstr "Clic aici!" msgid "A new QLabel." msgstr "Un nou QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "Un job job fictiv PythonQt" diff --git a/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.mo index 48dcf8cc1..8e2ebe16d 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 360398bf1..7a2155ccd 100644 --- a/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Вадим Сабынич , 2017 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" @@ -26,6 +26,10 @@ msgstr "Нажать здесь!" msgid "A new QLabel." msgstr "Новый QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "The Dummy PythonQt Job" @@ -36,4 +40,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.mo b/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.mo index dcbc56c38..4cb8879b3 100644 Binary files a/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po index 2a8cccfbf..7f45b4605 100644 --- a/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Dušan Kazik , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" @@ -26,6 +26,10 @@ msgstr "Kliknite sem!" msgid "A new QLabel." msgstr "Nová menovka QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "Fiktívna úloha PythonQt" diff --git a/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.mo index 318d80474..615d4b0b7 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 8b7583f1a..ebebd598b 100644 --- a/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.mo index a2771e965..311cb4d45 100644 Binary files a/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po index 3e45a4f2c..906d2e3c6 100644 --- a/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Slobodan Simić , 2017 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -26,6 +26,10 @@ msgstr "Кликни ме!" msgid "A new QLabel." msgstr "Нова КуОзнака" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "Провизорни ПитонКуТ посао" 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 19959fa3b..ec7faf311 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 aba513e46..dd00e7fbf 100644 --- a/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: sr@latin\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.mo index 415a48df6..e27097ca7 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 e6453b27b..9839aad35 100644 --- a/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.mo index 9e78fac7a..99aa63beb 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 0e912679f..dd14c81a8 100644 --- a/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: th\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.mo index 7d2abb0cc..effc6f65e 100644 Binary files a/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.mo differ 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 4b8d1f3e2..ab62ec545 100644 --- a/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Demiray Muhterem , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: tr_TR\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -26,13 +26,17 @@ msgstr "Buraya tıkla!" msgid "A new QLabel." msgstr "Yeni bir QLabel." +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "Sahte PythonQt görünümü" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" -msgstr "Kukla PythonQt Çalışması" +msgstr "Sahte PythonQt işleri" #: src/modules/dummypythonqt/main.py:186 msgid "This is the Dummy PythonQt Job. The dummy job says: {}" -msgstr "Kukla PythonQt Çalışması. Kukla çalışması şöyle der: {}" +msgstr "Kukla PythonQt işleri. Sahte işleri şöyle diyor: {}" #: src/modules/dummypythonqt/main.py:190 msgid "A status message for Dummy PythonQt Job." diff --git a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.mo index 0cd8dca26..d17a14087 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 769ed7a15..5bdc57b31 100644 --- a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.mo index 48ec5f02b..176215bcb 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 b908e7f85..5a9fc39de 100644 --- a/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: ur\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.mo index 3f8f559eb..037e2fa2a 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 29efe652c..f1b55bc4c 100644 --- a/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.po @@ -1,17 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: uz\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -23,6 +25,10 @@ msgstr "" msgid "A new QLabel." msgstr "" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "" diff --git a/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.mo index b14bb4814..0dac94ca0 100644 Binary files a/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.mo differ 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 74c29680c..14bf4463a 100644 --- a/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Mingcong Bai , 2017 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -26,6 +26,10 @@ msgstr "按我按我！" msgid "A new QLabel." msgstr "一个平淡无奇的 QLabel。" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "坠吼滴 PythonQt ViewStep" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "PythonQt 任务" diff --git a/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.mo index 32a925e8c..7cda100f9 100644 Binary files a/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.mo differ 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 be83bc1a7..0699d412f 100644 --- a/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -# Translators: -# Jeff Huang , 2016 +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-06-07 01:01+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-04 08:16-0400\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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ANSI_X3.4-1968\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -26,6 +26,10 @@ msgstr "點擊我！" msgid "A new QLabel." msgstr "一個新的 QLabel。" +#: src/modules/dummypythonqt/main.py:97 +msgid "Dummy PythonQt ViewStep" +msgstr "假的 PythonQt 檢視步驟" + #: src/modules/dummypythonqt/main.py:183 msgid "The Dummy PythonQt Job" msgstr "假的 PythonQt 工作" 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/CMakeLists.txt b/src/modules/finished/CMakeLists.txt index 6549c364e..6482fb2cd 100644 --- a/src/modules/finished/CMakeLists.txt +++ b/src/modules/finished/CMakeLists.txt @@ -1,4 +1,7 @@ +find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network ) + include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) + calamares_add_plugin( finished TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO @@ -9,5 +12,6 @@ calamares_add_plugin( finished FinishedPage.ui LINK_PRIVATE_LIBRARIES calamaresui + Qt5::DBus SHARED_LIB ) diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp index 609856975..43e9f5329 100644 --- a/src/modules/finished/FinishedPage.cpp +++ b/src/modules/finished/FinishedPage.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -39,6 +40,7 @@ FinishedPage::FinishedPage( QWidget* parent ) , ui( new Ui::FinishedPage ) , m_restartSetUp( false ) { + cDebug() << "FinishedPage()"; ui->setupUi( this ); ui->mainText->setAlignment( Qt::AlignCenter ); @@ -48,13 +50,11 @@ FinishedPage::FinishedPage( QWidget* parent ) CALAMARES_RETRANSLATE( ui->retranslateUi( this ); ui->mainText->setText( tr( "

All done.


" - "%1 has been installed on your computer.
" - "You may now restart into your new system, or continue " - "using the %2 Live environment." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::VersionedName ) ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ProductName ) ) ); + "%1 has been installed on your computer.
" + "You may now restart into your new system, or continue " + "using the %2 Live environment." ) + .arg( *Calamares::Branding::VersionedName ) + .arg( *Calamares::Branding::ProductName ) ); ) } @@ -83,13 +83,14 @@ FinishedPage::setRestartNowCommand( const QString& command ) void FinishedPage::setUpRestart() { + cDebug() << "FinishedPage::setUpRestart()"; if ( !m_restartSetUp ) { connect( qApp, &QApplication::aboutToQuit, this, [this] { if ( ui->restartCheckBox->isVisible() && - ui->restartCheckBox->isChecked() ) + ui->restartCheckBox->isChecked() ) QProcess::execute( "/bin/sh", { "-c", m_restartNowCommand } ); } ); } @@ -102,3 +103,14 @@ FinishedPage::focusInEvent( QFocusEvent* e ) e->accept(); } +void +FinishedPage::onInstallationFailed( const QString& message, const QString& details ) +{ + Q_UNUSED( details ); + ui->mainText->setText( tr( "

Installation Failed


" + "%1 has not been installed on your computer.
" + "The error message was: %2." ) + .arg( *Calamares::Branding::VersionedName ) + .arg( message ) ); + setRestartNowEnabled( false ); +} diff --git a/src/modules/finished/FinishedPage.h b/src/modules/finished/FinishedPage.h index 31930a6f1..ba3e75667 100644 --- a/src/modules/finished/FinishedPage.h +++ b/src/modules/finished/FinishedPage.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -38,6 +39,9 @@ public: void setUpRestart(); +public slots: + void onInstallationFailed( const QString& message, const QString& details ); + protected: void focusInEvent( QFocusEvent* e ) override; //choose the child widget to focus diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp index 1f5217f22..d3beacb82 100644 --- a/src/modules/finished/FinishedViewStep.cpp +++ b/src/modules/finished/FinishedViewStep.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -17,15 +18,30 @@ */ #include "FinishedViewStep.h" - #include "FinishedPage.h" +#include "JobQueue.h" +#include "utils/Logger.h" + +#include +#include +#include #include +#include "Branding.h" + FinishedViewStep::FinishedViewStep( QObject* parent ) : Calamares::ViewStep( parent ) , m_widget( new FinishedPage() ) + , installFailed( false ) + , m_notifyOnFinished( false ) { + auto jq = Calamares::JobQueue::instance(); + connect( jq, &Calamares::JobQueue::failed, + m_widget, &FinishedPage::onInstallationFailed ); + connect( jq, &Calamares::JobQueue::failed, + this, &FinishedViewStep::onInstallationFailed ); + emit nextStatusChanged( true ); } @@ -90,11 +106,42 @@ FinishedViewStep::isAtEnd() const return true; } +void +FinishedViewStep::sendNotification() +{ + // If the installation failed, don't send notification popup; + // there's a (modal) dialog popped up with the failure notice. + if ( installFailed ) + return; + + QDBusInterface notify( "org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications" ); + if ( notify.isValid() ) + { + QDBusReply r = notify.call( "Notify", + QString( "Calamares" ), + QVariant( 0U ), + QString( "calamares" ), + tr( "Installation Complete" ), + tr( "The installation of %1 is complete." ).arg( *Calamares::Branding::VersionedName ), + QStringList(), + QVariantMap(), + QVariant( 0 ) + ); + if ( !r.isValid() ) + cDebug() << "Could not call notify for end of installation." << r.error(); + } + else + cDebug() << "Could not get dbus interface for notifications." << notify.lastError(); +} + void FinishedViewStep::onActivate() { m_widget->setUpRestart(); + + if ( m_notifyOnFinished ) + sendNotification(); } @@ -104,12 +151,19 @@ FinishedViewStep::jobs() const return QList< Calamares::job_ptr >(); } +void +FinishedViewStep::onInstallationFailed( const QString& message, const QString& details ) +{ + Q_UNUSED( message ); + Q_UNUSED( details ); + installFailed = true; +} void FinishedViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { if ( configurationMap.contains( "restartNowEnabled" ) && - configurationMap.value( "restartNowEnabled" ).type() == QVariant::Bool ) + configurationMap.value( "restartNowEnabled" ).type() == QVariant::Bool ) { bool restartNowEnabled = configurationMap.value( "restartNowEnabled" ).toBool(); @@ -117,22 +171,19 @@ FinishedViewStep::setConfigurationMap( const QVariantMap& configurationMap ) if ( restartNowEnabled ) { if ( configurationMap.contains( "restartNowChecked" ) && - configurationMap.value( "restartNowChecked" ).type() == QVariant::Bool ) - { + configurationMap.value( "restartNowChecked" ).type() == QVariant::Bool ) m_widget->setRestartNowChecked( configurationMap.value( "restartNowChecked" ).toBool() ); - } if ( configurationMap.contains( "restartNowCommand" ) && - configurationMap.value( "restartNowCommand" ).type() == QVariant::String ) - { + configurationMap.value( "restartNowCommand" ).type() == QVariant::String ) m_widget->setRestartNowCommand( configurationMap.value( "restartNowCommand" ).toString() ); - } else - { - m_widget->setRestartNowCommand( "systemctl -i reboot"); - } + m_widget->setRestartNowCommand( "systemctl -i reboot" ); } } + if ( configurationMap.contains( "notifyOnFinished" ) && + configurationMap.value( "notifyOnFinished" ).type() == QVariant::Bool ) + m_notifyOnFinished = configurationMap.value( "notifyOnFinished" ).toBool(); } CALAMARES_PLUGIN_FACTORY_DEFINITION( FinishedViewStepFactory, registerPlugin(); ) diff --git a/src/modules/finished/FinishedViewStep.h b/src/modules/finished/FinishedViewStep.h index 30151dffb..f13da9fb8 100644 --- a/src/modules/finished/FinishedViewStep.h +++ b/src/modules/finished/FinishedViewStep.h @@ -34,7 +34,7 @@ class PLUGINDLLEXPORT FinishedViewStep : public Calamares::ViewStep public: explicit FinishedViewStep( QObject* parent = nullptr ); - virtual ~FinishedViewStep(); + virtual ~FinishedViewStep() override; QString prettyName() const override; @@ -55,8 +55,20 @@ public: void setConfigurationMap( const QVariantMap& configurationMap ) override; +public slots: + void onInstallationFailed( const QString& message, const QString& details ); + private: FinishedPage* m_widget; + + /** + * @brief At the end of installation (when this step is activated), + * send a desktop notification via DBus that the install is done. + */ + void sendNotification(); + + bool installFailed; + bool m_notifyOnFinished; }; CALAMARES_PLUGIN_FACTORY_DECLARATION( FinishedViewStepFactory ) diff --git a/src/modules/finished/finished.conf b/src/modules/finished/finished.conf index f93acb587..6bd8bb2d6 100644 --- a/src/modules/finished/finished.conf +++ b/src/modules/finished/finished.conf @@ -1,4 +1,17 @@ +Configuration for the "finished" page, which is usually shown only at +the end of the installation (successful or not). --- +# The finished page can hold a "restart system now" checkbox. +# If this is false, no checkbox is show and the system is not restarted +# when Calamares exits. restartNowEnabled: true +# Initial state of the checkbox "restart now". restartNowChecked: false +# If the checkbox is shown, and the checkbox is checked, then when +# Calamares exits from the finished-page it will run this command. restartNowCommand: "systemctl -i reboot" + +# When the last page is (successfully) reached, send a DBus notification +# to the desktop that the installation is done. This works only if the +# user as whom Calamares is run, can reach the regular desktop session bus. +notifyOnFinished: false 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/fstab/main.py b/src/modules/fstab/main.py index 384dadbb6..1f46fec99 100644 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -224,7 +224,8 @@ class FstabGenerator(object): def generate_fstab_line_info(self, partition): """ Generates information for each fstab entry. """ - filesystem = partition["fs"] + filesystem = partition["fs"].lower() + has_luks = "luksMapperName" in partition mount_point = partition["mountPoint"] disk_name = disk_name_for_partition(partition) is_ssd = disk_name in self.ssd_disks @@ -232,6 +233,8 @@ class FstabGenerator(object): if not mount_point and not filesystem == "swap": return None + if not mount_point: + mount_point = "swap" options = self.mount_options.get(filesystem, self.mount_options["default"]) @@ -252,18 +255,15 @@ class FstabGenerator(object): self.root_is_ssd = is_ssd if filesystem == "btrfs" and "subvol" in partition: - return dict( - device="UUID=" + partition["uuid"], - mount_point=mount_point, - fs=filesystem, - options=",".join( - ["subvol={}".format(partition["subvol"]), options] - ), - check=check, - ) + options="subvol={},".format(partition["subvol"]) + options - return dict(device="UUID=" + partition["uuid"], - mount_point=mount_point or "swap", + if has_luks: + device="/dev/mapper/" + partition["luksMapperName"] + else: + device="UUID=" + partition["uuid"] + + return dict(device=device, + mount_point=mount_point, fs=filesystem, options=options, check=check, diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index 59497cf03..3ef68e46e 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -6,6 +6,8 @@ # Copyright 2014-2015, Philip Müller # Copyright 2015-2017, Teo Mrnjavac # Copyright 2017, Alf Gaida +# Copyright 2017, Adriaan de Groot +# Copyright 2017, Gabriel Craciunescu # # Calamares is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,6 +31,8 @@ def modify_grub_default(partitions, root_mount_point, distributor): """ Configures '/etc/default/grub' for hibernation and plymouth. + @see bootloader/main.py, for similar handling of kernel parameters + :param partitions: :param root_mount_point: :param distributor: @@ -40,9 +44,12 @@ def modify_grub_default(partitions, root_mount_point, distributor): dracut_bin = libcalamares.utils.target_env_call( ["sh", "-c", "which dracut"] ) + have_dracut = dracut_bin == 0 # Shell exit value 0 means success + use_splash = "" swap_uuid = "" swap_outer_uuid = "" + swap_outer_mappername = None if libcalamares.globalstorage.contains("hasPlymouth"): if libcalamares.globalstorage.value("hasPlymouth"): @@ -50,32 +57,37 @@ def modify_grub_default(partitions, root_mount_point, distributor): cryptdevice_params = [] - if dracut_bin == 0: + if have_dracut: for partition in partitions: - if partition["fs"] == "linuxswap": + has_luks = "luksMapperName" in partition + if partition["fs"] == "linuxswap" and not has_luks: swap_uuid = partition["uuid"] - if (partition["fs"] == "linuxswap" - and "luksMapperName" in partition): + if (partition["fs"] == "linuxswap" and has_luks): swap_outer_uuid = partition["luksUuid"] + swap_outer_mappername = partition["luksMapperName"] - if (partition["mountPoint"] == "/" - and "luksMapperName" in partition): + if (partition["mountPoint"] == "/" and has_luks): cryptdevice_params = [ "rd.luks.uuid={!s}".format(partition["luksUuid"]) ] else: for partition in partitions: - if partition["fs"] == "linuxswap": + has_luks = "luksMapperName" in partition + if partition["fs"] == "linuxswap" and not has_luks: swap_uuid = partition["uuid"] - if (partition["mountPoint"] == "/" - and "luksMapperName" in partition): + if (partition["mountPoint"] == "/" and has_luks): cryptdevice_params = [ "cryptdevice=UUID={!s}:{!s}".format( partition["luksUuid"], partition["luksMapperName"] ), - "root=/dev/mapper/{!s}".format(partition["luksMapperName"]) + "root=/dev/mapper/{!s}".format( + partition["luksMapperName"] + ), + "resume=/dev/mapper/{!s}".format( + partition["luksMapperName"] + ) ] kernel_params = ["quiet"] @@ -89,8 +101,11 @@ def modify_grub_default(partitions, root_mount_point, distributor): if swap_uuid: kernel_params.append("resume=UUID={!s}".format(swap_uuid)) - if dracut_bin == 0 and swap_outer_uuid: + if have_dracut and swap_outer_uuid: kernel_params.append("rd.luks.uuid={!s}".format(swap_outer_uuid)) + if have_dracut and swap_outer_mappername: + kernel_params.append("resume=/dev/mapper/{!s}".format( + swap_outer_mappername)) distributor_line = "GRUB_DISTRIBUTOR='{!s}'".format(distributor_replace) diff --git a/src/modules/hwclock/main.py b/src/modules/hwclock/main.py index bfb3d1df7..8b31080dd 100644 --- a/src/modules/hwclock/main.py +++ b/src/modules/hwclock/main.py @@ -28,7 +28,7 @@ import libcalamares def run(): """ - Set hardware clock + Set hardware clock. """ root_mount_point = libcalamares.globalstorage.value("rootMountPoint") diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py index eb29d7def..a18cd0c4f 100644 --- a/src/modules/initcpiocfg/main.py +++ b/src/modules/initcpiocfg/main.py @@ -65,8 +65,13 @@ def write_mkinitcpio_lines(hooks, modules, files, root_mount_point): :param files: :param root_mount_point: """ - with open("/etc/mkinitcpio.conf", "r") as mkinitcpio_file: - mklins = [x.strip() for x in mkinitcpio_file.readlines()] + hostfile = "/etc/mkinitcpio.conf" + try: + with open(hostfile, "r") as mkinitcpio_file: + mklins = [x.strip() for x in mkinitcpio_file.readlines()] + except FileNotFoundError: + libcalamares.utils.debug("Could not open host file '%s'" % hostfile) + mklins = [] for i in range(len(mklins)): if mklins[i].startswith("HOOKS"): 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/CMakeLists.txt b/src/modules/interactiveterminal/CMakeLists.txt index dc0e90de0..7b35fae0d 100644 --- a/src/modules/interactiveterminal/CMakeLists.txt +++ b/src/modules/interactiveterminal/CMakeLists.txt @@ -1,8 +1,8 @@ -find_package(ECM 0.0.13 REQUIRED NO_MODULE) +find_package(ECM 5.10.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) -include(KDEInstallDirs) # this seems to be necessary for KF5::CoreAddons -include(GenerateExportHeader) # this too, because KDE frameworks always want omnomnom more stuff +include(KDEInstallDirs) +include(GenerateExportHeader) find_package( KF5 REQUIRED Service Parts ) diff --git a/src/modules/interactiveterminal/InteractiveTerminalViewStep.h b/src/modules/interactiveterminal/InteractiveTerminalViewStep.h index 77f7bdf34..1c95a229a 100644 --- a/src/modules/interactiveterminal/InteractiveTerminalViewStep.h +++ b/src/modules/interactiveterminal/InteractiveTerminalViewStep.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -34,7 +35,7 @@ class PLUGINDLLEXPORT InteractiveTerminalViewStep : public Calamares::ViewStep public: explicit InteractiveTerminalViewStep( QObject* parent = nullptr ); - virtual ~InteractiveTerminalViewStep(); + virtual ~InteractiveTerminalViewStep() override; QString prettyName() const override; 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/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp index 770c7c6b1..3287dc711 100644 --- a/src/modules/keyboard/KeyboardPage.cpp +++ b/src/modules/keyboard/KeyboardPage.cpp @@ -37,9 +37,36 @@ #include #include +class LayoutItem : public QListWidgetItem +{ +public: + QString data; + + virtual ~LayoutItem(); +}; + +LayoutItem::~LayoutItem() +{ +} + +static QPersistentModelIndex +findLayout( const KeyboardLayoutModel* klm, const QString& currentLayout ) +{ + QPersistentModelIndex currentLayoutItem; + + for ( int i = 0; i < klm->rowCount(); ++i ) + { + QModelIndex idx = klm->index( i ); + if ( idx.isValid() && + idx.data( KeyboardLayoutModel::KeyboardLayoutKeyRole ).toString() == currentLayout ) + currentLayoutItem = idx; + } + + return currentLayoutItem; +} KeyboardPage::KeyboardPage( QWidget* parent ) - : QWidget() + : QWidget( parent ) , ui( new Ui::Page_Keyboard ) , m_keyboardPreview( new KeyBoardPreview( this ) ) , m_defaultIndex( 0 ) @@ -68,8 +95,8 @@ KeyboardPage::KeyboardPage( QWidget* parent ) QString model = m_models.value( text, "pc105" ); // Set Xorg keyboard model - QProcess::execute( QString( "setxkbmap -model \"%1\"" ) - .arg( model ).toUtf8() ); + QProcess::execute( QLatin1Literal( "setxkbmap" ), + QStringList() << "-model" << model ); }); CALAMARES_RETRANSLATE( ui->retranslateUi( this ); ) @@ -160,14 +187,13 @@ KeyboardPage::init() // Block signals ui->listLayout->blockSignals( true ); - QPersistentModelIndex currentLayoutItem; - - for ( int i = 0; i < klm->rowCount(); ++i ) + QPersistentModelIndex currentLayoutItem = findLayout( klm, currentLayout ); + if ( !currentLayoutItem.isValid() && ( + ( currentLayout == "latin" ) + || ( currentLayout == "pc" ) ) ) { - QModelIndex idx = klm->index( i ); - if ( idx.isValid() && - idx.data( KeyboardLayoutModel::KeyboardLayoutKeyRole ).toString() == currentLayout ) - currentLayoutItem = idx; + currentLayout = "us"; + currentLayoutItem = findLayout( klm, currentLayout ); } // Set current layout and variant @@ -341,10 +367,22 @@ KeyboardPage::onListLayoutCurrentItemChanged( const QModelIndex& current, updateVariants( QPersistentModelIndex( current ) ); } +/* Returns stringlist with suitable setxkbmap command-line arguments + * to set the given @p layout and @p variant. + */ +static inline QStringList xkbmap_args( QStringList&& r, const QString& layout, const QString& variant) +{ + r << "-layout" << layout; + if ( !variant.isEmpty() ) + r << "-variant" << variant; + return r; +} void KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWidgetItem* previous ) { + Q_UNUSED( previous ); + QPersistentModelIndex layoutIndex = ui->listLayout->currentIndex(); LayoutItem* variantItem = dynamic_cast< LayoutItem* >( current ); @@ -369,8 +407,8 @@ KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWi connect( &m_setxkbmapTimer, &QTimer::timeout, this, [=] { - QProcess::execute( QString( "setxkbmap -layout \"%1\" -variant \"%2\"" ) - .arg( layout, variant ).toUtf8() ); + QProcess::execute( QLatin1Literal( "setxkbmap" ), + xkbmap_args( QStringList(), layout, variant ) ); cDebug() << "xkbmap selection changed to: " << layout << "-" << variant; m_setxkbmapTimer.disconnect( this ); } ); @@ -379,4 +417,3 @@ KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWi m_selectedLayout = layout; m_selectedVariant = variant; } - diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h index 6f828f446..2e582edf6 100644 --- a/src/modules/keyboard/KeyboardPage.h +++ b/src/modules/keyboard/KeyboardPage.h @@ -64,13 +64,6 @@ protected slots: QListWidgetItem* previous ); private: - class LayoutItem : public QListWidgetItem - { - public: - QString data; - KeyboardGlobal::KeyboardInfo info; - }; - /// Guess a layout based on the split-apart locale void guessLayout( const QStringList& langParts ); void updateVariants( const QPersistentModelIndex& currentItem, diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp index cdb2657dc..0dd326a8d 100644 --- a/src/modules/keyboard/KeyboardViewStep.cpp +++ b/src/modules/keyboard/KeyboardViewStep.cpp @@ -134,9 +134,6 @@ KeyboardViewStep::onLeave() void KeyboardViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { - // Save the settings to the global settings for the SetKeyboardLayoutJob to use - Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); - if ( configurationMap.contains( "xOrgConfFileName" ) && configurationMap.value( "xOrgConfFileName" ).type() == QVariant::String && !configurationMap.value( "xOrgConfFileName" ).toString().isEmpty() ) diff --git a/src/modules/keyboard/KeyboardViewStep.h b/src/modules/keyboard/KeyboardViewStep.h index 239639251..64ce2bb75 100644 --- a/src/modules/keyboard/KeyboardViewStep.h +++ b/src/modules/keyboard/KeyboardViewStep.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -34,7 +35,7 @@ class PLUGINDLLEXPORT KeyboardViewStep : public Calamares::ViewStep public: explicit KeyboardViewStep( QObject* parent = nullptr ); - virtual ~KeyboardViewStep(); + virtual ~KeyboardViewStep() override; QString prettyName() const override; QString prettyStatus() const override; diff --git a/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp b/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp index 53fa9c2af..f9fdf72e8 100644 --- a/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp +++ b/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp @@ -24,14 +24,13 @@ KeyBoardPreview::KeyBoardPreview( QWidget* parent ) : QWidget( parent ) + , layout( "us" ) , space( 0 ) , usable_width( 0 ) , key_w( 0 ) { setMinimumSize(700, 191); - layout = "us"; - // We must set up the font size in pixels to fit the keys lowerFont = QFont("Helvetica", 10, QFont::DemiBold); lowerFont.setPixelSize(16); @@ -62,14 +61,14 @@ KeyBoardPreview::KeyBoardPreview( QWidget* parent ) -void KeyBoardPreview::setLayout(QString layout) { - this->layout = layout; +void KeyBoardPreview::setLayout(QString _layout) { + layout = _layout; } -void KeyBoardPreview::setVariant(QString variant) { - this->variant = variant; +void KeyBoardPreview::setVariant(QString _variant) { + variant = _variant; if (!loadCodes()) return; @@ -235,10 +234,10 @@ void KeyBoardPreview::paintEvent(QPaintEvent* event) { for (int i = 0; i < 4; i++) { if (first_key_w > 0) { - first_key_w = first_key_w*1.375; + first_key_w = int(first_key_w * 1.375); if (kb == &kbList[KB_105] && i == 3) - first_key_w = key_w * 1.275; + first_key_w = int(key_w * 1.275); p.drawRoundedRect(QRectF(6, y, first_key_w, key_w), rx, rx); x = 6 + first_key_w + space; 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/LicenseViewStep.h b/src/modules/license/LicenseViewStep.h index 6229853ba..07824a5e3 100644 --- a/src/modules/license/LicenseViewStep.h +++ b/src/modules/license/LicenseViewStep.h @@ -36,7 +36,7 @@ class PLUGINDLLEXPORT LicenseViewStep : public Calamares::ViewStep public: explicit LicenseViewStep( QObject* parent = nullptr ); - virtual ~LicenseViewStep(); + virtual ~LicenseViewStep() override; QString prettyName() const override; @@ -52,7 +52,7 @@ public: bool isAtEnd() const override; QList< Calamares::job_ptr > jobs() const override; - + void setConfigurationMap( const QVariantMap& configurationMap ) override; private: 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/CMakeLists.txt b/src/modules/locale/CMakeLists.txt index 61bdfc707..e32f6e613 100644 --- a/src/modules/locale/CMakeLists.txt +++ b/src/modules/locale/CMakeLists.txt @@ -17,6 +17,6 @@ calamares_add_plugin( locale LINK_PRIVATE_LIBRARIES calamaresui Qt5::Network - yaml-cpp + ${YAMLCPP_LIBRARY} SHARED_LIB ) diff --git a/src/modules/locale/LCLocaleDialog.cpp b/src/modules/locale/LCLocaleDialog.cpp index 4acef03e1..46605091b 100644 --- a/src/modules/locale/LCLocaleDialog.cpp +++ b/src/modules/locale/LCLocaleDialog.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Teo Mrnjavac + * 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 @@ -40,7 +41,7 @@ LCLocaleDialog::LCLocaleDialog( const QString& guessedLCLocale, upperText->setText( tr( "The system locale setting affects the language and character " "set for some command line user interface elements.
" "The current setting is %1." ) - .arg( guessedLCLocale ) ); + .arg( guessedLCLocale ) ); mainLayout->addWidget( upperText ); setMinimumWidth( upperText->fontMetrics().height() * 24 ); @@ -60,8 +61,11 @@ LCLocaleDialog::LCLocaleDialog( const QString& guessedLCLocale, } QDialogButtonBox* dbb = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel, - Qt::Horizontal, - this ); + Qt::Horizontal, + this ); + dbb->button( QDialogButtonBox::Cancel )->setText( tr( "&Cancel" ) ); + dbb->button( QDialogButtonBox::Ok )->setText( tr( "&OK" ) ); + mainLayout->addWidget( dbb ); connect( dbb->button( QDialogButtonBox::Ok ), &QPushButton::clicked, @@ -82,9 +86,7 @@ LCLocaleDialog::LCLocaleDialog( const QString& guessedLCLocale, } ); if ( selected > -1 ) - { m_localesWidget->setCurrentRow( selected ); - } } 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..2172586ff 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 ); } @@ -284,7 +282,7 @@ LocalePage::init( const QString& initialRegion, } else { - m_tzWidget->setCurrentLocation( "Europe", "Berlin" ); + m_tzWidget->setCurrentLocation( "America", "New_York" ); } emit m_tzWidget->locationChanged( m_tzWidget->getCurrentLocation() ); @@ -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/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp index 24719b1be..4b4219751 100644 --- a/src/modules/locale/LocaleViewStep.cpp +++ b/src/modules/locale/LocaleViewStep.cpp @@ -116,28 +116,37 @@ LocaleViewStep::fetchGeoIpTimezone() { if ( reply->error() == QNetworkReply::NoError ) { - YAML::Node doc = YAML::Load( reply->readAll() ); + QByteArray data = reply->readAll(); - QVariant var = CalamaresUtils::yamlToVariant( doc ); - if ( !var.isNull() && - var.isValid() && - var.type() == QVariant::Map ) + try { - QVariantMap map = var.toMap(); - if ( map.contains( "time_zone" ) && - !map.value( "time_zone" ).toString().isEmpty() ) + YAML::Node doc = YAML::Load( reply->readAll() ); + + QVariant var = CalamaresUtils::yamlToVariant( doc ); + if ( !var.isNull() && + var.isValid() && + var.type() == QVariant::Map ) { - QString timezoneString = map.value( "time_zone" ).toString(); - QStringList timezone = timezoneString.split( '/', QString::SkipEmptyParts ); - if ( timezone.size() >= 2 ) + QVariantMap map = var.toMap(); + if ( map.contains( "time_zone" ) && + !map.value( "time_zone" ).toString().isEmpty() ) { - cDebug() << "GeoIP reporting" << timezoneString; - QString region = timezone.takeFirst(); - QString zone = timezone.join( '/' ); - m_startingTimezone = qMakePair( region, zone ); + QString timezoneString = map.value( "time_zone" ).toString(); + QStringList tzParts = timezoneString.split( '/', QString::SkipEmptyParts ); + if ( tzParts.size() >= 2 ) + { + cDebug() << "GeoIP reporting" << timezoneString; + QString region = tzParts.takeFirst(); + QString zone = tzParts.join( '/' ); + m_startingTimezone = qMakePair( region, zone ); + } } } } + catch ( YAML::Exception& e ) + { + CalamaresUtils::explainYamlException( e, data, "GeoIP data"); + } } reply->deleteLater(); @@ -262,8 +271,8 @@ LocaleViewStep::setConfigurationMap( const QVariantMap& configurationMap ) } else { - m_startingTimezone = qMakePair( QStringLiteral( "Europe" ), - QStringLiteral( "Berlin" ) ); + m_startingTimezone = qMakePair( QStringLiteral( "America" ), + QStringLiteral( "New_York" ) ); } if ( configurationMap.contains( "localeGenPath" ) && diff --git a/src/modules/locale/LocaleViewStep.h b/src/modules/locale/LocaleViewStep.h index 2785f3d4a..402fb7ce9 100644 --- a/src/modules/locale/LocaleViewStep.h +++ b/src/modules/locale/LocaleViewStep.h @@ -37,7 +37,7 @@ class PLUGINDLLEXPORT LocaleViewStep : public Calamares::ViewStep public: explicit LocaleViewStep( QObject* parent = nullptr ); - virtual ~LocaleViewStep(); + virtual ~LocaleViewStep() override; QString prettyName() const override; QString prettyStatus() const override; 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/machineid/main.py b/src/modules/machineid/main.py index 7d0ac2c54..649570958 100644 --- a/src/modules/machineid/main.py +++ b/src/modules/machineid/main.py @@ -22,7 +22,17 @@ import libcalamares import os -from libcalamares.utils import check_target_env_call +from libcalamares.utils import check_target_env_call, debug + +import gettext +_ = gettext.translation("calamares-python", + localedir=libcalamares.utils.gettext_path(), + languages=libcalamares.utils.gettext_languages(), + fallback=True).gettext + + +def pretty_name(): + return _("Generate machine-id.") def run(): diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 68f042af9..c32c5bfdd 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -38,7 +38,7 @@ def mount_partitions(root_mount_point, partitions): # Create mount point with `+` rather than `os.path.join()` because # `partition["mountPoint"]` starts with a '/'. mount_point = root_mount_point + partition["mountPoint"] - fstype = partition.get("fs", "") + fstype = partition.get("fs", "").lower() if fstype == "fat16" or fstype == "fat32": fstype = "vfat" diff --git a/src/modules/netinstall/CMakeLists.txt b/src/modules/netinstall/CMakeLists.txt index 1de1c7505..67f805734 100644 --- a/src/modules/netinstall/CMakeLists.txt +++ b/src/modules/netinstall/CMakeLists.txt @@ -15,6 +15,6 @@ calamares_add_plugin( netinstall LINK_PRIVATE_LIBRARIES calamaresui Qt5::Network - yaml-cpp + ${YAMLCPP_LIBRARY} SHARED_LIB ) diff --git a/src/modules/netinstall/NetInstallPage.cpp b/src/modules/netinstall/NetInstallPage.cpp index 956b49fc9..7bfda320c 100644 --- a/src/modules/netinstall/NetInstallPage.cpp +++ b/src/modules/netinstall/NetInstallPage.cpp @@ -2,6 +2,7 @@ * Copyright 2016, Luca Giambonini * Copyright 2016, Lisa Vitolo * Copyright 2017, Kyle Robbertze + * 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 @@ -50,6 +51,7 @@ NetInstallPage::NetInstallPage( QWidget* parent ) : QWidget( parent ) , ui( new Ui::Page_NetInst ) , m_networkManager( this ) + , m_groups( nullptr ) { ui->setupUi( this ); } @@ -62,14 +64,28 @@ NetInstallPage::isReady() return true; } -void NetInstallPage::readGroups( const QByteArray& yamlData ) +bool +NetInstallPage::readGroups( const QByteArray& yamlData ) { - YAML::Node groups = YAML::Load( yamlData.constData() ); - Q_ASSERT( groups.IsSequence() ); - m_groups = new PackageModel( groups ); - CALAMARES_RETRANSLATE( - m_groups->setHeaderData( 0, Qt::Horizontal, tr( "Name" ) ); - m_groups->setHeaderData( 0, Qt::Horizontal, tr( "Description" ) ); ) + try + { + YAML::Node groups = YAML::Load( yamlData.constData() ); + + if ( !groups.IsSequence() ) + cDebug() << "WARNING: netinstall groups data does not form a sequence."; + Q_ASSERT( groups.IsSequence() ); + m_groups = new PackageModel( groups ); + CALAMARES_RETRANSLATE( + m_groups->setHeaderData( 0, Qt::Horizontal, tr( "Name" ) ); + m_groups->setHeaderData( 0, Qt::Horizontal, tr( "Description" ) ); ) + return true; + + } + catch ( YAML::Exception& e ) + { + CalamaresUtils::explainYamlException( e, yamlData, "netinstall groups data" ); + return false; + } } void @@ -82,7 +98,13 @@ NetInstallPage::dataIsHere( QNetworkReply* reply ) return; } - readGroups( reply->readAll() ); + if ( !readGroups( reply->readAll() ) ) + { + cDebug() << "Netinstall groups data was received, but invalid."; + ui->netinst_status->setText( tr( "Network Installation. (Disabled: Unable to fetch package lists, check your network connection)" ) ); + reply->deleteLater(); + return; + } ui->groupswidget->setModel( m_groups ); ui->groupswidget->header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents ); diff --git a/src/modules/netinstall/NetInstallPage.h b/src/modules/netinstall/NetInstallPage.h index 7ecc74f89..423c16b8e 100644 --- a/src/modules/netinstall/NetInstallPage.h +++ b/src/modules/netinstall/NetInstallPage.h @@ -2,6 +2,7 @@ * Copyright 2016, Luca Giambonini * Copyright 2016, Lisa Vitolo * Copyright 2017, Kyle Robbertze + * 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 @@ -67,7 +68,7 @@ private: // Takes the YAML data representing the groups and reads them into the // m_groups and m_groupOrder internal structures. See the README.md // of this module to know the format expected of the YAML files. - void readGroups( const QByteArray& yamlData ); + bool readGroups( const QByteArray& yamlData ); Ui::Page_NetInst* ui; diff --git a/src/modules/netinstall/NetInstallViewStep.h b/src/modules/netinstall/NetInstallViewStep.h index de4d411d8..d9853f26f 100644 --- a/src/modules/netinstall/NetInstallViewStep.h +++ b/src/modules/netinstall/NetInstallViewStep.h @@ -1,6 +1,7 @@ /* * Copyright 2016, Luca Giambonini * Copyright 2016, Lisa Vitolo + * 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 @@ -34,7 +35,7 @@ class PLUGINDLLEXPORT NetInstallViewStep : public Calamares::ViewStep public: explicit NetInstallViewStep( QObject* parent = nullptr ); - virtual ~NetInstallViewStep(); + virtual ~NetInstallViewStep() override; QString prettyName() const override; QString prettyStatus() const override; diff --git a/src/modules/netinstall/PackageModel.cpp b/src/modules/netinstall/PackageModel.cpp index 629133c86..9fe8305a7 100644 --- a/src/modules/netinstall/PackageModel.cpp +++ b/src/modules/netinstall/PackageModel.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright (c) 2017, Kyle Robbertze + * 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 @@ -126,6 +127,8 @@ bool PackageModel::setHeaderData( int section, Qt::Orientation orientation, const QVariant& value, int role ) { + Q_UNUSED( role ); + if ( orientation == Qt::Horizontal ) { if ( m_columnHeadings.value( section ) != QVariant() ) diff --git a/src/modules/netinstall/PackageModel.h b/src/modules/netinstall/PackageModel.h index d49dd88c2..148bd99ab 100644 --- a/src/modules/netinstall/PackageModel.h +++ b/src/modules/netinstall/PackageModel.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright (c) 2017, Kyle Robbertze + * 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 @@ -35,14 +36,14 @@ class PackageModel : public QAbstractItemModel Q_OBJECT public: - explicit PackageModel( const YAML::Node& data, QObject* parent = 0 ); - ~PackageModel(); + explicit PackageModel( const YAML::Node& data, QObject* parent = nullptr ); + ~PackageModel() override; QVariant data( const QModelIndex& index, int role ) const override; bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole ) override; bool setHeaderData( int section, Qt::Orientation orientation, - const QVariant& value, int role = Qt::EditRole ); + const QVariant& value, int role = Qt::EditRole ) override; Qt::ItemFlags flags( const QModelIndex& index ) const override; QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override; diff --git a/src/modules/netinstall/PackageTreeItem.cpp b/src/modules/netinstall/PackageTreeItem.cpp index 0cbc52223..77ca07a9c 100644 --- a/src/modules/netinstall/PackageTreeItem.cpp +++ b/src/modules/netinstall/PackageTreeItem.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright (c) 2017, Kyle Robbertze + * 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 @@ -18,9 +19,9 @@ #include "PackageTreeItem.h" -PackageTreeItem::PackageTreeItem( const ItemData& data, PackageTreeItem* parent ) : - m_data( data ), - m_parentItem( parent ) +PackageTreeItem::PackageTreeItem( const ItemData& data, PackageTreeItem* parent ) + : m_parentItem( parent ) + , m_data( data ) { } PackageTreeItem::PackageTreeItem( const QString packageName, PackageTreeItem* parent ) : diff --git a/src/modules/netinstall/PackageTreeItem.h b/src/modules/netinstall/PackageTreeItem.h index 291def37d..e9bbcf59c 100644 --- a/src/modules/netinstall/PackageTreeItem.h +++ b/src/modules/netinstall/PackageTreeItem.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright (c) 2017, Kyle Robbertze + * 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 @@ -37,10 +38,10 @@ public: bool isHidden = false; Qt::CheckState selected = Qt::Unchecked; }; - explicit PackageTreeItem( const ItemData& data, PackageTreeItem* parent = 0 ); - explicit PackageTreeItem( const QString packageName, PackageTreeItem* parent = 0 ); - explicit PackageTreeItem( PackageTreeItem* parent = 0 ); - ~PackageTreeItem(); + explicit PackageTreeItem( const ItemData& data, PackageTreeItem* parent = nullptr ); + explicit PackageTreeItem( const QString packageName, PackageTreeItem* parent = nullptr ); + explicit PackageTreeItem( PackageTreeItem* parent = nullptr ); + ~PackageTreeItem() override; void appendChild( PackageTreeItem* child ); PackageTreeItem* child( int row ); diff --git a/src/modules/netinstall/images/arrow-down.png b/src/modules/netinstall/images/arrow-down.png deleted file mode 100644 index f1b8569da..000000000 Binary files a/src/modules/netinstall/images/arrow-down.png and /dev/null differ diff --git a/src/modules/netinstall/images/arrow-up.png b/src/modules/netinstall/images/arrow-up.png deleted file mode 100644 index 18679693d..000000000 Binary files a/src/modules/netinstall/images/arrow-up.png and /dev/null differ 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/netinstall/netinstall.qrc b/src/modules/netinstall/netinstall.qrc deleted file mode 100644 index ab49ebf4f..000000000 --- a/src/modules/netinstall/netinstall.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - images/arrow-up.png - images/arrow-down.png - - diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index 93fcc9eb7..48caae6bd 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -21,126 +21,324 @@ # You should have received a copy of the GNU General Public License # along with Calamares. If not, see . +import abc +from string import Template import subprocess + import libcalamares from libcalamares.utils import check_target_env_call, target_env_call -from string import Template +from libcalamares.utils import gettext_path, gettext_languages + +import gettext +_translation = gettext.translation("calamares-python", + localedir=gettext_path(), + languages=gettext_languages(), + fallback=True) +_ = _translation.gettext +_n = _translation.ngettext -class PackageManager: +total_packages = 0 # For the entire job +completed_packages = 0 # Done so far for this job +group_packages = 0 # One group of packages from an -install or -remove entry + +INSTALL = object() +REMOVE = object() +mode_packages = None # Changes to INSTALL or REMOVE + + +def _change_mode(mode): + global mode_packages + mode_packages = mode + libcalamares.job.setprogress(completed_packages * 1.0 / total_packages) + + +def pretty_name(): + if not group_packages: + # Outside the context of an operation + s = _("Processing packages (%(count)d / %(total)d)") + elif mode_packages is INSTALL: + s = _n("Installing one package.", + "Installing %(num)d packages.", group_packages) + elif mode_packages is REMOVE: + s = _n("Removing one package.", + "Removing %(num)d packages.", group_packages) + else: + # No mode, generic description + s = _("Install packages.") + + return s % {"num": group_packages, + "count": completed_packages, + "total": total_packages} + + +class PackageManager(metaclass=abc.ABCMeta): """ - Package manager class. + Package manager base class. A subclass implements package management + for a specific backend, and must have a class property `backend` + with the string identifier for that backend. - :param backend: + Subclasses are collected below to populate the list of possible + backends. """ - def __init__(self, backend): - self.backend = backend + backend = None + @abc.abstractmethod def install(self, pkgs, from_local=False): - """ Installs packages. - - :param pkgs: - :param from_local: """ - if self.backend == "packagekit": - for pkg in pkgs: - check_target_env_call(["pkcon", "-py", "install", pkg]) - elif self.backend == "zypp": - check_target_env_call(["zypper", "--non-interactive", - "--quiet-install", "install", - "--auto-agree-with-licenses", - "install"] + pkgs) - elif self.backend == "yum": - check_target_env_call(["yum", "install", "-y"] + pkgs) - elif self.backend == "dnf": - check_target_env_call(["dnf", "install", "-y"] + pkgs) - elif self.backend == "urpmi": - check_target_env_call(["urpmi", "--download-all", "--no-suggests", - "--no-verify-rpm", "--fastunsafe", - "--ignoresize", "--nolock", - "--auto"] + pkgs) - elif self.backend == "apt": - check_target_env_call(["apt-get", "-q", "-y", "install"] + pkgs) - elif self.backend == "pacman": - if from_local: - pacman_flags = "-U" - else: - pacman_flags = "-Sy" + Install a list of packages (named) into the system. + Although this handles lists, in practice it is called + with one package at a time. - check_target_env_call(["pacman", pacman_flags, - "--noconfirm"] + pkgs) - elif self.backend == "portage": - check_target_env_call(["emerge", "-v"] + pkgs) - elif self.backend == "entropy": - check_target_env_call(["equo", "i"] + pkgs) + @param pkgs: list[str] + list of package names + @param from_local: bool + if True, then these are local packages (on disk) and the + pkgs names are paths. + """ + pass + @abc.abstractmethod def remove(self, pkgs): - """ Removes packages. - - :param pkgs: """ - if self.backend == "packagekit": - for pkg in pkgs: - check_target_env_call(["pkcon", "-py", "remove", pkg]) - elif self.backend == "zypp": - check_target_env_call(["zypper", "--non-interactive", - "remove"] + pkgs) - elif self.backend == "yum": - check_target_env_call(["yum", "--disablerepo=*", "-C", "-y", - "remove"] + pkgs) - elif self.backend == "dnf": - # ignore the error code for now because dnf thinks removing a - # nonexistent package is an error - target_env_call(["dnf", "--disablerepo=*", "-C", "-y", - "remove"] + pkgs) - elif self.backend == "urpmi": - check_target_env_call(["urpme", "--auto"] + pkgs) - elif self.backend == "apt": - check_target_env_call(["apt-get", "--purge", "-q", "-y", - "remove"] + pkgs) - check_target_env_call(["apt-get", "--purge", "-q", "-y", - "autoremove"]) - elif self.backend == "pacman": - check_target_env_call(["pacman", "-Rs", "--noconfirm"] + pkgs) - elif self.backend == "portage": - check_target_env_call(["emerge", "-C"] + pkgs) - check_target_env_call(["emerge", "--depclean", "-q"]) - elif self.backend == "entropy": - check_target_env_call(["equo", "rm"] + pkgs) + Removes packages. + @param pkgs: list[str] + list of package names + """ + pass + + @abc.abstractmethod def update_db(self): - if self.backend == "packagekit": - check_target_env_call(["pkcon", "refresh"]) - elif self.backend == "zypp": - check_target_env_call(["zypper", "--non-interactive", "update"]) - elif self.backend == "urpmi": - check_target_env_call(["urpmi.update", "-a"]) - elif self.backend == "apt": - check_target_env_call(["apt-get", "update"]) - elif self.backend == "pacman": - check_target_env_call(["pacman", "-Sy"]) - elif self.backend == "portage": - check_target_env_call(["emerge", "--sync"]) - elif self.backend == "entropy": - check_target_env_call(["equo", "update"]) + pass def run(self, script): if script != "": check_target_env_call(script.split(" ")) + def install_package(self, packagedata, from_local=False): + """ + Install a package from a single entry in the install list. + This can be either a single package name, or an object + with pre- and post-scripts. -def subst_locale(list): - ret = [] + @param packagedata: str|dict + @param from_local: bool + see install.from_local + """ + if isinstance(packagedata, str): + self.install([packagedata], from_local=from_local) + else: + self.run(packagedata["pre-script"]) + self.install([packagedata["package"]], from_local=from_local) + self.run(packagedata["post-script"]) + + +class PMPackageKit(PackageManager): + backend = "packagekit" + + def install(self, pkgs, from_local=False): + for pkg in pkgs: + check_target_env_call(["pkcon", "-py", "install", pkg]) + + def remove(self, pkgs): + for pkg in pkgs: + check_target_env_call(["pkcon", "-py", "remove", pkg]) + + def update_db(self): + check_target_env_call(["pkcon", "refresh"]) + + +class PMZypp(PackageManager): + backend = "zypp" + + def install(self, pkgs, from_local=False): + check_target_env_call(["zypper", "--non-interactive", + "--quiet-install", "install", + "--auto-agree-with-licenses", + "install"] + pkgs) + + def remove(self, pkgs): + check_target_env_call(["zypper", "--non-interactive", + "remove"] + pkgs) + + def update_db(self): + check_target_env_call(["zypper", "--non-interactive", "update"]) + + +class PMYum(PackageManager): + backend = "yum" + + def install(self, pkgs, from_local=False): + check_target_env_call(["yum", "install", "-y"] + pkgs) + + def remove(self, pkgs): + check_target_env_call(["yum", "--disablerepo=*", "-C", "-y", + "remove"] + pkgs) + + def update_db(self): + # Doesn't need updates + pass + + +class PMDnf(PackageManager): + backend = "dnf" + + def install(self, pkgs, from_local=False): + check_target_env_call(["dnf", "install", "-y"] + pkgs) + + def remove(self, pkgs): + # ignore the error code for now because dnf thinks removing a + # nonexistent package is an error + target_env_call(["dnf", "--disablerepo=*", "-C", "-y", + "remove"] + pkgs) + + def update_db(self): + # Doesn't need to update explicitly + pass + + +class PMUrpmi(PackageManager): + backend = "urpmi" + + def install(self, pkgs, from_local=False): + check_target_env_call(["urpmi", "--download-all", "--no-suggests", + "--no-verify-rpm", "--fastunsafe", + "--ignoresize", "--nolock", + "--auto"] + pkgs) + + def remove(self, pkgs): + check_target_env_call(["urpme", "--auto"] + pkgs) + + def update_db(self): + check_target_env_call(["urpmi.update", "-a"]) + + +class PMApt(PackageManager): + backend = "apt" + + def install(self, pkgs, from_local=False): + check_target_env_call(["apt-get", "-q", "-y", "install"] + pkgs) + + def remove(self, pkgs): + check_target_env_call(["apt-get", "--purge", "-q", "-y", + "remove"] + pkgs) + check_target_env_call(["apt-get", "--purge", "-q", "-y", + "autoremove"]) + + def update_db(self): + check_target_env_call(["apt-get", "update"]) + + +class PMPacman(PackageManager): + backend = "pacman" + + def install(self, pkgs, from_local=False): + if from_local: + pacman_flags = "-U" + else: + pacman_flags = "-Sy" + + check_target_env_call(["pacman", pacman_flags, + "--noconfirm"] + pkgs) + + def remove(self, pkgs): + check_target_env_call(["pacman", "-Rs", "--noconfirm"] + pkgs) + + def update_db(self): + check_target_env_call(["pacman", "-Sy"]) + + +class PMPortage(PackageManager): + backend = "portage" + + def install(self, pkgs, from_local=False): + check_target_env_call(["emerge", "-v"] + pkgs) + + def remove(self, pkgs): + check_target_env_call(["emerge", "-C"] + pkgs) + check_target_env_call(["emerge", "--depclean", "-q"]) + + def update_db(self): + check_target_env_call(["emerge", "--sync"]) + + +class PMEntropy(PackageManager): + backend = "entropy" + + def install(self, pkgs, from_local=False): + check_target_env_call(["equo", "i"] + pkgs) + + def remove(self, pkgs): + check_target_env_call(["equo", "rm"] + pkgs) + + def update_db(self): + check_target_env_call(["equo", "update"]) + + +class PMDummy(PackageManager): + backend = "dummy" + + def install(self, pkgs, from_local=False): + libcalamares.utils.debug("Installing " + str(pkgs)) + + def remove(self, pkgs): + libcalamares.utils.debug("Removing " + str(pkgs)) + + def update_db(self): + libcalamares.utils.debug("Updating DB") + + def run(self, script): + libcalamares.utils.debug("Running script '" + str(script) + "'") + + +# Collect all the subclasses of PackageManager defined above, +# and index them based on the backend property of each class. +backend_managers = [ + (c.backend, c) + for c in globals().values() + if type(c) is abc.ABCMeta and issubclass(c, PackageManager) and c.backend] + + +def subst_locale(plist): + """ + Returns a locale-aware list of packages, based on @p plist. + Package names that contain LOCALE are localized with the + BCP47 name of the chosen system locale; if the system + locale is 'en' (e.g. English, US) then these localized + packages are dropped from the list. + + @param plist: list[str|dict] + Candidate packages to install. + @return: list[str|dict] + """ locale = libcalamares.globalstorage.value("locale") - if locale: - for e in list: - if locale != "en": - entry = Template(e) - ret.append(entry.safe_substitute(LOCALE=locale)) - elif 'LOCALE' not in e: - ret.append(e) - else: - ret = list + if not locale: + return plist + + ret = [] + for packagedata in plist: + if isinstance(packagedata, str): + packagename = packagedata + else: + packagename = packagedata["package"] + + # Update packagename: substitute LOCALE, and drop packages + # if locale is en and LOCALE is in the package name. + if locale != "en": + packagename = Template(packagename).safe_substitute(LOCALE=locale) + elif 'LOCALE' in packagename: + packagename = None + + if packagename is not None: + # Put it back in packagedata + if isinstance(packagedata, str): + packagedata = packagename + else: + packagedata["package"] = packagename + + ret.append(packagedata) + return ret @@ -151,39 +349,34 @@ def run_operations(pkgman, entry): :param pkgman: :param entry: """ + global group_packages, completed_packages, mode_packages + for key in entry.keys(): entry[key] = subst_locale(entry[key]) + group_packages = len(entry[key]) if key == "install": - if isinstance(entry[key], list): - for package in entry[key]: - pkgman.run(package["pre-script"]) - pkgman.install([package["package"]]) - pkgman.run(package["post-script"]) - else: + _change_mode(INSTALL) + if all([isinstance(x, str) for x in entry[key]]): pkgman.install(entry[key]) + else: + for package in entry[key]: + pkgman.install_package(package) elif key == "try_install": + _change_mode(INSTALL) # we make a separate package manager call for each package so a # single failing package won't stop all of them for package in entry[key]: - if isinstance(package, str): - try: - pkgman.install([package]) - except subprocess.CalledProcessError: - warn_text = "WARNING: could not install package " - warn_text += package - libcalamares.utils.debug(warn_text) - else: - try: - pkgman.run(package["pre-script"]) - pkgman.install([package["package"]]) - pkgman.run(package["post-script"]) - except subprocess.CalledProcessError: - warn_text = "WARNING: could not install packages " - warn_text += package["package"] - libcalamares.utils.debug(warn_text) + try: + pkgman.install_package(package) + except subprocess.CalledProcessError: + warn_text = "WARNING: could not install package " + warn_text += str(package) + libcalamares.utils.debug(warn_text) elif key == "remove": + _change_mode(REMOVE) pkgman.remove(entry[key]) elif key == "try_remove": + _change_mode(REMOVE) for package in entry[key]: try: pkgman.remove([package]) @@ -192,8 +385,16 @@ def run_operations(pkgman, entry): warn_text += package libcalamares.utils.debug(warn_text) elif key == "localInstall": + _change_mode(INSTALL) pkgman.install(entry[key], from_local=True) + completed_packages += len(entry[key]) + libcalamares.job.setprogress(completed_packages * 1.0 / total_packages) + libcalamares.utils.debug(pretty_name()) + + group_packages = 0 + _change_mode(None) + def run(): """ @@ -202,24 +403,44 @@ def run(): :return: """ + global mode_packages, total_packages, completed_packages, group_packages + backend = libcalamares.job.configuration.get("backend") - if backend not in ("packagekit", "zypp", "yum", "dnf", "urpmi", "apt", - "pacman", "portage", "entropy"): + for identifier, impl in backend_managers: + if identifier == backend: + pkgman = impl() + break + else: return "Bad backend", "backend=\"{}\"".format(backend) - pkgman = PackageManager(backend) - operations = libcalamares.job.configuration.get("operations", []) - update_db = libcalamares.job.configuration.get("update_db", False) if update_db and libcalamares.globalstorage.value("hasInternet"): pkgman.update_db() + operations = libcalamares.job.configuration.get("operations", []) + if libcalamares.globalstorage.contains("packageOperations"): + operations += libcalamares.globalstorage.value("packageOperations") + + mode_packages = None + total_packages = 0 + completed_packages = 0 + for op in operations: + for packagelist in op.values(): + total_packages += len(packagelist) + + if not total_packages: + # Avoids potential divide-by-zero in progress reporting + return None + for entry in operations: + group_packages = 0 + libcalamares.utils.debug(pretty_name()) run_operations(pkgman, entry) - if libcalamares.globalstorage.contains("packageOperations"): - run_operations(pkgman, - libcalamares.globalstorage.value("packageOperations")) + mode_packages = None + + libcalamares.job.setprogress(1.0) + libcalamares.utils.debug(pretty_name()) return None diff --git a/src/modules/packages/packages.conf b/src/modules/packages/packages.conf index 4039278b3..6e3af05a8 100644 --- a/src/modules/packages/packages.conf +++ b/src/modules/packages/packages.conf @@ -8,11 +8,15 @@ # - urpmi - Mandriva package manager # - apt - APT frontend for DEB and RPM # - pacman - Pacman -# - portage - Gentoo package manager -# - entropy - Sabayon package manager +# - portage - Gentoo package manager +# - entropy - Sabayon package manager +# - dummy - Dummy manager, only logs # -backend: packagekit +backend: dummy +# If set to true, a package-manager specific update procedure +# is run first (only if there is internet) to update the list +# of packages and dependencies. update_db: true # @@ -29,20 +33,90 @@ update_db: true # storage called "packageOperations" and it is processed # after the static list in the job configuration. # -#operations: -# - install: -# - pkg1 -# - pkg2 -# - remove: -# - pkg3 -# - pkg4 -# - try_install: # no system install failure if a package cannot be installed -# - pkg5 -# - try_remove: # no system install failure if a package cannot be removed -# - pkg2 -# - pkg1 -# - install: -# - pkgs6 -# - pkg7 -# - localInstall: -# - /path/to/pkg8 +# Allowed package operations are: +# - install, try_install: will call the package manager to +# install one or more packages. The install target will +# abort the whole installation if package-installation +# fails, while try_install carries on. Packages may be +# listed as (localized) names, or as (localized) package-data. +# See below for the description of the format. +# - localInstall: this is used to call the package manager +# to install a package from a path-to-a-package. This is +# useful if you have a static package archive on the install media. +# - remove, try_remove: will call the package manager to +# remove one or more packages. The remove target will +# abort the whole installation if package-removal fails, +# while try_remove carries on. Packages may be listed as +# (localized) names. +# +# There are two formats for naming packages: as a name # or as package-data, +# which is an object notation providing package-name, as well as pre- and +# post-install scripts. +# +# Here are both formats, for installing vi. The first one just names the +# package for vi (using the naming of the installed package manager), while +# the second contains three data-items; the pre-script is run before invoking +# the package manager, and the post-script runs once it is done. +# +# - install +# - vi +# - package: vi +# pre-script: touch /tmp/installing-vi +# post-script: rm -f /tmp/installing-vi +# +# The pre- and post-scripts are optional, but not both optional: using +# "package: vi" with neither script option will trick Calamares into +# trying to install a package named "package: vi", which is unlikely to work. +# +# Any package name may be localized; this is used to install localization +# packages for software based on the selected system locale. By including +# the string LOCALE in the package name, the following happens: +# +# - if the system locale is English (generally US English; en_GB is a valid +# localization), then the package is not installed at all, +# - otherwise LOCALE is replaced by the Bcp47 name of the selected system +# locale, e.g. nl_BE. +# +# The following installs localizations for vi, if they are relevant; if +# there is no localization, installation continues normally. +# +# - install +# - vi-LOCALE +# - package: vi-LOCALE +# pre-script: touch /tmp/installing-vi +# post-script: rm -f /tmp/installing-vi +# +# When installing packages, Calamares will invoke the package manager +# with a list of package names if it can; package-data prevents this because +# of the scripts that need to run. In other words, this: +# +# - install: +# - vi +# - binutils +# - package: wget +# pre-script: touch /tmp/installing-wget +# +# This will invoke the package manager three times, once for each package, +# because not all of them are simple package names. You can speed up the +# process if you have only a few pre-scriots, by using multiple install targets: +# +# - install: +# - vi +# - binutils +# - install: +# - package: wget +# pre-script: touch /tmp/installing-wget +# +# This will call the package manager once with the package-names "vi" and +# "binutils", and then a second time for "wget". When installing large numbers +# of packages, this can lead to a considerable time savings. +# +operations: + - install: + - vi + - wget + - binutils + - remove: + - vi + - wget + - binutils diff --git a/src/modules/packages/test.yaml b/src/modules/packages/test.yaml index 345172622..8902b657a 100644 --- a/src/modules/packages/test.yaml +++ b/src/modules/packages/test.yaml @@ -1,10 +1,12 @@ +backend: dummy rootMountPoint: /tmp/mount -packageOperations: +operations: - install: - pre-script: touch /tmp/foo package: vi post-script: rm /tmp/foo - wget + - binutils - remove: - vi - wget diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt index 4d68f4b10..1ea69c027 100644 --- a/src/modules/partition/CMakeLists.txt +++ b/src/modules/partition/CMakeLists.txt @@ -1,28 +1,40 @@ -# ECM used for something in the tests directory -find_package(ECM 0.0.13 REQUIRED NO_MODULE) +find_package(ECM 5.10.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) -# KF5::CoreAddons seems to be used for *something* in this module, not sure what -include(KDEInstallDirs) # this seems to be necessary for KF5::CoreAddons -include(GenerateExportHeader) # this too, because KDE frameworks always want omnomnom more stuff +include(KDEInstallDirs) +include(GenerateExportHeader) find_package( KF5 REQUIRED CoreAddons ) # These are needed because KPMcore links publicly against ConfigCore, I18n, IconThemes, KIOCore and Service find_package( KF5 REQUIRED Config I18n IconThemes KIO Service ) -find_package( KPMcore 3.0.2 REQUIRED ) +find_package( KPMcore 3.1.50 QUIET ) +if ( ${KPMcore_FOUND} ) + add_definitions(-DWITH_KPMCORE22) +endif() +find_package( KPMcore 3.0.3 REQUIRED ) +find_library( atasmart_LIB atasmart ) +find_library( blkid_LIB blkid ) +if( NOT atasmart_LIB ) + message( WARNING "atasmart library not found." ) +endif() +if( NOT blkid_LIB ) + message( WARNING "blkid library not found." ) +endif() + + +include_directories( ${KPMCORE_INCLUDE_DIR} ) +include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) add_subdirectory( tests ) -include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) -include_directories( ${KPMCORE_INCLUDE_DIR} ) - calamares_add_plugin( partition TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES core/BootLoaderModel.cpp core/ColorUtils.cpp + core/DeviceList.cpp core/DeviceModel.cpp core/KPMHelpers.cpp core/PartitionActions.cpp diff --git a/src/modules/partition/README.md b/src/modules/partition/README.md index 425d0980b..3491b309b 100644 --- a/src/modules/partition/README.md +++ b/src/modules/partition/README.md @@ -61,7 +61,7 @@ run on storage device which does not contain any data you care about. To build them: - cd $top_build_dir/src/modules/partitions/tests + cd $top_build_dir make buildtests To run them you need to define the `CALAMARES_TEST_DISK` environment variable. @@ -69,7 +69,7 @@ It should contain the device path to the test disk. For example, assuming you plugged a test USB stick identified as `/dev/sdb`, you would run the tests like this: - sudo CALAMARES_TEST_DISK=/dev/sdb $top_build_dir/partitiontests + sudo CALAMARES_TEST_DISK=/dev/sdb $top_build_dir/partitionjobtests # TODO diff --git a/src/modules/partition/core/BootLoaderModel.h b/src/modules/partition/core/BootLoaderModel.h index 27684e326..e911d9029 100644 --- a/src/modules/partition/core/BootLoaderModel.h +++ b/src/modules/partition/core/BootLoaderModel.h @@ -38,8 +38,8 @@ public: IsPartitionRole }; - BootLoaderModel( QObject* parent = 0 ); - ~BootLoaderModel(); + BootLoaderModel( QObject* parent = nullptr ); + ~BootLoaderModel() override; /** * Init the model with the list of devices. Does *not* take ownership of the diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp new file mode 100644 index 000000000..05616335b --- /dev/null +++ b/src/modules/partition/core/DeviceList.cpp @@ -0,0 +1,161 @@ +/* === This file is part of Calamares - === + * + * Copyright 2015-2016, Teo Mrnjavac + * + * Calamares is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Calamares is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + */ + +#include "DeviceList.h" + +#include "PartitionCoreModule.h" + +#include "core/DeviceModel.h" +#include "core/KPMHelpers.h" +#include "core/PartitionIterator.h" + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +namespace PartUtils +{ + +/** + * Does the given @p device contain the root filesystem? This is true if + * the device contains a partition which is currently mounted at / . + */ +static bool +hasRootPartition( Device* device ) +{ + for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) + if ( ( *it )->mountPoint() == "/" ) + return true; + return false; +} + +/* Unused */ +static bool +hasMountedPartitions( Device* device ) +{ + cDebug() << "Checking for mounted partitions in" << device->deviceNode(); + for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) + { + if ( ! ( *it )->isMounted() ) + { + cDebug() << " .." << ( *it )->partitionPath() << "is mounted on" << ( *it )->mountPoint(); + return true; + } + } + return false; +} + +static bool +isIso9660( const Device* device ) +{ + QString path = device->deviceNode(); + if ( path.isEmpty() ) + return false; + + QProcess blkid; + blkid.start( "blkid", { path } ); + blkid.waitForFinished(); + QString output = QString::fromLocal8Bit( blkid.readAllStandardOutput() ); + if ( output.contains( "iso9660" ) ) + return true; + + if ( device->partitionTable() && + !device->partitionTable()->children().isEmpty() ) + { + for ( const Partition* partition : device->partitionTable()->children() ) + { + path = partition->partitionPath(); + blkid.start( "blkid", { path } ); + blkid.waitForFinished(); + QString output = QString::fromLocal8Bit( blkid.readAllStandardOutput() ); + if ( output.contains( "iso9660" ) ) + return true; + } + } + return false; +} + + +static inline QDebug& +operator <<( QDebug& s, QList< Device* >::iterator& it ) +{ + s << ( ( *it ) ? ( *it )->deviceNode() : QString( "" ) ); + return s; +} + +using DeviceList = QList< Device* >; + +static inline DeviceList::iterator +erase(DeviceList& l, DeviceList::iterator& it) +{ + Device* p = *it; + auto r = l.erase( it ); + if (p) + delete p; + return r; +} + +QList< Device* > getDevices( DeviceType which, qint64 minimumSize ) +{ + bool writableOnly = (which == DeviceType::WritableOnly); + + CoreBackend* backend = CoreBackendManager::self()->backend(); + DeviceList devices = backend->scanDevices( true ); + + cDebug() << "Removing unsuitable devices:" << devices.count() << "candidates."; + + // Remove the device which contains / from the list + for ( DeviceList::iterator it = devices.begin(); it != devices.end(); ) + if ( ! ( *it ) || + ( *it )->deviceNode().startsWith( "/dev/zram" ) + ) + { + cDebug() << " .. Removing zram" << it; + it = erase(devices, it ); + + } + else if ( writableOnly && hasRootPartition( *it ) ) + { + cDebug() << " .. Removing device with root filesystem (/) on it" << it; + it = erase(devices, it ); + } + else if ( writableOnly && isIso9660( *it ) ) + { + cDebug() << " .. Removing device with iso9660 filesystem (probably a CD) on it" << it; + it = erase(devices, it ); + } + else if ( (minimumSize >= 0) && !( (*it)->capacity() > minimumSize ) ) + { + cDebug() << " .. Removing too-small" << it; + it = erase(devices, it ); + } + else + ++it; + + return devices; +} + +} // namespace PartUtils diff --git a/src/modules/partition/core/DeviceList.h b/src/modules/partition/core/DeviceList.h new file mode 100644 index 000000000..6da34c5d1 --- /dev/null +++ b/src/modules/partition/core/DeviceList.h @@ -0,0 +1,48 @@ +/* === This file is part of Calamares - === + * + * Copyright 2014-2017, Teo Mrnjavac + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Calamares is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + */ + +#ifndef DEVICELIST_H +#define DEVICELIST_H + +#include +#include + +class Device; + +namespace PartUtils +{ + +enum class DeviceType { All, WritableOnly }; + +/** + * @brief Gets a list of storage devices. + * @param which Can be used to select from all the devices in + * the system, filtering out those that do not meet a criterium. + * If set to WritableOnly, only devices which can be overwritten + * safely are returned (e.g. RO-media are ignored, as are mounted partitions). + * @param minimumSize Can be used to filter devices based on their + * size (in bytes). If non-negative, only devices with a size + * greater than @p minimumSize will be returned. + * @return a list of Devices meeting this criterium. + */ +QList< Device* > getDevices( DeviceType which = DeviceType::All, qint64 minimumSize = -1 ); + +} + +#endif // DEVICELIST_H diff --git a/src/modules/partition/core/DeviceModel.h b/src/modules/partition/core/DeviceModel.h index 21c6bd939..32c557d9e 100644 --- a/src/modules/partition/core/DeviceModel.h +++ b/src/modules/partition/core/DeviceModel.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Aurélien Gâteau + * 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 @@ -32,8 +33,8 @@ class DeviceModel : public QAbstractListModel { Q_OBJECT public: - DeviceModel( QObject* parent = 0 ); - ~DeviceModel(); + DeviceModel( QObject* parent = nullptr ); + ~DeviceModel() override; /** * Init the model with the list of devices. Does *not* take ownership of the diff --git a/src/modules/partition/core/KPMHelpers.cpp b/src/modules/partition/core/KPMHelpers.cpp index b0038213c..6ed167eee 100644 --- a/src/modules/partition/core/KPMHelpers.cpp +++ b/src/modules/partition/core/KPMHelpers.cpp @@ -23,6 +23,7 @@ #include "core/PartitionIterator.h" // KPMcore +#include #include #include #include @@ -43,10 +44,7 @@ initKPMcore() return true; QByteArray backendName = qgetenv( "KPMCORE_BACKEND" ); - if ( backendName.isEmpty() ) - backendName = "pmlibpartedbackendplugin"; - - if ( !CoreBackendManager::self()->load( backendName ) ) + if ( !CoreBackendManager::self()->load( backendName.isEmpty() ? CoreBackendManager::defaultBackendName() : backendName ) ) { qWarning() << "Failed to load backend plugin" << backendName; return false; @@ -117,7 +115,11 @@ createNewPartition( PartitionNode* parent, qint64 lastSector, PartitionTable::Flags flags ) { - FileSystem* fs = FileSystemFactory::create( fsType, firstSector, lastSector ); + FileSystem* fs = FileSystemFactory::create( fsType, firstSector, lastSector +#ifdef WITH_KPMCORE22 + ,device.logicalSize() +#endif + ); return new Partition( parent, device, @@ -150,7 +152,11 @@ createNewEncryptedPartition( PartitionNode* parent, FS::luks* fs = dynamic_cast< FS::luks* >( FileSystemFactory::create( FileSystem::Luks, firstSector, - lastSector ) ); + lastSector +#ifdef WITH_KPMCORE22 + ,device.logicalSize() +#endif + ) ); if ( !fs ) { qDebug() << "ERROR: cannot create LUKS filesystem. Giving up."; @@ -180,6 +186,9 @@ clonePartition( Device* device, Partition* partition ) partition->fileSystem().type(), partition->firstSector(), partition->lastSector() +#ifdef WITH_KPMCORE22 + ,device->logicalSize() +#endif ); return new Partition( partition->parent(), *device, diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 875de3a63..d2493239e 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -22,7 +22,11 @@ #include "core/DeviceModel.h" #include "core/KPMHelpers.h" +#include "core/PartitionIterator.h" +#include +#include +#include #include #include @@ -41,6 +45,9 @@ canBeReplaced( Partition* candidate ) if ( !candidate ) return false; + if ( candidate->isMounted() ) + return false; + bool ok = false; double requiredStorageGB = Calamares::JobQueue::instance() ->globalStorage() @@ -79,6 +86,9 @@ canBeResized( Partition* candidate ) if ( KPMHelpers::isPartitionFreeSpace( candidate ) ) return false; + if ( candidate->isMounted() ) + return false; + if ( candidate->roles().has( PartitionRole::Primary ) ) { PartitionTable* table = dynamic_cast< PartitionTable* >( candidate->parent() ); @@ -147,7 +157,7 @@ canBeResized( PartitionCoreModule* core, const QString& partitionPath ) } -FstabEntryList +static FstabEntryList lookForFstabEntries( const QString& partitionPath ) { FstabEntryList fstabEntries; @@ -191,7 +201,7 @@ lookForFstabEntries( const QString& partitionPath ) } -QString +static QString findPartitionPathForMountPoint( const FstabEntryList& fstab, const QString& mountPoint ) { @@ -324,5 +334,10 @@ runOsprober( PartitionCoreModule* core ) return osproberEntries; } - +bool +isEfiSystem() +{ + return QDir( "/sys/firmware/efi/efivars" ).exists(); } + +} // nmamespace PartUtils diff --git a/src/modules/partition/core/PartUtils.h b/src/modules/partition/core/PartUtils.h index 21d995965..c8d0714f0 100644 --- a/src/modules/partition/core/PartUtils.h +++ b/src/modules/partition/core/PartUtils.h @@ -62,6 +62,11 @@ bool canBeResized( PartitionCoreModule* core, const QString& partitionPath ); */ OsproberEntryList runOsprober( PartitionCoreModule* core ); +/** + * @brief Is this system EFI-enabled? Decides based on /sys/firmware/efi + */ +bool isEfiSystem(); + } #endif // PARTUTILS_H diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp index d47021bed..1c2363845 100644 --- a/src/modules/partition/core/PartitionActions.cpp +++ b/src/modules/partition/core/PartitionActions.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2017, Teo Mrnjavac + * 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 @@ -21,8 +22,10 @@ #include "core/KPMHelpers.h" #include "core/PartitionInfo.h" #include "core/PartitionCoreModule.h" +#include "core/PartUtils.h" #include "utils/CalamaresUtilsSystem.h" +#include "utils/Units.h" #include "JobQueue.h" #include "utils/Logger.h" #include "GlobalStorage.h" @@ -34,27 +37,29 @@ namespace PartitionActions { +using CalamaresUtils::GiBtoBytes; +using CalamaresUtils::MiBtoBytes; +using CalamaresUtils::operator""_GiB; +using CalamaresUtils::operator""_MiB; qint64 swapSuggestion( const qint64 availableSpaceB ) { - -#define MiB * static_cast< qint64 >( 1024 ) * 1024 -#define GiB * static_cast< qint64 >( 1024 ) * 1024 * 1024 - - // swap(mem) = max(2, 2 * mem), if mem < 2 GiB - // = mem, if 2 GiB <= mem < 8 GiB - // = mem / 2, if 8 GIB <= mem < 64 GiB - // = 4 GiB, if mem >= 64 GiB - + /* If suspend-to-disk is demanded, then we always need enough + * swap to write the whole memory to disk -- between 2GB and 8GB + * RAM give proportionally more swap, and from 8GB RAM keep + * swap = RAM. + * + * If suspend-to-disk is not demanded, then ramp up more slowly, + * to 8GB swap at 16GB memory, and then drop to 4GB for "large + * memory" machines, on the assumption that those don't need swap + * because they have tons of memory (or whatever they are doing, + * had better not run into swap). + */ qint64 suggestedSwapSizeB = 0; - qint64 availableRamB = CalamaresUtils::System::instance()->getPhysicalMemoryB(); - qreal overestimationFactor = 1.01; - if ( !availableRamB ) - { - availableRamB = CalamaresUtils::System::instance()->getTotalMemoryB(); - overestimationFactor = 1.10; - } + auto memory = CalamaresUtils::System::instance()->getTotalMemoryB(); + qint64 availableRamB = memory.first; + qreal overestimationFactor = memory.second; bool ensureSuspendToDisk = Calamares::JobQueue::instance()->globalStorage()-> @@ -62,10 +67,10 @@ swapSuggestion( const qint64 availableSpaceB ) if ( ensureSuspendToDisk ) { - if ( availableRamB < 4 GiB ) - suggestedSwapSizeB = qMax( 2 GiB, availableRamB * 2 ); - else if ( availableRamB >= 4 GiB && availableRamB < 8 GiB ) - suggestedSwapSizeB = 8 GiB; + if ( availableRamB < 4_GiB ) + suggestedSwapSizeB = qMax( 2_GiB, availableRamB * 2 ); + else if ( availableRamB >= 4_GiB && availableRamB < 8_GiB ) + suggestedSwapSizeB = 8_GiB; else suggestedSwapSizeB = availableRamB; @@ -73,14 +78,14 @@ swapSuggestion( const qint64 availableSpaceB ) } else //if we don't care about suspend to disk { - if ( availableRamB < 2 GiB ) - suggestedSwapSizeB = qMax( 2 GiB, availableRamB * 2 ); - else if ( availableRamB >= 2 GiB && availableRamB < 8 GiB ) + if ( availableRamB < 2_GiB ) + suggestedSwapSizeB = qMax( 2_GiB, availableRamB * 2 ); + else if ( availableRamB >= 2_GiB && availableRamB < 8_GiB ) suggestedSwapSizeB = availableRamB; - else if ( availableRamB >= 8 GiB && availableRamB < 64 GiB ) - suggestedSwapSizeB = availableRamB / 2; + else if ( availableRamB >= 8_GiB && availableRamB < 16_GiB ) + suggestedSwapSizeB = 8_GiB; else - suggestedSwapSizeB = 4 GiB; + suggestedSwapSizeB = 4_GiB; suggestedSwapSizeB *= overestimationFactor; @@ -102,17 +107,12 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass { Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); - bool isEfi = false; - if ( QDir( "/sys/firmware/efi/efivars" ).exists() ) - isEfi = true; + bool isEfi = PartUtils::isEfiSystem(); QString defaultFsType = gs->value( "defaultFileSystemType" ).toString(); if ( FileSystem::typeForName( defaultFsType ) == FileSystem::Unknown ) defaultFsType = "ext4"; -#define MiB * static_cast< qint64 >( 1024 ) * 1024 -#define GiB * static_cast< qint64 >( 1024 ) * 1024 * 1024 - // Partition sizes are expressed in MiB, should be multiples of // the logical sector size (usually 512B). int uefisys_part_size = 0; @@ -128,11 +128,11 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass empty_space_size = 1; } - qint64 firstFreeSector = empty_space_size MiB / dev->logicalSize() + 1; + qint64 firstFreeSector = MiBtoBytes(empty_space_size) / dev->logicalSize() + 1; if ( isEfi ) { - qint64 lastSector = firstFreeSector + ( uefisys_part_size MiB / dev->logicalSize() ); + qint64 lastSector = firstFreeSector + ( MiBtoBytes(uefisys_part_size) / dev->logicalSize() ); core->createPartitionTable( dev, PartitionTable::gpt ); Partition* efiPartition = KPMHelpers::createNewPartition( dev->partitionTable(), @@ -163,7 +163,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass qint64 availableSpaceB = ( dev->totalLogical() - firstFreeSector ) * dev->logicalSize(); suggestedSwapSizeB = swapSuggestion( availableSpaceB ); qint64 requiredSpaceB = - ( gs->value( "requiredStorageGB" ).toDouble() + 0.1 + 2.0 ) GiB + + GiBtoBytes( gs->value( "requiredStorageGB" ).toDouble() + 0.1 + 2.0 ) + suggestedSwapSizeB; // If there is enough room for ESP + root + swap, create swap, otherwise don't. diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index 7ce67be16..a40ca1035 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -2,6 +2,7 @@ * * Copyright 2014, Aurélien Gâteau * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -21,6 +22,7 @@ #include "core/BootLoaderModel.h" #include "core/ColorUtils.h" +#include "core/DeviceList.h" #include "core/DeviceModel.h" #include "core/PartitionInfo.h" #include "core/PartitionIterator.h" @@ -54,45 +56,6 @@ #include #include -static bool -hasRootPartition( Device* device ) -{ - for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) - if ( ( *it )->mountPoint() == "/" ) - return true; - return false; -} - -static bool -isIso9660( const Device* device ) -{ - QString path = device->deviceNode(); - if ( path.isEmpty() ) - return false; - - QProcess blkid; - blkid.start( "blkid", { path } ); - blkid.waitForFinished(); - QString output = QString::fromLocal8Bit( blkid.readAllStandardOutput() ); - if ( output.contains( "iso9660" ) ) - return true; - - if ( device->partitionTable() && - !device->partitionTable()->children().isEmpty() ) - { - for ( const Partition* partition : device->partitionTable()->children() ) - { - path = partition->partitionPath(); - blkid.start( "blkid", { path } ); - blkid.waitForFinished(); - QString output = QString::fromLocal8Bit( blkid.readAllStandardOutput() ); - if ( output.contains( "iso9660" ) ) - return true; - } - } - return false; -} - //- DeviceInfo --------------------------------------------- PartitionCoreModule::DeviceInfo::DeviceInfo( Device* _device ) : device( _device ) @@ -152,25 +115,19 @@ PartitionCoreModule::doInit() { FileSystemFactory::init(); - CoreBackend* backend = CoreBackendManager::self()->backend(); - QList< Device* > devices = backend->scanDevices( true ); + using DeviceList = QList< Device* >; + DeviceList devices = PartUtils::getDevices( PartUtils::DeviceType::WritableOnly ); - // Remove the device which contains / from the list - for ( QList< Device* >::iterator it = devices.begin(); it != devices.end(); ) - if ( hasRootPartition( *it ) || - (*it)->deviceNode().startsWith( "/dev/zram") || - isIso9660( *it ) ) - it = devices.erase( it ); - else - ++it; - - cDebug() << "LIST OF DETECTED DEVICES:\nnode\tcapacity\tname\tprettyName"; + cDebug() << "LIST OF DETECTED DEVICES:"; + cDebug() << "node\tcapacity\tname\tprettyName"; for ( auto device : devices ) { + // Gives ownership of the Device* to the DeviceInfo object auto deviceInfo = new DeviceInfo( device ); m_deviceInfos << deviceInfo; cDebug() << device->deviceNode() << device->capacity() << device->name() << device->prettyName(); } + cDebug() << ".." << devices.count() << "devices detected."; m_deviceModel->init( devices ); // The following PartUtils::runOsprober call in turn calls PartUtils::canBeResized, @@ -190,32 +147,29 @@ PartitionCoreModule::doInit() for ( auto deviceInfo : m_deviceInfos ) { for ( auto it = PartitionIterator::begin( deviceInfo->device.data() ); - it != PartitionIterator::end( deviceInfo->device.data() ); ++it ) + it != PartitionIterator::end( deviceInfo->device.data() ); ++it ) { Partition* partition = *it; for ( auto jt = m_osproberLines.begin(); - jt != m_osproberLines.end(); ++jt ) + jt != m_osproberLines.end(); ++jt ) { if ( jt->path == partition->partitionPath() && - partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone && - !partition->fileSystem().uuid().isEmpty() ) - { + partition->fileSystem().supportGetUUID() != FileSystem::cmdSupportNone && + !partition->fileSystem().uuid().isEmpty() ) jt->uuid = partition->fileSystem().uuid(); - } } } } for ( auto deviceInfo : m_deviceInfos ) - { deviceInfo->partitionModel->init( deviceInfo->device.data(), m_osproberLines ); - } m_bootLoaderModel->init( devices ); - if ( QDir( "/sys/firmware/efi/efivars" ).exists() ) - scanForEfiSystemPartitions(); //FIXME: this should be removed in favor of - // proper KPM support for EFI + //FIXME: this should be removed in favor of + // proper KPM support for EFI + if ( PartUtils::isEfiSystem() ) + scanForEfiSystemPartitions(); } PartitionCoreModule::~PartitionCoreModule() @@ -276,8 +230,8 @@ PartitionCoreModule::createPartitionTable( Device* device, PartitionTable::Table } void -PartitionCoreModule::createPartition( Device *device, - Partition *partition, +PartitionCoreModule::createPartition( Device* device, + Partition* partition, PartitionTable::Flags flags ) { auto deviceInfo = infoForDevice( device ); @@ -316,8 +270,8 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition ) if ( !KPMHelpers::isPartitionFreeSpace( childPartition ) ) lst << childPartition; - for ( auto partition : lst ) - deletePartition( device, partition ); + for ( auto childPartition : lst ) + deletePartition( device, childPartition ); } QList< Calamares::job_ptr >& jobs = deviceInfo->jobs; @@ -447,9 +401,7 @@ PartitionCoreModule::jobs() const QStringList jobsDebug; foreach ( auto job, lst ) - { jobsDebug.append( job->prettyName() ); - } cDebug() << "PartitionCodeModule has been asked for jobs. About to return:" << jobsDebug.join( "\n" ); @@ -489,7 +441,7 @@ PartitionCoreModule::osproberEntries() const } void -PartitionCoreModule::refreshPartition( Device* device, Partition* partition ) +PartitionCoreModule::refreshPartition( Device* device, Partition* ) { // Keep it simple for now: reset the model. This can be improved to cause // the model to emit dataChanged() for the affected row instead, avoiding @@ -507,9 +459,11 @@ PartitionCoreModule::refresh() updateHasRootMountPoint(); updateIsDirty(); m_bootLoaderModel->update(); - if ( QDir( "/sys/firmware/efi/efivars" ).exists() ) - scanForEfiSystemPartitions(); //FIXME: this should be removed in favor of - // proper KPM support for EFI + + //FIXME: this should be removed in favor of + // proper KPM support for EFI + if ( PartUtils::isEfiSystem() ) + scanForEfiSystemPartitions(); } void PartitionCoreModule::updateHasRootMountPoint() @@ -551,7 +505,7 @@ PartitionCoreModule::scanForEfiSystemPartitions() QList< Partition* > efiSystemPartitions = KPMHelpers::findPartitions( devices, - []( Partition* partition ) -> bool + []( Partition* partition ) -> bool { if ( partition->activeFlags().testFlag( PartitionTable::FlagEsp ) ) { @@ -571,7 +525,7 @@ PartitionCoreModule::DeviceInfo* PartitionCoreModule::infoForDevice( const Device* device ) const { for ( auto it = m_deviceInfos.constBegin(); - it != m_deviceInfos.constEnd(); ++it ) + it != m_deviceInfos.constEnd(); ++it ) { if ( ( *it )->device.data() == device ) return *it; @@ -617,9 +571,7 @@ void PartitionCoreModule::revertAllDevices() { foreach ( DeviceInfo* devInfo, m_deviceInfos ) - { revertDevice( devInfo->device.data() ); - } refresh(); } @@ -633,7 +585,7 @@ PartitionCoreModule::revertDevice( Device* dev ) return; devInfo->forgetChanges(); CoreBackend* backend = CoreBackendManager::self()->backend(); - Device *newDev = backend->scanDevice( devInfo->device->deviceNode() ); + Device* newDev = backend->scanDevice( devInfo->device->deviceNode() ); devInfo->device.reset( newDev ); devInfo->partitionModel->init( newDev, m_osproberLines ); @@ -670,9 +622,7 @@ void PartitionCoreModule::clearJobs() { foreach ( DeviceInfo* deviceInfo, m_deviceInfos ) - { deviceInfo->forgetChanges(); - } updateIsDirty(); } diff --git a/src/modules/partition/core/PartitionIterator.cpp b/src/modules/partition/core/PartitionIterator.cpp index df1a2e4d7..26fa1df8c 100644 --- a/src/modules/partition/core/PartitionIterator.cpp +++ b/src/modules/partition/core/PartitionIterator.cpp @@ -2,6 +2,7 @@ * * Copyright 2014, Aurélien Gâteau * Copyright 2015, Teo Mrnjavac + * 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 @@ -83,6 +84,8 @@ PartitionIterator::operator!=( const PartitionIterator& other ) const PartitionIterator PartitionIterator::begin( Device* device ) { + if ( !device ) + return PartitionIterator( nullptr ); Q_ASSERT(device); PartitionTable* table = device->partitionTable(); if ( !table ) @@ -106,6 +109,8 @@ PartitionIterator::begin( PartitionTable* table ) PartitionIterator PartitionIterator::end( Device* device ) { + if ( !device ) + return PartitionIterator( nullptr ); PartitionTable* table = device->partitionTable(); if ( !table ) return PartitionIterator( nullptr ); diff --git a/src/modules/partition/core/PartitionModel.h b/src/modules/partition/core/PartitionModel.h index c792058e7..71764d8e9 100644 --- a/src/modules/partition/core/PartitionModel.h +++ b/src/modules/partition/core/PartitionModel.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Aurélien Gâteau + * 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 @@ -90,7 +91,7 @@ public: ColumnCount // Must remain last }; - PartitionModel( QObject* parent = 0 ); + PartitionModel( QObject* parent = nullptr ); /** * device must remain alive for the life of PartitionModel */ diff --git a/src/modules/partition/gui/AlongsidePage.cpp b/src/modules/partition/gui/AlongsidePage.cpp deleted file mode 100644 index 0b1615b32..000000000 --- a/src/modules/partition/gui/AlongsidePage.cpp +++ /dev/null @@ -1,322 +0,0 @@ -/* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac - * - * Calamares is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Calamares is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calamares. If not, see . - */ - -#include "AlongsidePage.h" - -#include "core/ColorUtils.h" -#include "core/PartitionCoreModule.h" -#include "core/DeviceModel.h" -#include "core/KPMHelpers.h" -#include "core/PartitionInfo.h" -#include "core/PartitionIterator.h" -#include "gui/PartitionSplitterWidget.h" -#include "gui/PartitionBarsView.h" -#include "gui/PartitionLabelsView.h" - -#include "JobQueue.h" -#include "GlobalStorage.h" -#include "utils/Logger.h" -#include "utils/CalamaresUtilsGui.h" -#include "utils/Retranslator.h" -#include "Branding.h" - -// KPMcore -#include -#include - -#include -#include -#include -#include - - -AlongsidePage::AlongsidePage( QWidget* parent ) - : QWidget( parent ) - , m_nextEnabled( false ) - , m_core( nullptr ) -{ - QVBoxLayout* mainLayout = new QVBoxLayout; - setLayout( mainLayout ); - - QHBoxLayout* partitionsComboLayout = new QHBoxLayout; - mainLayout->addLayout( partitionsComboLayout ); - - QLabel* partitionsLabel = new QLabel; - partitionsComboLayout->addWidget( partitionsLabel ); - - m_partitionsComboBox = new QComboBox; - partitionsComboLayout->addWidget( m_partitionsComboBox ); - partitionsLabel->setBuddy( m_partitionsComboBox ); - - partitionsComboLayout->addStretch(); - - m_previewWidget = new PartitionBarsView; - m_previewLabels = new PartitionLabelsView; - mainLayout->addWidget( m_previewWidget ); - mainLayout->addWidget( m_previewLabels ); - - QLabel* allocateSpaceLabel = new QLabel(); - mainLayout->addWidget( allocateSpaceLabel ); - - CALAMARES_RETRANSLATE( - partitionsLabel->setText( tr( "Choose partition to shrink:" ) ); - allocateSpaceLabel->setText( tr( "Allocate drive space by dragging the divider below:" ) ); - ) - - m_splitterWidget = new PartitionSplitterWidget; - mainLayout->addWidget( m_splitterWidget ); - - m_sizeLabel = new QLabel; - m_sizeLabel->setWordWrap( true ); - mainLayout->addWidget( m_sizeLabel ); - - QBoxLayout* efiLayout = new QHBoxLayout; - m_efiLabel = new QLabel; - m_efiComboBox = new QComboBox; - efiLayout->addWidget( m_efiLabel ); - efiLayout->addWidget( m_efiComboBox ); - m_efiLabel->setBuddy( m_efiComboBox ); - efiLayout->addStretch(); - mainLayout->addLayout( efiLayout ); - - m_efiLabel->hide(); - m_efiComboBox->hide(); - - m_isEfi = QDir( "/sys/firmware/efi/efivars" ).exists(); - - mainLayout->addStretch(); -} - - -void -AlongsidePage::init( PartitionCoreModule* core ) -{ - if ( m_core != core ) - m_core = core; - - m_partitionsComboBox->clear(); - - connect( m_partitionsComboBox, - static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ), - this, &AlongsidePage::onPartitionSelected ); - - connect( m_splitterWidget, &PartitionSplitterWidget::partitionResized, - this, [ this ]( const QString& path, qint64 size, qint64 sizeNext ) - { - m_sizeLabel->setText( tr( "With this operation, the partition %1 which contains " - "%4 will be shrunk " - "to %2MB and a new %3MB partition will be created for %5." ) - .arg( path ) - .arg( size / ( 1024 * 1024 ) ) - .arg( sizeNext / ( 1024 * 1024 ) ) - .arg( m_partitionsComboBox->currentText() ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ProductName ) ) ); - } ); - - for ( const OsproberEntry& e : m_core->osproberEntries() ) - { - if ( e.canBeResized ) - m_partitionsComboBox->addItem( e.prettyName + " (" + e.path + ")", e.path ); - } - setNextEnabled( true ); -} - - -void -AlongsidePage::onPartitionSelected( int comboBoxIndex ) -{ - QString path = m_partitionsComboBox->itemData( comboBoxIndex ).toString(); - cDebug() << "Current index changed:" << path; - - DeviceModel* dm = m_core->deviceModel(); - for ( int i = 0; i < dm->rowCount(); ++i ) - { - Device* dev = dm->deviceForIndex( dm->index( i ) ); - Partition* candidate = KPMHelpers::findPartitionByPath( { dev }, path ); - if ( candidate ) - { - // store candidate->partitionPath() here! - - bool ok = false; - double requiredStorageGB = Calamares::JobQueue::instance() - ->globalStorage() - ->value( "requiredStorageGB" ) - .toDouble( &ok ); - - qint64 usedStorageB = candidate->sectorsUsed() * dev->logicalSectorSize(); - qint64 requiredStorageB = ( requiredStorageGB + 0.1 + 2.0 ) * 1024 * 1024 * 1024; - - // set up splitter widget here, then set up the split position - - Device* deviceBefore = m_core->createImmutableDeviceCopy( dev ); - - PartitionModel* partitionModelBefore = new PartitionModel; - partitionModelBefore->init( deviceBefore, m_core->osproberEntries() ); - deviceBefore->setParent( partitionModelBefore ); - partitionModelBefore->setParent( m_previewWidget ); - - m_previewWidget->setModel( partitionModelBefore ); - m_previewLabels->setModel( partitionModelBefore ); - m_splitterWidget->init( dev ); - - m_splitterWidget->setSplitPartition( candidate->partitionPath(), - candidate->used() * 1.1, - candidate->capacity() - requiredStorageB, - candidate->capacity() / 2, - Calamares::Branding::instance()-> - string( Calamares::Branding::ProductName ) ); - - m_splitterWidget->setFixedHeight( qMax< int >( CalamaresUtils::defaultFontHeight() * 1.5, 30 ) ); - - m_efiComboBox->hide(); - m_efiLabel->hide(); - - if ( m_isEfi ) - { - QList< Partition* > efiSystemPartitions = m_core->efiSystemPartitions(); - m_efiLabel->show(); - - if ( efiSystemPartitions.count() == 0 ) - { - m_efiLabel->setText( - tr( "An EFI system partition cannot be found anywhere " - "on this system. Please go back and use manual " - "partitioning to set up %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortProductName ) ) ); - setNextEnabled( false ); - } - else if ( efiSystemPartitions.count() == 1 ) - { - m_efiLabel->setText( - tr( "The EFI system partition at %1 will be used for " - "starting %2." ) - .arg( efiSystemPartitions.first()->partitionPath() ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortProductName ) ) ); - setNextEnabled( true ); - } - else - { - m_efiComboBox->show(); - m_efiLabel->setText( tr( "EFI system partition:" ) ); - for ( int i = 0; i < efiSystemPartitions.count(); ++i ) - { - Partition* efiPartition = efiSystemPartitions.at( i ); - m_efiComboBox->addItem( efiPartition->partitionPath(), i ); - if ( efiPartition->devicePath() == candidate->devicePath() && - efiPartition->number() == 1 ) - m_efiComboBox->setCurrentIndex( i ); - } - setNextEnabled( true ); - } - } - else - { - setNextEnabled( true ); - } - return; - } - } -} - - -bool -AlongsidePage::isNextEnabled() const -{ - return m_nextEnabled; -} - - -void -AlongsidePage::applyChanges() -{ - m_core->revert(); - - Q_ASSERT( m_splitterWidget->splitPartitionSize() >= 0 ); - Q_ASSERT( m_splitterWidget->newPartitionSize() >= 0 ); - - - QString path = m_partitionsComboBox->currentData().toString(); - - DeviceModel* dm = m_core->deviceModel(); - for ( int i = 0; i < dm->rowCount(); ++i ) - { - Device* dev = dm->deviceForIndex( dm->index( i ) ); - Partition* candidate = KPMHelpers::findPartitionByPath( { dev }, path ); - if ( candidate ) - { - qint64 firstSector = candidate->firstSector(); - qint64 oldLastSector = candidate->lastSector(); - qint64 newLastSector = m_splitterWidget->splitPartitionSize() / - dev->logicalSectorSize(); - - m_core->resizePartition( dev, candidate, firstSector, newLastSector ); - Partition* newPartition = KPMHelpers::createNewPartition( - candidate->parent(), - *dev, - candidate->roles(), - FileSystem::Ext4, - newLastSector + 1, - oldLastSector ); - PartitionInfo::setMountPoint( newPartition, "/" ); - PartitionInfo::setFormat( newPartition, true ); - - m_core->createPartition( dev, newPartition ); - m_core->setBootLoaderInstallPath( dev->deviceNode() ); - - if ( m_isEfi ) - { - QList< Partition* > efiSystemPartitions = m_core->efiSystemPartitions(); - if ( efiSystemPartitions.count() == 1 ) - { - PartitionInfo::setMountPoint( - efiSystemPartitions.first(), - Calamares::JobQueue::instance()-> - globalStorage()-> - value( "efiSystemPartition" ).toString() ); - } - else if ( efiSystemPartitions.count() > 1 ) - { - PartitionInfo::setMountPoint( - efiSystemPartitions.at( m_efiComboBox->currentIndex() ), - Calamares::JobQueue::instance()-> - globalStorage()-> - value( "efiSystemPartition" ).toString() ); - } - } - - m_core->dumpQueue(); - - break; - } - } -} - - -void -AlongsidePage::setNextEnabled( bool enabled ) -{ - if ( enabled == m_nextEnabled ) - return; - - m_nextEnabled = enabled; - emit nextStatusChanged( enabled ); -} - diff --git a/src/modules/partition/gui/AlongsidePage.h b/src/modules/partition/gui/AlongsidePage.h deleted file mode 100644 index cb02af646..000000000 --- a/src/modules/partition/gui/AlongsidePage.h +++ /dev/null @@ -1,72 +0,0 @@ -/* === This file is part of Calamares - === - * - * Copyright 2014-2015, Teo Mrnjavac - * - * Calamares is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Calamares is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calamares. If not, see . - */ - -#ifndef ALONGSIDEPAGE_H -#define ALONGSIDEPAGE_H - -#include - -#include "core/OsproberEntry.h" - -class QComboBox; -class QLabel; -class PartitionCoreModule; -class PartitionSplitterWidget; -class Partition; -class PartitionBarsView; -class PartitionLabelsView; -class Device; - -class AlongsidePage : public QWidget -{ - Q_OBJECT -public: - explicit AlongsidePage( QWidget* parent = nullptr ); - - void init( PartitionCoreModule* core ); - - bool isNextEnabled() const; - - void applyChanges(); - -signals: - void nextStatusChanged( bool ); - -private slots: - void onPartitionSelected( int comboBoxIndex ); - -private: - void setNextEnabled( bool enabled ); - - QComboBox* m_partitionsComboBox; - PartitionSplitterWidget* m_splitterWidget; - PartitionBarsView* m_previewWidget; - PartitionLabelsView* m_previewLabels; - QLabel* m_sizeLabel; - - QLabel* m_efiLabel; - QComboBox* m_efiComboBox; - - PartitionCoreModule* m_core; - - bool m_isEfi; - - bool m_nextEnabled; -}; - -#endif // ALONGSIDEPAGE_H diff --git a/src/modules/partition/gui/BootInfoWidget.cpp b/src/modules/partition/gui/BootInfoWidget.cpp index 605144271..cb89432b0 100644 --- a/src/modules/partition/gui/BootInfoWidget.cpp +++ b/src/modules/partition/gui/BootInfoWidget.cpp @@ -18,8 +18,10 @@ #include "BootInfoWidget.h" +#include "core/PartUtils.h" -#include +#include "utils/CalamaresUtilsGui.h" +#include "utils/Retranslator.h" #include #include @@ -58,18 +60,20 @@ BootInfoWidget::BootInfoWidget( QWidget* parent ) m_bootIcon->setPalette( palette ); m_bootLabel->setPalette( palette ); + CALAMARES_RETRANSLATE( retranslateUi(); ) +} + +void +BootInfoWidget::retranslateUi() +{ m_bootIcon->setToolTip( tr( "The boot environment of this system.

" "Older x86 systems only support BIOS.
" "Modern systems usually use EFI, but " "may also show up as BIOS if started in compatibility " "mode." ) ); - bool isEfi = false; - if ( QDir( "/sys/firmware/efi/efivars" ).exists() ) - isEfi = true; - QString bootToolTip; - if ( isEfi ) + if ( PartUtils::isEfiSystem() ) { m_bootLabel->setText( "EFI " ); bootToolTip = tr( "This system was started with an EFI " diff --git a/src/modules/partition/gui/BootInfoWidget.h b/src/modules/partition/gui/BootInfoWidget.h index b8012b361..ac70a7b9a 100644 --- a/src/modules/partition/gui/BootInfoWidget.h +++ b/src/modules/partition/gui/BootInfoWidget.h @@ -30,6 +30,9 @@ class BootInfoWidget : public QWidget public: explicit BootInfoWidget( QWidget* parent = nullptr ); +public slots: + void retranslateUi(); + private: QLabel* m_bootIcon; QLabel* m_bootLabel; diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index a213e62fa..b4e9b0c9f 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2017, Teo Mrnjavac + * 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 @@ -145,7 +146,7 @@ void ChoicePage::init( PartitionCoreModule* core ) { m_core = core; - m_isEfi = QDir( "/sys/firmware/efi/efivars" ).exists(); + m_isEfi = PartUtils::isEfiSystem(); setupChoices(); @@ -473,9 +474,7 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current, part->partitionPath(), qRound64( part->used() * 1.1 ), part->capacity() - requiredStorageB, - part->capacity() / 2, - Calamares::Branding::instance()-> - string( Calamares::Branding::ProductName ) ); + part->capacity() / 2 ); if ( m_isEfi ) setupEfiSystemPartitionSelector(); @@ -680,7 +679,7 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current ) m_core->revertDevice( selectedDevice() ); } - // if the partition is unallocated(free space), we don't replace it but create new one + // if the partition is unallocated(free space), we don't replace it but create new one // with the same first and last sector Partition* selectedPartition = static_cast< Partition* >( current.data( PartitionModel::PartitionPtrRole ) @@ -775,8 +774,7 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current ) if ( !homePartitionPath->isEmpty() ) m_reuseHomeCheckBox->setText( tr( "Reuse %1 as home partition for %2." ) .arg( *homePartitionPath ) - .arg( Calamares::Branding::instance()->string( - Calamares::Branding::ShortProductName ) ) ); + .arg( *Calamares::Branding::ShortProductName ) ); delete homePartitionPath; if ( m_isEfi ) @@ -807,9 +805,12 @@ ChoicePage::updateDeviceStatePreview() cDebug() << "Updating partitioning state widgets."; qDeleteAll( m_previewBeforeFrame->children() ); - m_previewBeforeFrame->layout()->deleteLater(); - QVBoxLayout* layout = new QVBoxLayout; + auto layout = m_previewBeforeFrame->layout(); + if ( layout ) + layout->deleteLater(); // Doesn't like nullptr + + layout = new QVBoxLayout; m_previewBeforeFrame->setLayout( layout ); CalamaresUtils::unmarginLayout( layout ); layout->setSpacing( 6 ); @@ -830,7 +831,7 @@ ChoicePage::updateDeviceStatePreview() // The QObject parents tree is meaningful for memory management here, // see qDeleteAll above. - deviceBefore->setParent( model ); + deviceBefore->setParent( model ); // Can't reparent across threads model->setParent( m_beforePartitionBarsView ); m_beforePartitionBarsView->setModel( model ); @@ -839,7 +840,8 @@ ChoicePage::updateDeviceStatePreview() // Make the bars and labels view use the same selectionModel. auto sm = m_beforePartitionLabelsView->selectionModel(); m_beforePartitionLabelsView->setSelectionModel( m_beforePartitionBarsView->selectionModel() ); - sm->deleteLater(); + if ( sm ) + sm->deleteLater(); switch ( m_choice ) { @@ -875,7 +877,10 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice ) cDebug() << "Updating partitioning preview widgets."; qDeleteAll( m_previewAfterFrame->children() ); - m_previewAfterFrame->layout()->deleteLater(); + + auto oldlayout = m_previewAfterFrame->layout(); + if ( oldlayout ) + oldlayout->deleteLater(); QVBoxLayout* layout = new QVBoxLayout; m_previewAfterFrame->setLayout( layout ); @@ -919,8 +924,7 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice ) .arg( m_beforePartitionBarsView->selectionModel()->currentIndex().data().toString() ) .arg( size / ( 1024 * 1024 ) ) .arg( sizeNext / ( 1024 * 1024 ) ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortProductName ) ) ); + .arg( *Calamares::Branding::ShortProductName ) ); } ); m_previewAfterFrame->show(); @@ -948,8 +952,7 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice ) m_afterPartitionBarsView->setNestedPartitionsMode( mode ); m_afterPartitionLabelsView = new PartitionLabelsView( m_previewAfterFrame ); m_afterPartitionLabelsView->setExtendedPartitionHidden( mode == PartitionBarsView::NoNestedPartitions ); - m_afterPartitionLabelsView->setCustomNewRootLabel( Calamares::Branding::instance()-> - string( Calamares::Branding::BootloaderEntryName ) ); + m_afterPartitionLabelsView->setCustomNewRootLabel( *Calamares::Branding::BootloaderEntryName ); PartitionModel* model = m_core->partitionModelForDevice( selectedDevice() ); @@ -1073,8 +1076,7 @@ ChoicePage::setupEfiSystemPartitionSelector() tr( "An EFI system partition cannot be found anywhere " "on this system. Please go back and use manual " "partitioning to set up %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortProductName ) ) ); + .arg( *Calamares::Branding::ShortProductName ) ); updateNextEnabled(); } else if ( efiSystemPartitions.count() == 1 ) //probably most usual situation @@ -1083,8 +1085,7 @@ ChoicePage::setupEfiSystemPartitionSelector() tr( "The EFI system partition at %1 will be used for " "starting %2." ) .arg( efiSystemPartitions.first()->partitionPath() ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortProductName ) ) ); + .arg( *Calamares::Branding::ShortProductName ) ); } else { @@ -1128,6 +1129,15 @@ ChoicePage::createBootloaderComboBox( QWidget* parent ) } +static inline void +force_uncheck(QButtonGroup* grp, PrettyRadioButton* button) +{ + button->hide(); + grp->setExclusive( false ); + button->buttonWidget()->setChecked( false ); + grp->setExclusive( true ); +} + /** * @brief ChoicePage::setupActions happens every time a new Device* is selected in the * device picker. Sets up the text and visibility of the partitioning actions based @@ -1147,30 +1157,20 @@ ChoicePage::setupActions() m_deviceInfoWidget->setPartitionTableType( PartitionTable::unknownTableType ); bool atLeastOneCanBeResized = false; + bool atLeastOneCanBeReplaced = false; + bool atLeastOneIsMounted = false; // Suppress 'erase' if so for ( auto it = PartitionIterator::begin( currentDevice ); it != PartitionIterator::end( currentDevice ); ++it ) { if ( PartUtils::canBeResized( *it ) ) - { atLeastOneCanBeResized = true; - break; - } - } - - bool atLeastOneCanBeReplaced = false; - - for ( auto it = PartitionIterator::begin( currentDevice ); - it != PartitionIterator::end( currentDevice ); ++it ) - { if ( PartUtils::canBeReplaced( *it ) ) - { atLeastOneCanBeReplaced = true; - break; - } + if ( (*it)->isMounted() ) + atLeastOneIsMounted = true; } - if ( osproberEntriesForCurrentDevice.count() == 0 ) { CALAMARES_RETRANSLATE( @@ -1185,13 +1185,11 @@ ChoicePage::setupActions() m_alongsideButton->setText( tr( "Install alongside
" "The installer will shrink a partition to make room for %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) ); + .arg( *Calamares::Branding::ShortVersionedName ) ); m_replaceButton->setText( tr( "Replace a partition
" "Replaces a partition with %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) ); + .arg( *Calamares::Branding::ShortVersionedName ) ); ) m_replaceButton->hide(); @@ -1216,8 +1214,7 @@ ChoicePage::setupActions() m_alongsideButton->setText( tr( "Install alongside
" "The installer will shrink a partition to make room for %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) ); + .arg( *Calamares::Branding::ShortVersionedName ) ); m_eraseButton->setText( tr( "Erase disk
" "This will delete all data " @@ -1226,8 +1223,7 @@ ChoicePage::setupActions() m_replaceButton->setText( tr( "Replace a partition
" "Replaces a partition with %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) ); + .arg( *Calamares::Branding::ShortVersionedName ) ); ) } else @@ -1240,8 +1236,7 @@ ChoicePage::setupActions() m_alongsideButton->setText( tr( "Install alongside
" "The installer will shrink a partition to make room for %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) ); + .arg( *Calamares::Branding::ShortVersionedName ) ); m_eraseButton->setText( tr( "Erase disk
" "This will delete all data " @@ -1249,22 +1244,9 @@ ChoicePage::setupActions() m_replaceButton->setText( tr( "Replace a partition
" "Replaces a partition with %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) ); + .arg( *Calamares::Branding::ShortVersionedName ) ); ) } - - m_replaceButton->show(); - - if ( atLeastOneCanBeResized ) - m_alongsideButton->show(); - else - { - m_alongsideButton->hide(); - m_grp->setExclusive( false ); - m_alongsideButton->buttonWidget()->setChecked( false ); - m_grp->setExclusive( true ); - } } else { @@ -1278,8 +1260,7 @@ ChoicePage::setupActions() m_alongsideButton->setText( tr( "Install alongside
" "The installer will shrink a partition to make room for %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) ); + .arg( *Calamares::Branding::ShortVersionedName ) ); m_eraseButton->setText( tr( "Erase disk
" "This will delete all data " @@ -1287,44 +1268,26 @@ ChoicePage::setupActions() m_replaceButton->setText( tr( "Replace a partition
" "Replaces a partition with %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) ); + .arg( *Calamares::Branding::ShortVersionedName ) ); ) - - m_replaceButton->show(); - - if ( atLeastOneCanBeResized ) - m_alongsideButton->show(); - else - { - m_alongsideButton->hide(); - m_grp->setExclusive( false ); - m_alongsideButton->buttonWidget()->setChecked( false ); - m_grp->setExclusive( true ); - } } if ( atLeastOneCanBeReplaced ) m_replaceButton->show(); else - { - m_replaceButton->hide(); - m_grp->setExclusive( false ); - m_replaceButton->buttonWidget()->setChecked( false ); - m_grp->setExclusive( true ); - } + force_uncheck( m_grp, m_replaceButton ); if ( atLeastOneCanBeResized ) m_alongsideButton->show(); else - { - m_alongsideButton->hide(); - m_grp->setExclusive( false ); - m_alongsideButton->buttonWidget()->setChecked( false ); - m_grp->setExclusive( true ); - } + force_uncheck( m_grp, m_alongsideButton ); - bool isEfi = QDir( "/sys/firmware/efi/efivars" ).exists(); + if ( !atLeastOneIsMounted ) + m_eraseButton->show(); // None mounted + else + force_uncheck( m_grp, m_eraseButton ); + + bool isEfi = PartUtils::isEfiSystem(); bool efiSystemPartitionFound = !m_core->efiSystemPartitions().isEmpty(); if ( isEfi && !efiSystemPartitionFound ) diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp index 4cd22bf68..90cf92051 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.cpp +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp @@ -21,6 +21,7 @@ #include "core/ColorUtils.h" #include "core/PartitionInfo.h" +#include "core/PartUtils.h" #include "core/KPMHelpers.h" #include "gui/PartitionSizeController.h" @@ -66,12 +67,12 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, PartitionNode* par m_ui->encryptWidget->hide(); QStringList mountPoints = { "/", "/boot", "/home", "/opt", "/usr", "/var" }; - if ( QDir( "/sys/firmware/efi/efivars" ).exists() ) + if ( PartUtils::isEfiSystem() ) mountPoints << Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString(); mountPoints.removeDuplicates(); mountPoints.sort(); m_ui->mountPointComboBox->addItems( mountPoints ); - + if ( device->partitionTable()->type() == PartitionTable::msdos || device->partitionTable()->type() == PartitionTable::msdos_sectorbased ) initMbrPartitionTypeUi(); diff --git a/src/modules/partition/gui/CreatePartitionDialog.ui b/src/modules/partition/gui/CreatePartitionDialog.ui index 53445e0ec..ba457b29c 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.ui +++ b/src/modules/partition/gui/CreatePartitionDialog.ui @@ -45,7 +45,7 @@ - MB + MiB diff --git a/src/modules/partition/gui/DeviceInfoWidget.cpp b/src/modules/partition/gui/DeviceInfoWidget.cpp index dc4473521..abe5c7a49 100644 --- a/src/modules/partition/gui/DeviceInfoWidget.cpp +++ b/src/modules/partition/gui/DeviceInfoWidget.cpp @@ -19,9 +19,11 @@ #include "DeviceInfoWidget.h" -#include -#include -#include +#include "utils/CalamaresUtilsGui.h" +#include "utils/Logger.h" +#include "utils/Retranslator.h" +#include "JobQueue.h" +#include "GlobalStorage.h" #include #include @@ -31,6 +33,7 @@ DeviceInfoWidget::DeviceInfoWidget( QWidget* parent ) : QWidget( parent ) , m_ptIcon( new QLabel ) , m_ptLabel( new QLabel ) + , m_tableType( PartitionTable::unknownTableType ) { QHBoxLayout* mainLayout = new QHBoxLayout; setLayout( mainLayout ); @@ -44,9 +47,10 @@ DeviceInfoWidget::DeviceInfoWidget( QWidget* parent ) m_ptIcon->setMargin( 0 ); m_ptIcon->setFixedSize( iconSize ); - m_ptIcon->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionTable, - CalamaresUtils::Original, - iconSize ) ); + m_ptIcon->setPixmap( + CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionTable, + CalamaresUtils::Original, + iconSize ) ); QFontMetrics fm = QFontMetrics( QFont() ); m_ptLabel->setMinimumWidth( fm.boundingRect( "Amiga" ).width() + CalamaresUtils::defaultFontHeight() / 2 ); @@ -60,28 +64,24 @@ DeviceInfoWidget::DeviceInfoWidget( QWidget* parent ) m_ptIcon->setPalette( palette ); m_ptLabel->setPalette( palette ); - m_ptIcon->setToolTip( tr( "The type of partition table on the " - "selected storage device.

" - "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.
" - "This installer will keep the current partition table " - "unless you explicitly choose otherwise.
" - "If unsure, on modern systems GPT is preferred." ) ); - - bool isEfi = false; - if ( QDir( "/sys/firmware/efi/efivars" ).exists() ) - isEfi = true; + CALAMARES_RETRANSLATE( retranslateUi(); ) } void DeviceInfoWidget::setPartitionTableType( PartitionTable::TableType type ) { - QString typeString = PartitionTable::tableTypeToName( type ).toUpper(); + m_tableType = type; + retranslateUi(); +} + +void +DeviceInfoWidget::retranslateUi() +{ + QString typeString = PartitionTable::tableTypeToName( m_tableType ).toUpper(); // fix up if the name shouldn't be uppercase: - switch ( type ) + switch ( m_tableType ) { case PartitionTable::msdos: case PartitionTable::msdos_sectorbased: @@ -108,7 +108,7 @@ DeviceInfoWidget::setPartitionTableType( PartitionTable::TableType type ) "table." ) .arg( typeString ); - switch ( type ) + switch ( m_tableType ) { case PartitionTable::loop: toolTipString = tr( "This is a loop " @@ -146,5 +146,13 @@ DeviceInfoWidget::setPartitionTableType( PartitionTable::TableType type ) m_ptLabel->setText( typeString ); m_ptLabel->setToolTip( toolTipString ); -} + m_ptIcon->setToolTip( tr( "The type of partition table on the " + "selected storage device.

" + "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.
" + "This installer will keep the current partition table " + "unless you explicitly choose otherwise.
" + "If unsure, on modern systems GPT is preferred." ) ); +} diff --git a/src/modules/partition/gui/DeviceInfoWidget.h b/src/modules/partition/gui/DeviceInfoWidget.h index ab67c102c..f8bd07ca3 100644 --- a/src/modules/partition/gui/DeviceInfoWidget.h +++ b/src/modules/partition/gui/DeviceInfoWidget.h @@ -34,9 +34,13 @@ public: void setPartitionTableType( PartitionTable::TableType type ); +public slots: + void retranslateUi(); + private: QLabel* m_ptIcon; QLabel* m_ptLabel; + PartitionTable::TableType m_tableType; }; #endif // DEVICEINFOWIDGET_H diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp index 1909e48e8..e213b8731 100644 --- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp +++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp @@ -26,6 +26,7 @@ #include #include #include +#include "core/PartUtils.h" #include #include @@ -56,7 +57,7 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, Partit m_ui->setupUi( this ); QStringList mountPoints = { "/", "/boot", "/home", "/opt", "/usr", "/var" }; - if ( QDir( "/sys/firmware/efi/efivars" ).exists() ) + if ( PartUtils::isEfiSystem() ) mountPoints << Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString(); mountPoints.removeDuplicates(); mountPoints.sort(); diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.ui b/src/modules/partition/gui/EditExistingPartitionDialog.ui index edee3c7a7..c242e3bbc 100644 --- a/src/modules/partition/gui/EditExistingPartitionDialog.ui +++ b/src/modules/partition/gui/EditExistingPartitionDialog.ui @@ -124,7 +124,11 @@ - + + + MiB + + diff --git a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp index 9fc7be59d..198f2ebe1 100644 --- a/src/modules/partition/gui/EncryptWidget.cpp +++ b/src/modules/partition/gui/EncryptWidget.cpp @@ -23,6 +23,7 @@ EncryptWidget::EncryptWidget( QWidget* parent ) : QWidget( parent ) + , m_state( EncryptionDisabled ) { setupUi( this ); diff --git a/src/modules/partition/gui/PartitionBarsView.cpp b/src/modules/partition/gui/PartitionBarsView.cpp index f1333da7c..a66420e1b 100644 --- a/src/modules/partition/gui/PartitionBarsView.cpp +++ b/src/modules/partition/gui/PartitionBarsView.cpp @@ -35,8 +35,8 @@ static const int VIEW_HEIGHT = qMax( CalamaresUtils::defaultFontHeight() + 8, // wins out with big fonts - (int)( CalamaresUtils::defaultFontHeight() * 0.6 ) + 22 ); // wins out with small fonts -static const int CORNER_RADIUS = 3; + int( CalamaresUtils::defaultFontHeight() * 0.6 ) + 22 ); // wins out with small fonts +static constexpr int CORNER_RADIUS = 3; static const int EXTENDED_PARTITION_MARGIN = qMax( 4, VIEW_HEIGHT / 6 ); // The SELECTION_MARGIN is applied within a hardcoded 2px padding anyway, so @@ -54,8 +54,8 @@ static const int SELECTION_MARGIN = qMin( ( EXTENDED_PARTITION_MARGIN - 2 ) / 2, PartitionBarsView::PartitionBarsView( QWidget* parent ) : QAbstractItemView( parent ) , m_nestedPartitionsMode( NoNestedPartitions ) - , m_hoveredIndex( QModelIndex() ) , canBeSelected( []( const QModelIndex& ) { return true; } ) + , m_hoveredIndex( QModelIndex() ) { setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); setFrameStyle( QFrame::NoFrame ); @@ -422,14 +422,14 @@ PartitionBarsView::setSelectionFilter( std::function< bool ( const QModelIndex& QModelIndex -PartitionBarsView::moveCursor( CursorAction cursorAction, Qt::KeyboardModifiers modifiers ) +PartitionBarsView::moveCursor( CursorAction, Qt::KeyboardModifiers ) { return QModelIndex(); } bool -PartitionBarsView::isIndexHidden( const QModelIndex& index ) const +PartitionBarsView::isIndexHidden( const QModelIndex& ) const { return false; } @@ -491,7 +491,7 @@ PartitionBarsView::mouseMoveEvent( QMouseEvent* event ) void -PartitionBarsView::leaveEvent( QEvent* event ) +PartitionBarsView::leaveEvent( QEvent* ) { QGuiApplication::restoreOverrideCursor(); if ( m_hoveredIndex.isValid() ) diff --git a/src/modules/partition/gui/PartitionBarsView.h b/src/modules/partition/gui/PartitionBarsView.h index 002d2c943..e384ed5db 100644 --- a/src/modules/partition/gui/PartitionBarsView.h +++ b/src/modules/partition/gui/PartitionBarsView.h @@ -2,6 +2,7 @@ * * Copyright 2014, Aurélien Gâteau * Copyright 2015-2016, Teo Mrnjavac + * 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 @@ -42,7 +43,7 @@ public: }; explicit PartitionBarsView( QWidget* parent = nullptr ); - virtual ~PartitionBarsView(); + virtual ~PartitionBarsView() override; void setNestedPartitionsMode( NestedPartitionsMode mode ); diff --git a/src/modules/partition/gui/PartitionLabelsView.cpp b/src/modules/partition/gui/PartitionLabelsView.cpp index d7364fb5f..c0b7fdd41 100644 --- a/src/modules/partition/gui/PartitionLabelsView.cpp +++ b/src/modules/partition/gui/PartitionLabelsView.cpp @@ -43,7 +43,7 @@ static const int LABELS_MARGIN = LABEL_PARTITION_SQUARE_MARGIN; static const int CORNER_RADIUS = 2; -QStringList +static QStringList buildUnknownDisklabelTexts( Device* dev ) { QStringList texts = { QObject::tr( "Unpartitioned space or unknown partition table" ), @@ -54,7 +54,7 @@ buildUnknownDisklabelTexts( Device* dev ) PartitionLabelsView::PartitionLabelsView( QWidget* parent ) : QAbstractItemView( parent ) - , canBeSelected( []( const QModelIndex& ) { return true; } ) + , m_canBeSelected( []( const QModelIndex& ) { return true; } ) , m_extendedPartitionHidden( false ) { setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); @@ -100,6 +100,8 @@ PartitionLabelsView::sizeHint() const void PartitionLabelsView::paintEvent( QPaintEvent* event ) { + Q_UNUSED( event ); + QPainter painter( viewport() ); painter.fillRect( rect(), palette().window() ); painter.setRenderHint( QPainter::Antialiasing ); @@ -292,7 +294,6 @@ PartitionLabelsView::drawLabels( QPainter* painter, !modl->device()->partitionTable() ) // No disklabel or unknown { QStringList texts = buildUnknownDisklabelTexts( modl->device() ); - QSize labelSize = sizeForLabel( texts ); QColor labelColor = ColorUtils::unknownDisklabelColor(); drawLabel( painter, texts, labelColor, QPoint( rect.x(), rect.y() ), false /*can't be selected*/ ); } @@ -467,6 +468,8 @@ PartitionLabelsView::visualRect( const QModelIndex& idx ) const QRegion PartitionLabelsView::visualRegionForSelection( const QItemSelection& selection ) const { + Q_UNUSED( selection ); + return QRegion(); } @@ -516,7 +519,7 @@ PartitionLabelsView::setSelectionModel( QItemSelectionModel* selectionModel ) void PartitionLabelsView::setSelectionFilter( SelectionFilter canBeSelected ) { - this->canBeSelected = canBeSelected; + m_canBeSelected = canBeSelected; } @@ -530,6 +533,9 @@ PartitionLabelsView::setExtendedPartitionHidden( bool hidden ) QModelIndex PartitionLabelsView::moveCursor( CursorAction cursorAction, Qt::KeyboardModifiers modifiers ) { + Q_UNUSED( cursorAction ); + Q_UNUSED( modifiers ); + return QModelIndex(); } @@ -537,6 +543,8 @@ PartitionLabelsView::moveCursor( CursorAction cursorAction, Qt::KeyboardModifier bool PartitionLabelsView::isIndexHidden( const QModelIndex& index ) const { + Q_UNUSED( index ); + return false; } @@ -545,7 +553,7 @@ void PartitionLabelsView::setSelection( const QRect& rect, QItemSelectionModel::SelectionFlags flags ) { QModelIndex eventIndex = indexAt( rect.topLeft() ); - if ( canBeSelected( eventIndex ) ) + if ( m_canBeSelected( eventIndex ) ) selectionModel()->select( eventIndex, flags ); } @@ -567,7 +575,7 @@ PartitionLabelsView::mouseMoveEvent( QMouseEvent* event ) if ( oldHoveredIndex != m_hoveredIndex ) { - if ( m_hoveredIndex.isValid() && !canBeSelected( m_hoveredIndex ) ) + if ( m_hoveredIndex.isValid() && !m_canBeSelected( m_hoveredIndex ) ) QGuiApplication::setOverrideCursor( Qt::ForbiddenCursor ); else QGuiApplication::restoreOverrideCursor(); @@ -580,6 +588,8 @@ PartitionLabelsView::mouseMoveEvent( QMouseEvent* event ) void PartitionLabelsView::leaveEvent( QEvent* event ) { + Q_UNUSED( event ); + QGuiApplication::restoreOverrideCursor(); if ( m_hoveredIndex.isValid() ) { @@ -593,7 +603,7 @@ void PartitionLabelsView::mousePressEvent( QMouseEvent* event ) { QModelIndex candidateIndex = indexAt( event->pos() ); - if ( canBeSelected( candidateIndex ) ) + if ( m_canBeSelected( candidateIndex ) ) QAbstractItemView::mousePressEvent( event ); else event->accept(); diff --git a/src/modules/partition/gui/PartitionLabelsView.h b/src/modules/partition/gui/PartitionLabelsView.h index fef453d44..d6c86a5dc 100644 --- a/src/modules/partition/gui/PartitionLabelsView.h +++ b/src/modules/partition/gui/PartitionLabelsView.h @@ -2,6 +2,7 @@ * * Copyright 2014, Aurélien Gâteau * Copyright 2015-2016, Teo Mrnjavac + * 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 @@ -36,7 +37,7 @@ class PartitionLabelsView : public QAbstractItemView Q_OBJECT public: explicit PartitionLabelsView( QWidget* parent = nullptr ); - virtual ~PartitionLabelsView(); + virtual ~PartitionLabelsView() override; QSize minimumSizeHint() const override; @@ -83,7 +84,7 @@ private: QModelIndexList getIndexesToDraw( const QModelIndex& parent ) const; QStringList buildTexts( const QModelIndex& index ) const; - SelectionFilter canBeSelected; + SelectionFilter m_canBeSelected; bool m_extendedPartitionHidden; QString m_customNewRootLabel; diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp index 1d807a939..62e7a97a1 100644 --- a/src/modules/partition/gui/PartitionPage.cpp +++ b/src/modules/partition/gui/PartitionPage.cpp @@ -25,6 +25,7 @@ #include "core/PartitionCoreModule.h" #include "core/PartitionInfo.h" #include "core/PartitionModel.h" +#include "core/PartUtils.h" #include "core/KPMHelpers.h" #include "gui/CreatePartitionDialog.h" #include "gui/EditExistingPartitionDialog.h" @@ -55,11 +56,11 @@ PartitionPage::PartitionPage( PartitionCoreModule* core, QWidget* parent ) : QWidget( parent ) , m_ui( new Ui_PartitionPage ) - , m_lastSelectedBootLoaderIndex(-1) , m_core( core ) + , m_lastSelectedBootLoaderIndex(-1) , m_isEfi( false ) { - m_isEfi = QDir( "/sys/firmware/efi/efivars" ).exists(); + m_isEfi = PartUtils::isEfiSystem(); m_ui->setupUi( this ); m_ui->partitionLabelsView->setVisible( @@ -372,7 +373,7 @@ PartitionPage::updateFromCurrentDevice() // Establish connection here because selection model is destroyed when // model changes connect( m_ui->partitionTreeView->selectionModel(), &QItemSelectionModel::currentChanged, - [ this ]( const QModelIndex& index, const QModelIndex& oldIndex ) + [ this ]( const QModelIndex&, const QModelIndex& ) { updateButtons(); } ); diff --git a/src/modules/partition/gui/PartitionSizeController.cpp b/src/modules/partition/gui/PartitionSizeController.cpp index d01924e8b..3bb9e758c 100644 --- a/src/modules/partition/gui/PartitionSizeController.cpp +++ b/src/modules/partition/gui/PartitionSizeController.cpp @@ -22,6 +22,8 @@ #include "core/ColorUtils.h" #include "core/KPMHelpers.h" +#include "utils/Units.h" + // Qt #include @@ -56,7 +58,7 @@ PartitionSizeController::setPartResizerWidget( PartResizerWidget* widget, bool f Q_ASSERT( m_device ); if ( m_partResizerWidget ) - disconnect( m_partResizerWidget, 0, this, 0 ); + disconnect( m_partResizerWidget, nullptr, this, nullptr ); m_dirty = false; m_currentSpinBoxValue = -1; @@ -106,7 +108,7 @@ void PartitionSizeController::setSpinBox( QSpinBox* spinBox ) { if ( m_spinBox ) - disconnect( m_spinBox, 0, this, 0 ); + disconnect( m_spinBox, nullptr, this, nullptr ); m_spinBox = spinBox; m_spinBox->setMaximum( std::numeric_limits< int >::max() ); connectWidgets(); @@ -185,7 +187,7 @@ PartitionSizeController::doUpdateSpinBox() { if ( !m_spinBox ) return; - qint64 mbSize = m_partition->length() * m_device->logicalSize() / 1024 / 1024; + int mbSize = CalamaresUtils::BytesToMiB( m_partition->length() * m_device->logicalSize() ); m_spinBox->setValue( mbSize ); if ( m_currentSpinBoxValue != -1 && //if it's not the first time we're setting it m_currentSpinBoxValue != mbSize ) //and the operation changes the SB value diff --git a/src/modules/partition/gui/PartitionSplitterWidget.cpp b/src/modules/partition/gui/PartitionSplitterWidget.cpp index a4aacbe9f..4b0776344 100644 --- a/src/modules/partition/gui/PartitionSplitterWidget.cpp +++ b/src/modules/partition/gui/PartitionSplitterWidget.cpp @@ -34,18 +34,18 @@ #include static const int VIEW_HEIGHT = qMax( CalamaresUtils::defaultFontHeight() + 8, // wins out with big fonts - (int)( CalamaresUtils::defaultFontHeight() * 0.6 ) + 22 ); // wins out with small fonts + int( CalamaresUtils::defaultFontHeight() * 0.6 ) + 22 ); // wins out with small fonts static const int CORNER_RADIUS = 3; static const int EXTENDED_PARTITION_MARGIN = qMax( 4, VIEW_HEIGHT / 6 ); PartitionSplitterWidget::PartitionSplitterWidget( QWidget* parent ) : QWidget( parent ) - , m_resizing( false ) , m_itemToResize( PartitionSplitterItem::null() ) , m_itemToResizeNext( PartitionSplitterItem::null() ) , m_itemMinSize( 0 ) , m_itemMaxSize( 0 ) , m_itemPrefSize( 0 ) + , m_resizing( false ) , m_resizeHandleX( 0 ) , HANDLE_SNAP( QApplication::startDragDistance() ) , m_drawNestedPartitions( false ) @@ -114,8 +114,7 @@ void PartitionSplitterWidget::setSplitPartition( const QString& path, qint64 minSize, qint64 maxSize, - qint64 preferredSize, - const QString& newLabel ) + qint64 preferredSize ) { cDebug() << Q_FUNC_INFO << "path:" << path << "\nminSize:" << minSize @@ -287,6 +286,8 @@ PartitionSplitterWidget::minimumSizeHint() const void PartitionSplitterWidget::paintEvent( QPaintEvent* event ) { + Q_UNUSED( event ); + QPainter painter( this ); painter.fillRect( rect(), palette().window() ); painter.setRenderHint( QPainter::Antialiasing ); @@ -400,6 +401,8 @@ PartitionSplitterWidget::mouseMoveEvent( QMouseEvent* event ) void PartitionSplitterWidget::mouseReleaseEvent( QMouseEvent* event ) { + Q_UNUSED( event ); + m_resizing = false; } @@ -491,7 +494,7 @@ PartitionSplitterWidget::drawResizeHandle( QPainter* painter, painter->setRenderHint( QPainter::Antialiasing, false ); painter->setPen( Qt::black ); - painter->drawLine( x, 0, x, h - 1 ); + painter->drawLine( x, 0, x, int(h) - 1 ); } @@ -511,20 +514,20 @@ PartitionSplitterWidget::drawPartitions( QPainter* painter, for ( int row = 0; row < count; ++row ) { const PartitionSplitterItem& item = items[ row ]; - int width; + qreal width; if ( row < count - 1 ) width = totalWidth * ( item.size / total ); else // Make sure we fill the last pixel column width = rect.right() - x + 1; - drawSection( painter, rect, x, width, item ); + drawSection( painter, rect, x, int(width), item ); if ( !item.children.isEmpty() ) { QRect subRect( x + EXTENDED_PARTITION_MARGIN, rect.y() + EXTENDED_PARTITION_MARGIN, - width - 2 * EXTENDED_PARTITION_MARGIN, + int(width) - 2 * EXTENDED_PARTITION_MARGIN, rect.height() - 2 * EXTENDED_PARTITION_MARGIN ); drawPartitions( painter, subRect, item.children ); @@ -600,7 +603,7 @@ PartitionSplitterWidget::computeItemsVector( const QVector< PartitionSplitterIte PartitionSplitterItem thisItem = originalItems[ row ]; QPair< QVector< PartitionSplitterItem >, qreal > pair = computeItemsVector( thisItem.children ); thisItem.children = pair.first; - thisItem.size = pair.second; + thisItem.size = qint64(pair.second); items += thisItem; total += thisItem.size; } @@ -614,7 +617,7 @@ PartitionSplitterWidget::computeItemsVector( const QVector< PartitionSplitterIte if ( items[ row ].size < 0.01 * total ) // If this item is smaller than 1% of everything, { // force its width to 1%. adjustedTotal -= items[ row ].size; - items[ row ].size = 0.01 * total; + items[ row ].size = qint64(0.01 * total); adjustedTotal += items[ row ].size; } } diff --git a/src/modules/partition/gui/PartitionSplitterWidget.h b/src/modules/partition/gui/PartitionSplitterWidget.h index 5065a94ca..0d2d0e233 100644 --- a/src/modules/partition/gui/PartitionSplitterWidget.h +++ b/src/modules/partition/gui/PartitionSplitterWidget.h @@ -40,9 +40,10 @@ struct PartitionSplitterItem qint64 size; Status status; - QVector< PartitionSplitterItem > children; + using ChildVector = QVector< PartitionSplitterItem >; + ChildVector children; - static PartitionSplitterItem null() { return { QString(), QColor(), false, 0, Normal }; } + static PartitionSplitterItem null() { return { QString(), QColor(), false, 0, Normal, ChildVector() }; } bool isNull() const { return itemPath.isEmpty() && size == 0 && status == Normal; } operator bool() const { return !isNull(); } @@ -59,8 +60,7 @@ public: void setSplitPartition( const QString& path, qint64 minSize, qint64 maxSize, - qint64 preferredSize, - const QString& newLabel ); + qint64 preferredSize ); qint64 splitPartitionSize() const; qint64 newPartitionSize() const; diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 44bed5e14..7f113ce88 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -156,20 +156,18 @@ PartitionViewStep::createSummaryWidget() const { case ChoicePage::Alongside: modeText = tr( "Install %1 alongside another operating system." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ); + .arg( *Calamares::Branding::ShortVersionedName ); break; case ChoicePage::Erase: modeText = tr( "Erase disk and install %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ); + .arg( *Calamares::Branding::ShortVersionedName ); break; case ChoicePage::Replace: modeText = tr( "Replace a partition with %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ); + .arg( *Calamares::Branding::ShortVersionedName ); break; - default: + case ChoicePage::NoChoice: + case ChoicePage::Manual: modeText = tr( "Manual partitioning." ); } modeLabel->setText( modeText ); @@ -184,26 +182,24 @@ PartitionViewStep::createSummaryWidget() const { case ChoicePage::Alongside: modeText = tr( "Install %1 alongside another operating system on disk %2 (%3)." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) + .arg( *Calamares::Branding::ShortVersionedName ) .arg( info.deviceNode ) .arg( info.deviceName ); break; case ChoicePage::Erase: modeText = tr( "Erase disk %2 (%3) and install %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) + .arg( *Calamares::Branding::ShortVersionedName ) .arg( info.deviceNode ) .arg( info.deviceName ); break; case ChoicePage::Replace: modeText = tr( "Replace a partition on disk %2 (%3) with %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) + .arg( *Calamares::Branding::ShortVersionedName ) .arg( info.deviceNode ) .arg( info.deviceName ); break; - default: + case ChoicePage::NoChoice: + case ChoicePage::Manual: modeText = tr( "Manual partitioning on disk %1 (%2)." ) .arg( info.deviceNode ) .arg( info.deviceName ); @@ -250,8 +246,7 @@ PartitionViewStep::createSummaryWidget() const previewLabels->setModel( info.partitionModelAfter ); preview->setSelectionMode( QAbstractItemView::NoSelection ); previewLabels->setSelectionMode( QAbstractItemView::NoSelection ); - previewLabels->setCustomNewRootLabel( Calamares::Branding::instance()-> - string( Calamares::Branding::BootloaderEntryName ) ); + previewLabels->setCustomNewRootLabel( *Calamares::Branding::BootloaderEntryName ); info.partitionModelAfter->setParent( widget ); field = new QVBoxLayout; CalamaresUtils::unmarginLayout( field ); @@ -271,7 +266,6 @@ PartitionViewStep::createSummaryWidget() const QLabel* jobsLabel = new QLabel( widget ); mainLayout->addWidget( jobsLabel ); jobsLabel->setText( jobsLines.join( "
" ) ); - int m = CalamaresUtils::defaultFontHeight() / 2; jobsLabel->setMargin( CalamaresUtils::defaultFontHeight() / 2 ); QPalette pal; pal.setColor( QPalette::Background, pal.background().color().lighter( 108 ) ); @@ -392,7 +386,7 @@ PartitionViewStep::onLeave() if ( m_widget->currentWidget() == m_manualPartitionPage ) { - if ( QDir( "/sys/firmware/efi/efivars" ).exists() ) + if ( PartUtils::isEfiSystem() ) { QString espMountPoint = Calamares::JobQueue::instance()->globalStorage()-> value( "efiSystemPartition").toString(); @@ -411,8 +405,7 @@ PartitionViewStep::onLeave() "%2.

" "You can continue without setting up an EFI system " "partition but your system may fail to start." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortProductName ) ) + .arg( *Calamares::Branding::ShortProductName ) .arg( espMountPoint ); } else if ( esp && !esp->activeFlags().testFlag( PartitionTable::FlagEsp ) ) @@ -427,8 +420,7 @@ PartitionViewStep::onLeave() "

" "You can continue without setting the flag but your " "system may fail to start." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortProductName ) ) + .arg( *Calamares::Branding::ShortProductName ) .arg( espMountPoint ); } diff --git a/src/modules/partition/gui/PartitionViewStep.h b/src/modules/partition/gui/PartitionViewStep.h index 7f31a3d1b..1aa8190f9 100644 --- a/src/modules/partition/gui/PartitionViewStep.h +++ b/src/modules/partition/gui/PartitionViewStep.h @@ -2,6 +2,7 @@ * * Copyright 2014, Aurélien Gâteau * Copyright 2014-2016, Teo Mrnjavac + * 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 @@ -41,8 +42,8 @@ class PLUGINDLLEXPORT PartitionViewStep : public Calamares::ViewStep Q_OBJECT public: - explicit PartitionViewStep( QObject* parent = 0 ); - virtual ~PartitionViewStep(); + explicit PartitionViewStep( QObject* parent = nullptr ); + virtual ~PartitionViewStep() override; QString prettyName() const override; QWidget* createSummaryWidget() const override; diff --git a/src/modules/partition/gui/ReplaceWidget.cpp b/src/modules/partition/gui/ReplaceWidget.cpp index 5a0a1837d..f5a492809 100644 --- a/src/modules/partition/gui/ReplaceWidget.cpp +++ b/src/modules/partition/gui/ReplaceWidget.cpp @@ -134,8 +134,7 @@ ReplaceWidget::onPartitionSelected() tr( "Select where to install %1.
" "Warning: this will delete all files " "on the selected partition." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::VersionedName ) ) ); + .arg( *Calamares::Branding::VersionedName ) ); setNextEnabled( false ); return; } @@ -168,8 +167,7 @@ ReplaceWidget::onPartitionSelected() updateStatus( CalamaresUtils::Fail, tr( "%1 cannot be installed on empty space. Please select an " "existing partition." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::VersionedName ) ) ); + .arg( *Calamares::Branding::VersionedName ) ); setNextEnabled( false ); return; } @@ -179,8 +177,7 @@ ReplaceWidget::onPartitionSelected() updateStatus( CalamaresUtils::Fail, tr( "%1 cannot be installed on an extended partition. Please select an " "existing primary or logical partition." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::VersionedName ) ) ); + .arg( *Calamares::Branding::VersionedName ) ); setNextEnabled( false ); return; } @@ -189,8 +186,7 @@ ReplaceWidget::onPartitionSelected() { updateStatus( CalamaresUtils::Fail, tr( "%1 cannot be installed on this partition." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::VersionedName ) ) ); + .arg( *Calamares::Branding::VersionedName ) ); setNextEnabled( false ); return; } @@ -232,8 +228,7 @@ ReplaceWidget::onPartitionSelected() "The partition %1 is too small for %2. Please select a partition " "with capacity at least %3 GiB." ) .arg( partition->partitionPath() ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::VersionedName ) ) + .arg( *Calamares::Branding::VersionedName ) .arg( requiredSpaceB / ( 1024. * 1024. * 1024. ), 0, 'f', 1 ) .arg( prettyName ) ); @@ -256,8 +251,7 @@ ReplaceWidget::onPartitionSelected() "An EFI system partition cannot be found anywhere " "on this system. Please go back and use manual " "partitioning to set up %1." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortProductName ) ) + .arg( *Calamares::Branding::ShortProductName ) .arg( prettyName ) ); setNextEnabled( false ); } @@ -268,16 +262,14 @@ ReplaceWidget::onPartitionSelected() "%1 will be installed on %2.
" "Warning: all data on partition " "%2 will be lost.") - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::VersionedName ) ) + .arg( *Calamares::Branding::VersionedName ) .arg( partition->partitionPath() ) .arg( prettyName ) ); m_ui->bootStatusLabel->show(); m_ui->bootStatusLabel->setText( tr( "The EFI system partition at %1 will be used for starting %2." ) .arg( efiSystemPartitions.first()->partitionPath() ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortProductName ) ) ); + .arg( *Calamares::Branding::ShortProductName ) ); setNextEnabled( true ); } else @@ -287,8 +279,7 @@ ReplaceWidget::onPartitionSelected() "%1 will be installed on %2.
" "Warning: all data on partition " "%2 will be lost.") - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::VersionedName ) ) + .arg( *Calamares::Branding::VersionedName ) .arg( partition->partitionPath() ) .arg( prettyName ) ); m_ui->bootStatusLabel->show(); @@ -312,8 +303,7 @@ ReplaceWidget::onPartitionSelected() "%1 will be installed on %2.
" "Warning: all data on partition " "%2 will be lost.") - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::VersionedName ) ) + .arg( *Calamares::Branding::VersionedName ) .arg( partition->partitionPath() ) .arg( prettyName ) ); setNextEnabled( true ); @@ -357,7 +347,7 @@ ReplaceWidget::updateFromCurrentDevice( QComboBox* devicesComboBox ) QAbstractItemModel* oldModel = m_ui->partitionTreeView->model(); if ( oldModel ) - disconnect( oldModel, 0, this, 0 ); + disconnect( oldModel, nullptr, this, nullptr ); PartitionModel* model = m_core->partitionModelForDevice( device ); m_ui->partitionTreeView->setModel( model ); diff --git a/src/modules/partition/gui/ScanningDialog.cpp b/src/modules/partition/gui/ScanningDialog.cpp index 76a1bc55f..85c0cb734 100644 --- a/src/modules/partition/gui/ScanningDialog.cpp +++ b/src/modules/partition/gui/ScanningDialog.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2015, Teo Mrnjavac + * 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 @@ -18,7 +19,7 @@ #include "ScanningDialog.h" -#include "widgets/QtWaitingSpinner.h" +#include "widgets/waitingspinnerwidget.h" #include #include @@ -37,7 +38,7 @@ ScanningDialog::ScanningDialog( const QString& text, QHBoxLayout* dialogLayout = new QHBoxLayout; setLayout( dialogLayout ); - QtWaitingSpinner* spinner = new QtWaitingSpinner; + WaitingSpinnerWidget* spinner = new WaitingSpinnerWidget(); dialogLayout->addWidget( spinner ); spinner->start(); 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/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp index 9fc1b86a2..aab032a87 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionJob.cpp @@ -2,6 +2,7 @@ * * Copyright 2014, Aurélien Gâteau * Copyright 2015, Teo Mrnjavac + * 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 @@ -20,6 +21,7 @@ #include "jobs/CreatePartitionJob.h" #include "utils/Logger.h" +#include "utils/Units.h" // KPMcore #include @@ -47,7 +49,7 @@ CreatePartitionJob::prettyName() const { return tr( "Create new %2MB partition on %4 (%3) with file system %1." ) .arg( m_partition->fileSystem().name() ) - .arg( m_partition->capacity() / 1024 / 1024 ) + .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) .arg( m_device->name() ) .arg( m_device->deviceNode() ); } @@ -59,7 +61,7 @@ CreatePartitionJob::prettyDescription() const return tr( "Create new %2MB partition on %4 " "(%3) with file system %1." ) .arg( m_partition->fileSystem().name() ) - .arg( m_partition->capacity() / 1024 / 1024 ) + .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) .arg( m_device->name() ) .arg( m_device->deviceNode() ); } @@ -79,7 +81,7 @@ CreatePartitionJob::exec() int step = 0; const qreal stepCount = 4; - Report report( 0 ); + Report report( nullptr ); QString message = tr( "The installer failed to create partition on disk '%1'." ).arg( m_device->name() ); progress( step++ / stepCount ); diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp index 5a0c4cd66..e4430134f 100644 --- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp @@ -2,6 +2,7 @@ * * Copyright 2014, Aurélien Gâteau * Copyright 2015, Teo Mrnjavac + * 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 @@ -72,7 +73,7 @@ CreatePartitionTableJob::prettyStatusMessage() const Calamares::JobResult CreatePartitionTableJob::exec() { - Report report( 0 ); + Report report( nullptr ); QString message = tr( "The installer failed to create a partition table on %1." ).arg( m_device->name() ); CoreBackend* backend = CoreBackendManager::self()->backend(); diff --git a/src/modules/partition/jobs/DeletePartitionJob.cpp b/src/modules/partition/jobs/DeletePartitionJob.cpp index 0aafc542e..bceffd133 100644 --- a/src/modules/partition/jobs/DeletePartitionJob.cpp +++ b/src/modules/partition/jobs/DeletePartitionJob.cpp @@ -2,6 +2,7 @@ * * Copyright 2014, Aurélien Gâteau * Copyright 2015, Teo Mrnjavac + * 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 @@ -63,7 +64,7 @@ DeletePartitionJob::prettyStatusMessage() const Calamares::JobResult DeletePartitionJob::exec() { - Report report( 0 ); + Report report( nullptr ); QString message = tr( "The installer failed to delete partition %1." ).arg( m_partition->devicePath() ); if ( m_device->deviceNode() != m_partition->devicePath() ) diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp index db59528a4..443eb8b9e 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp +++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp @@ -2,6 +2,7 @@ * * Copyright 2014, Aurélien Gâteau * Copyright 2015-2016, Teo Mrnjavac + * 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 @@ -41,8 +42,6 @@ typedef QHash UuidForPartitionHash; -static const char* UUID_DIR = "/dev/disk/by-uuid"; - static UuidForPartitionHash findPartitionUuids( QList < Device* > devices ) { @@ -78,6 +77,50 @@ getLuksUuid( const QString& path ) return uuid; } +// TODO: this will be available from KPMCore soon +static const char* filesystem_labels[] = { + "unknown", + "extended", + + "ext2", + "ext3", + "ext4", + "linuxswap", + "fat16", + "fat32", + "ntfs", + "reiser", + "reiser4", + "xfs", + "jfs", + "hfs", + "hfsplus", + "ufs", + "unformatted", + "btrfs", + "hpfs", + "luks", + "ocfs2", + "zfs", + "exfat", + "nilfs2", + "lvm2 pv", + "f2fs", + "udf", + "iso9660", +}; + +Q_STATIC_ASSERT_X((sizeof(filesystem_labels) / sizeof(char *)) >= FileSystem::__lastType, "Mismatch in filesystem labels"); + +static QString +untranslatedTypeName(FileSystem::Type t) +{ + + Q_ASSERT( t >= 0 ); + Q_ASSERT( t <= FileSystem::__lastType ); + + return QLatin1String(filesystem_labels[t]); +} static QVariant mapForPartition( Partition* partition, const QString& uuid ) @@ -85,14 +128,15 @@ mapForPartition( Partition* partition, const QString& uuid ) QVariantMap map; map[ "device" ] = partition->partitionPath(); map[ "mountPoint" ] = PartitionInfo::mountPoint( partition ); - map[ "fs" ] = partition->fileSystem().name(); + map[ "fsName" ] = partition->fileSystem().name(); + map[ "fs" ] = untranslatedTypeName( partition->fileSystem().type() ); if ( partition->fileSystem().type() == FileSystem::Luks && dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() ) map[ "fs" ] = dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS()->name(); map[ "uuid" ] = uuid; cDebug() << partition->partitionPath() << "mtpoint:" << PartitionInfo::mountPoint( partition ) - << "fs:" << map[ "fs" ] + << "fs:" << map[ "fs" ] << '(' << map[ "fsName" ] << ')' << uuid; if ( partition->roles().has( PartitionRole::Luks ) ) @@ -145,8 +189,7 @@ FillGlobalStorageJob::prettyDescription() const { if ( mountPoint == "/" ) lines.append( tr( "Install %1 on new %2 system partition." ) - .arg( Calamares::Branding::instance()->string( - Calamares::Branding::ShortProductName ) ) + .arg( *Calamares::Branding::ShortProductName ) .arg( fsType ) ); else lines.append( tr( "Set up new %2 partition with mount point " @@ -159,8 +202,7 @@ FillGlobalStorageJob::prettyDescription() const if ( mountPoint == "/" ) lines.append( tr( "Install %2 on %3 system partition %1." ) .arg( path ) - .arg( Calamares::Branding::instance()->string( - Calamares::Branding::ShortProductName ) ) + .arg( *Calamares::Branding::ShortProductName ) .arg( fsType ) ); else lines.append( tr( "Set up %3 partition %1 with mount point " diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp index 0ea9192db..162839ce7 100644 --- a/src/modules/partition/jobs/FormatPartitionJob.cpp +++ b/src/modules/partition/jobs/FormatPartitionJob.cpp @@ -78,7 +78,7 @@ FormatPartitionJob::prettyStatusMessage() const Calamares::JobResult FormatPartitionJob::exec() { - Report report( 0 ); + Report report( nullptr ); // Root of the report tree, no parent QString partitionPath = m_partition->partitionPath(); QString message = tr( "The installer failed to format partition %1 on disk '%2'." ).arg( partitionPath, m_device->name() ); diff --git a/src/modules/partition/jobs/MoveFileSystemJob.cpp b/src/modules/partition/jobs/MoveFileSystemJob.cpp index 9a87db91e..fbcc4641c 100644 --- a/src/modules/partition/jobs/MoveFileSystemJob.cpp +++ b/src/modules/partition/jobs/MoveFileSystemJob.cpp @@ -145,8 +145,12 @@ MoveFileSystemJob::copyBlocks( Report& report, CopyTargetDevice& target, CopySou qint64 blocksCopied = 0; - void* buffer = malloc( blockSize * source.sectorSize() ); - int percent = 0; + Q_ASSERT( blockSize > 0 ); + Q_ASSERT( source.sectorSize() > 0 ); + Q_ASSERT( blockSize * source.sectorSize() > 0 ); + + void* buffer = malloc( size_t( blockSize * source.sectorSize() ) ); + qint64 percent = 0; while ( blocksCopied < blocksToCopy ) { @@ -161,7 +165,7 @@ MoveFileSystemJob::copyBlocks( Report& report, CopyTargetDevice& target, CopySou if ( ++blocksCopied * 100 / blocksToCopy != percent ) { percent = blocksCopied * 100 / blocksToCopy; - progress( qreal( percent ) / 100. ); + progress( percent / 100. ); } } 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/partition/partition.conf b/src/modules/partition/partition.conf index 88d7fee98..610fb7b42 100644 --- a/src/modules/partition/partition.conf +++ b/src/modules/partition/partition.conf @@ -4,7 +4,14 @@ efiSystemPartition: "/boot/efi" # Make sure an autogenerated swap partition is big enough for hibernation in -# automated partitioning modes. +# automated partitioning modes. Swap can be disabled through *neverCreateSwap*. +# +# When *ensureSuspendToDisk* is true, swap is never smaller than physical +# memory, follows the guideline 2 * memory until swap reaches 8GiB. +# When *ensureSuspendToDisk* is false, swap size scales up with memory +# size until 8GiB, then at roughly half of memory size. +# +# # Default is true. ensureSuspendToDisk: true @@ -31,6 +38,7 @@ defaultFileSystemType: "ext4" # and/or your distribution's initramfs solution. # # BIG FAT WARNING: +# # This option is unsupported, as it cuts out a crucial security feature. # Disabling LUKS and shipping Calamares without a correctly configured GRUB2 # and initramfs is considered suboptimal use of the Calamares software. The diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt index c91222222..1917a226b 100644 --- a/src/modules/partition/tests/CMakeLists.txt +++ b/src/modules/partition/tests/CMakeLists.txt @@ -1,4 +1,6 @@ -find_package( Qt5 COMPONENTS Test REQUIRED ) +find_package( Qt5 COMPONENTS Gui Test REQUIRED ) +find_package( KF5 COMPONENTS Service REQUIRED ) + include( ECMAddTests ) set( PartitionModule_SOURCE_DIR .. ) @@ -18,17 +20,20 @@ set( partitionjobtests_SRCS ) include_directories( + ${Qt5Gui_INCLUDE_DIRS} ${PartitionModule_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ) ecm_add_test( ${partitionjobtests_SRCS} TEST_NAME partitionjobtests LINK_LIBRARIES - calapm ${CALAMARES_LIBRARIES} + kpmcore Qt5::Core Qt5::Test + KF5::Service ) set_target_properties( partitionjobtests PROPERTIES AUTOMOC TRUE ) diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp index bada4aa9a..8702e0119 100644 --- a/src/modules/partition/tests/PartitionJobTests.cpp +++ b/src/modules/partition/tests/PartitionJobTests.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Aurélien Gâteau + * 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 @@ -18,13 +19,14 @@ #include +#include "utils/Units.h" + #include #include #include #include // CalaPM -#include #include #include #include @@ -36,9 +38,8 @@ QTEST_GUILESS_MAIN( PartitionJobTests ) -static const qint64 MB = 1024 * 1024; - using namespace Calamares; +using CalamaresUtils::operator""_MiB; class PartitionMounter { @@ -79,7 +80,7 @@ generateTestData( qint64 size ) // Fill the array explicitly to keep Valgrind happy for ( auto it = ba.data() ; it < ba.data() + size ; ++it ) { - *it = rand() % 256; + *it = char( rand() & 0xff ); } return ba; } @@ -121,6 +122,8 @@ firstFreePartition( PartitionNode* parent ) //- QueueRunner --------------------------------------------------------------- QueueRunner::QueueRunner( JobQueue* queue ) : m_queue( queue ) + , m_finished( false ) // Same initalizations as in ::run() + , m_success( true ) { connect( m_queue, &JobQueue::finished, this, &QueueRunner::onFinished ); connect( m_queue, &JobQueue::failed, this, &QueueRunner::onFailed ); @@ -166,7 +169,7 @@ PartitionJobTests::initTestCase() QSKIP( "Skipping test, CALAMARES_TEST_DISK is not set. It should point to a disk which can be safely formatted" ); } - QVERIFY( CalaPM::init() ); + QVERIFY( KPMHelpers::initKPMcore() ); FileSystemFactory::init(); refreshDevice(); @@ -212,10 +215,14 @@ PartitionJobTests::newCreatePartitionJob( Partition* freeSpacePartition, Partiti qint64 lastSector; if ( size > 0 ) - lastSector = firstSector + size / m_device->logicalSectorSize(); + lastSector = firstSector + size / m_device->logicalSize(); else lastSector = freeSpacePartition->lastSector(); - FileSystem* fs = FileSystemFactory::create( type, firstSector, lastSector ); + FileSystem* fs = FileSystemFactory::create( type, firstSector, lastSector +#ifdef WITH_KPMCORE22 + ,m_device->logicalSize() +#endif + ); Partition* partition = new Partition( freeSpacePartition->parent(), @@ -241,7 +248,7 @@ PartitionJobTests::testCreatePartition() freePartition = firstFreePartition( m_device->partitionTable() ); QVERIFY( freePartition ); - job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::Ext4, 1 * MB); + job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::Ext4, 1_MiB); Partition* partition1 = job->partition(); QVERIFY( partition1 ); job->updatePreview(); @@ -249,7 +256,7 @@ PartitionJobTests::testCreatePartition() freePartition = firstFreePartition( m_device->partitionTable() ); QVERIFY( freePartition ); - job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::LinuxSwap, 1 * MB); + job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::LinuxSwap, 1_MiB); Partition* partition2 = job->partition(); QVERIFY( partition2 ); job->updatePreview(); @@ -257,7 +264,7 @@ PartitionJobTests::testCreatePartition() freePartition = firstFreePartition( m_device->partitionTable() ); QVERIFY( freePartition ); - job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::Fat32, 1 * MB); + job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::Fat32, 1_MiB); Partition* partition3 = job->partition(); QVERIFY( partition3 ); job->updatePreview(); @@ -282,7 +289,7 @@ PartitionJobTests::testCreatePartitionExtended() freePartition = firstFreePartition( m_device->partitionTable() ); QVERIFY( freePartition ); - job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::Ext4, 10 * MB); + job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Primary ), FileSystem::Ext4, 10_MiB); Partition* partition1 = job->partition(); QVERIFY( partition1 ); job->updatePreview(); @@ -290,7 +297,7 @@ PartitionJobTests::testCreatePartitionExtended() freePartition = firstFreePartition( m_device->partitionTable() ); QVERIFY( freePartition ); - job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Extended ), FileSystem::Extended, 10 * MB); + job = newCreatePartitionJob( freePartition, PartitionRole( PartitionRole::Extended ), FileSystem::Extended, 10_MiB); job->updatePreview(); m_queue.enqueue( job_ptr( job ) ); Partition* extendedPartition = job->partition(); @@ -335,7 +342,7 @@ PartitionJobTests::testResizePartition() QFETCH( int, newStartMB ); QFETCH( int, newSizeMB ); - const qint64 sectorForMB = MB / m_device->logicalSectorSize(); + const qint64 sectorForMB = 1_MiB / m_device->logicalSize(); qint64 oldFirst = sectorForMB * oldStartMB; qint64 oldLast = oldFirst + sectorForMB * oldSizeMB - 1; @@ -344,7 +351,7 @@ PartitionJobTests::testResizePartition() // Make the test data file smaller than the full size of the partition to // accomodate for the file system overhead - const QByteArray testData = generateTestData( ( qMin( oldSizeMB, newSizeMB ) ) * MB * 3 / 4 ); + const QByteArray testData = generateTestData( CalamaresUtils::MiBtoBytes( qMin( oldSizeMB, newSizeMB ) ) * 3 / 4 ); const QString testName = "test.data"; // Setup: create the test partition diff --git a/src/modules/removeuser/main.py b/src/modules/removeuser/main.py index 45ccac6a1..795f403fe 100644 --- a/src/modules/removeuser/main.py +++ b/src/modules/removeuser/main.py @@ -33,7 +33,7 @@ def run(): libcalamares.utils.check_target_env_call(["userdel", "-f", "-r", username]) except subprocess.CalledProcessError as e: - libcalamares.utils.debug("Cannot remove user.", - "'userdel' terminated with exit code", + libcalamares.utils.debug("Cannot remove user. " + "'userdel' terminated with exit code " "{}.".format(e.returncode)) return None diff --git a/src/modules/summary/SummaryPage.cpp b/src/modules/summary/SummaryPage.cpp index 351ef49a4..bc0864775 100644 --- a/src/modules/summary/SummaryPage.cpp +++ b/src/modules/summary/SummaryPage.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -23,6 +24,7 @@ #include "ExecutionViewStep.h" #include "utils/Retranslator.h" #include "utils/CalamaresUtilsGui.h" +#include "utils/Logger.h" #include "ViewManager.h" #include @@ -34,9 +36,10 @@ static const int SECTION_SPACING = 12; SummaryPage::SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent ) : QWidget() , m_thisViewStep( thisViewStep ) - , m_scrollArea( new QScrollArea( this ) ) , m_contentWidget( nullptr ) + , m_scrollArea( new QScrollArea( this ) ) { + Q_UNUSED( parent ); Q_ASSERT( m_thisViewStep ); QVBoxLayout* layout = new QVBoxLayout( this ); layout->setContentsMargins( 0, 0, 0, 0 ); @@ -56,12 +59,13 @@ 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() { createContentWidget(); - QString text; bool first = true; const Calamares::ViewStepList steps = stepsForSummary( Calamares::ViewManager::instance()->viewSteps() ); @@ -94,8 +98,21 @@ SummaryPage::onActivate() itemBodyLayout->addSpacing( CalamaresUtils::defaultFontHeight() * 2 ); } m_layout->addStretch(); -} + m_scrollArea->setWidget( m_contentWidget ); + + auto summarySize = m_contentWidget->sizeHint(); + if ( summarySize.height() > m_scrollArea->size().height() ) + { + auto enlarge = 2 + summarySize.height() - m_scrollArea->size().height(); + auto widgetSize = this->size(); + widgetSize.setHeight( widgetSize.height() + enlarge ); + + cDebug() << "Summary widget is larger than viewport, enlarge by" << enlarge << "to" << widgetSize; + + emit m_thisViewStep->enlarge( QSize( 0, enlarge ) ); // Only expand height + } +} Calamares::ViewStepList SummaryPage::stepsForSummary( const Calamares::ViewStepList& allSteps ) const @@ -132,7 +149,6 @@ SummaryPage::createContentWidget() m_contentWidget = new QWidget; m_layout = new QVBoxLayout( m_contentWidget ); CalamaresUtils::unmarginLayout( m_layout ); - m_scrollArea->setWidget( m_contentWidget ); } QLabel* 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/SummaryViewStep.h b/src/modules/summary/SummaryViewStep.h index b7197b71b..e1a8df89b 100644 --- a/src/modules/summary/SummaryViewStep.h +++ b/src/modules/summary/SummaryViewStep.h @@ -34,7 +34,7 @@ class PLUGINDLLEXPORT SummaryViewStep : public Calamares::ViewStep public: explicit SummaryViewStep( QObject* parent = nullptr ); - virtual ~SummaryViewStep(); + virtual ~SummaryViewStep() override; QString prettyName() const override; diff --git a/src/modules/summary/module.desc b/src/modules/summary/module.desc deleted file mode 100644 index fcd8c6f86..000000000 --- a/src/modules/summary/module.desc +++ /dev/null @@ -1,7 +0,0 @@ -# Module metadata file for keyboard viewmodule -# Syntax is YAML 1.2 ---- -type: "view" -name: "summary" -interface: "qtplugin" -load: "libcalamares_viewmodule_summary.so" diff --git a/src/modules/testmodule.py b/src/modules/testmodule.py index 907e704b4..d115694eb 100755 --- a/src/modules/testmodule.py +++ b/src/modules/testmodule.py @@ -4,6 +4,7 @@ # === This file is part of Calamares - === # # Copyright 2014, Teo Mrnjavac +# 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 @@ -67,8 +68,10 @@ def main(): help="Dir containing the Python module.") parser.add_argument("globalstorage_yaml", nargs="?", help="A yaml file to initialize GlobalStorage.") - help_desc = "A yaml file to initialize the configuration dict." - parser.add_argument("configuration_yaml", nargs="?", help=help_desc) + parser.add_argument("configuration_yaml", nargs="?", + help="A yaml file to initialize the Job.") + parser.add_argument("--lang", "-l", nargs="?", default=None, + help="Set translation language.") args = parser.parse_args() print("Testing module in: " + args.moduledir) @@ -81,7 +84,12 @@ def main(): print("Only Python jobs can be tested.") return 1 - libcalamares.globalstorage = libcalamares.GlobalStorage() + # Parameter None creates a new, empty GlobalStorage + libcalamares.globalstorage = libcalamares.GlobalStorage(None) + libcalamares.globalstorage.insert("testing", True) + if args.lang: + libcalamares.globalstorage.insert("locale", args.lang) + libcalamares.globalstorage.insert("localeConf", {"LANG": args.lang}) # if a file for simulating globalStorage contents is provided, load it if args.globalstorage_yaml: diff --git a/src/modules/unpackfs/main.py b/src/modules/unpackfs/main.py index c0970ddfe..9eaa5c622 100644 --- a/src/modules/unpackfs/main.py +++ b/src/modules/unpackfs/main.py @@ -263,22 +263,7 @@ class UnpackOperation: def run(): """ - Unsquashes filesystem from given image file. - - from globalstorage: rootMountPoint - from job.configuration: the path to where to mount the source image(s) for - copying an ordered list of unpack mappings for image file <-> target dir - relative to rootMountPoint, e.g.: - configuration: - unpack: - - source: "/path/to/filesystem.img" - sourcefs: "ext4" - destination: "" - - source: "/path/to/another/filesystem.sqfs" - sourcefs: "squashfs" - destination: "" - - :return: + Unsquash filesystem. """ PATH_PROCFS = '/proc/filesystems' 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/unpackfs/unpackfs.conf b/src/modules/unpackfs/unpackfs.conf index 68de113b5..9720f19a1 100644 --- a/src/modules/unpackfs/unpackfs.conf +++ b/src/modules/unpackfs/unpackfs.conf @@ -1,8 +1,38 @@ +# Unsquash / unpack a filesystem. Multiple sources are supported, and +# they may be squashed or plain filesystems. +# +# Configuration: +# +# from globalstorage: rootMountPoint +# from job.configuration: the path to where to mount the source image(s) +# for copying an ordered list of unpack mappings for image file <-> +# target dir relative to rootMountPoint. + --- unpack: - - source: "/path/to/filesystem.img" - sourcefs: "ext4" - destination: "" - - source: "/path/to/another/filesystem.sqfs" - sourcefs: "squashfs" +# Each list item is unpacked, in order, to the target system. +# Each list item has the following attributes: +# source: path relative to the live / intstalling system to the image +# sourcefs: ext4 or squashfs (may be others if mount supports it) +# destination: path relative to rootMountPoint (so in the target +# system) where this filesystem is unpacked. + +# Usually you list a filesystem image to unpack; you can use +# squashfs or an ext4 image. +# +# - source: "/path/to/filesystem.sqfs" +# sourcefs: "squashfs" +# destination: "" + +# You can list more than one filesystem. +# +# - source: "/path/to/another/filesystem.img" +# sourcefs: "ext4" +# destination: "" +# + +# You can list filesystem source paths relative to the Calamares run +# directory, if you use -d (this is only useful for testing, though). + - source: ./example.sqfs + sourcefs: squashfs destination: "" diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt index b48390ee6..074118d54 100644 --- a/src/modules/users/CMakeLists.txt +++ b/src/modules/users/CMakeLists.txt @@ -1,7 +1,13 @@ -include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) +find_package(ECM 5.10.0 NO_MODULE) +if( ECM_FOUND ) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) + include( ECMAddTests ) +endif() -list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" ) -find_package( Crypt ) +find_package( Qt5 COMPONENTS Core Test REQUIRED ) +find_package( Crypt REQUIRED ) + +include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) calamares_add_plugin( users TYPE viewmodule @@ -21,3 +27,18 @@ calamares_add_plugin( users ${CRYPT_LIBRARIES} SHARED_LIB ) + +if( ECM_FOUND ) + ecm_add_test( + PasswordTests.cpp + SetPasswordJob.cpp + TEST_NAME + passwordtest + LINK_LIBRARIES + ${CALAMARES_LIBRARIES} + Qt5::Core + Qt5::Test + ${CRYPT_LIBRARIES} + ) + set_target_properties( passwordtest PROPERTIES AUTOMOC TRUE ) +endif() diff --git a/src/modules/users/CMakeModules/FindCrypt.cmake b/src/modules/users/CMakeModules/FindCrypt.cmake deleted file mode 100644 index 293228e6f..000000000 --- a/src/modules/users/CMakeModules/FindCrypt.cmake +++ /dev/null @@ -1,23 +0,0 @@ -# - Find libcrypt -# Find the libcrypt includes and the libcrypt libraries -# This module defines -# LIBCRYPT_INCLUDE_DIR, root crypt include dir. Include crypt with crypt.h -# LIBCRYPT_LIBRARY, the path to libcrypt -# LIBCRYPT_FOUND, whether libcrypt was found - - -find_path( CRYPT_INCLUDE_DIR NAMES crypt.h - HINTS - ${CMAKE_INSTALL_INCLUDEDIR} -) - -find_library( CRYPT_LIBRARIES NAMES crypt - HINTS - ${CMAKE_INSTALL_LIBDIR} -) - -include( FindPackageHandleStandardArgs ) -find_package_handle_standard_args( Crypt - REQUIRED_VARS CRYPT_LIBRARIES CRYPT_INCLUDE_DIR ) - -mark_as_advanced( CRYPT_INCLUDE_DIR CRYPT_LIBRARIES ) diff --git a/src/modules/users/CreateUserJob.cpp b/src/modules/users/CreateUserJob.cpp index c666bd9ad..5f6843db5 100644 --- a/src/modules/users/CreateUserJob.cpp +++ b/src/modules/users/CreateUserJob.cpp @@ -115,13 +115,12 @@ CreateUserJob::exec() { QString autologinGroup; if ( gs->contains( "autologinGroup" ) && - !gs->value( "autologinGroup" ).toString().isEmpty() ) + !gs->value( "autologinGroup" ).toString().isEmpty() ) + { autologinGroup = gs->value( "autologinGroup" ).toString(); - else - autologinGroup = QStringLiteral( "autologin" ); - - CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", autologinGroup } ); - defaultGroups.append( QString( ",%1" ).arg( autologinGroup ) ); + CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", autologinGroup } ); + defaultGroups.append( QString( ",%1" ).arg( autologinGroup ) ); + } } // If we're looking to reuse the contents of an existing /home diff --git a/src/modules/users/PasswordTests.cpp b/src/modules/users/PasswordTests.cpp new file mode 100644 index 000000000..cb52e7ef7 --- /dev/null +++ b/src/modules/users/PasswordTests.cpp @@ -0,0 +1,54 @@ +/* === This file is part of Calamares - === + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Calamares is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + */ + +#include "SetPasswordJob.h" + +#include "PasswordTests.h" + +#include + +QTEST_GUILESS_MAIN( PasswordTests ) + +PasswordTests::PasswordTests() +{ +} + +PasswordTests::~PasswordTests() +{ +} + +void +PasswordTests::initTestCase() +{ +} + +void +PasswordTests::testSalt() +{ + QString s = SetPasswordJob::make_salt( 8 ); + QCOMPARE( s.length(), 4 + 8 ); // 8 salt chars, plus $6$, plus trailing $ + QVERIFY( s.startsWith( "$6$" ) ); + QVERIFY( s.endsWith( '$' ) ); + qDebug() << "Obtained salt" << s; + + s = SetPasswordJob::make_salt( 11 ); + QCOMPARE( s.length(), 4 + 11 ); + QVERIFY( s.startsWith( "$6$" ) ); + QVERIFY( s.endsWith( '$' ) ); + qDebug() << "Obtained salt" << s; +} diff --git a/src/modules/users/PasswordTests.h b/src/modules/users/PasswordTests.h new file mode 100644 index 000000000..5b51fd11f --- /dev/null +++ b/src/modules/users/PasswordTests.h @@ -0,0 +1,36 @@ +/* === This file is part of Calamares - === + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Calamares is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + */ + +#ifndef PASSWORDTESTS_H +#define PASSWORDTESTS_H + +#include + +class PasswordTests : public QObject +{ + Q_OBJECT +public: + PasswordTests(); + ~PasswordTests() override; + +private Q_SLOTS: + void initTestCase(); + void testSalt(); +}; + +#endif diff --git a/src/modules/users/SetPasswordJob.cpp b/src/modules/users/SetPasswordJob.cpp index 79b3eeb26..d917e6d5f 100644 --- a/src/modules/users/SetPasswordJob.cpp +++ b/src/modules/users/SetPasswordJob.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2017, Teo Mrnjavac + * 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 @@ -25,7 +26,12 @@ #include +#include + +#ifndef NO_CRYPT_H #include +#endif +#include SetPasswordJob::SetPasswordJob( const QString& userName, const QString& newPassword ) @@ -50,6 +56,53 @@ SetPasswordJob::prettyStatusMessage() const } +/// Returns a modular hashing salt for method 6 (SHA512) with a 16 character random salt. +QString +SetPasswordJob::make_salt(int length) +{ + Q_ASSERT(length >= 8); + Q_ASSERT(length <= 128); + + static const char salt_chars[] = { + '.', '/', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', + 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', + 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', + 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' }; + + static_assert( sizeof(salt_chars) == 64, "Missing salt_chars"); + + std::random_device r; + std::seed_seq seed{r(), r(), r(), r(), r(), r(), r(), r()}; + std::mt19937_64 twister(seed); + + std::uint64_t next; + int current_length = 0; + + QString salt_string; + salt_string.reserve(length + 10); + + while ( current_length < length ) + { + next = twister(); + // In 64 bits, we have 10 blocks of 6 bits; map each block of 6 bits + // to a single salt character. + for ( unsigned int char_count = 0; char_count < 10; ++char_count ) + { + char c = salt_chars[next & 0b0111111]; + next >>= 6; + salt_string.append( c ); + if (++current_length >= length) + break; + } + } + + salt_string.truncate( length ); + salt_string.insert( 0, "$6$" ); + salt_string.append( '$' ); + return salt_string; +} + Calamares::JobResult SetPasswordJob::exec() { @@ -75,8 +128,7 @@ SetPasswordJob::exec() QString encrypted = QString::fromLatin1( crypt( m_newPassword.toUtf8(), - QString( "$6$%1$" ) - .arg( m_userName ).toUtf8() ) ); + make_salt( 16 ).toUtf8() ) ); int ec = CalamaresUtils::System::instance()-> targetEnvCall( { "usermod", diff --git a/src/modules/users/SetPasswordJob.h b/src/modules/users/SetPasswordJob.h index f8e0c2447..8a53d4941 100644 --- a/src/modules/users/SetPasswordJob.h +++ b/src/modules/users/SetPasswordJob.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -32,6 +33,8 @@ public: QString prettyStatusMessage() const override; Calamares::JobResult exec() override; + static QString make_salt(int length); + private: QString m_userName; QString m_newPassword; diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp index 87e64deb1..453d1eae7 100644 --- a/src/modules/users/UsersPage.cpp +++ b/src/modules/users/UsersPage.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2017, Teo Mrnjavac + * Copyright 2017, Adriaan de Groot * * Portions from the Manjaro Installation Framework * by Roland Singer @@ -37,7 +38,21 @@ #include #include +/** Add an error message and pixmap to a label. */ +static inline void +labelError( QLabel* pix, QLabel* label, const QString& message ) +{ + label->setText( message ); + pix->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::No, CalamaresUtils::Original, label->size() ) ); +} +/** Clear error, indicate OK on a label. */ +static inline void +labelOk( QLabel* pix, QLabel* label ) +{ + label->clear(); + pix->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Yes, CalamaresUtils::Original, label->size() ) ); +} UsersPage::UsersPage( QWidget* parent ) : QWidget( parent ) @@ -268,29 +283,19 @@ UsersPage::validateUsernameText( const QString& textRef ) } else if ( text.length() > USERNAME_MAX_LENGTH ) { - ui->labelUsername->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::No, - CalamaresUtils::Original, - ui->labelUsername->size() ) ); - ui->labelUsernameError->setText( - tr( "Your username is too long." ) ); - + labelError( ui->labelUsername, ui->labelUsernameError, + tr( "Your username is too long." ) ); m_readyUsername = false; } else if ( val.validate( text, pos ) == QValidator::Invalid ) { - ui->labelUsername->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::No, - CalamaresUtils::Original, - ui->labelUsername->size() ) ); - ui->labelUsernameError->setText( - tr( "Your username contains invalid characters. Only lowercase letters and numbers are allowed." ) ); - + labelError( ui->labelUsername, ui->labelUsernameError, + tr( "Your username contains invalid characters. Only lowercase letters and numbers are allowed." ) ); m_readyUsername = false; } - else { - ui->labelUsername->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Yes, - CalamaresUtils::Original, - ui->labelUsername->size() ) ); - ui->labelUsernameError->clear(); + else + { + labelOk( ui->labelUsername, ui->labelUsernameError ); m_readyUsername = true; } @@ -322,55 +327,38 @@ UsersPage::validateHostnameText( const QString& textRef ) } else if ( text.length() < HOSTNAME_MIN_LENGTH ) { - ui->labelHostname->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::No, - CalamaresUtils::Original, - ui->labelHostname->size() ) ); - ui->labelHostnameError->setText( - tr( "Your hostname is too short." ) ); - + labelError( ui->labelHostname, ui->labelHostnameError, + tr( "Your hostname is too short." ) ); m_readyHostname = false; - } else if ( text.length() > HOSTNAME_MAX_LENGTH ) { - ui->labelHostname->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::No, - CalamaresUtils::Original, - ui->labelHostname->size() ) ); - ui->labelHostnameError->setText( - tr( "Your hostname is too long." ) ); - + labelError( ui->labelHostname, ui->labelHostnameError, + tr( "Your hostname is too long." ) ); m_readyHostname = false; - } else if ( val.validate( text, pos ) == QValidator::Invalid ) { - ui->labelHostname->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::No, - CalamaresUtils::Original, - ui->labelHostname->size() ) ); - ui->labelHostnameError->setText( - tr( "Your hostname contains invalid characters. Only letters, numbers and dashes are allowed." ) ); - + labelError( ui->labelHostname, ui->labelHostnameError, + tr( "Your hostname contains invalid characters. Only letters, numbers and dashes are allowed." ) ); m_readyHostname = false; } else { - ui->labelHostname->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Yes, - CalamaresUtils::Original, - ui->labelHostname->size() ) ); - ui->labelHostnameError->clear(); + labelOk( ui->labelHostname, ui->labelHostnameError ); m_readyHostname = true; } emit checkReady( isReady() ); } - void UsersPage::onPasswordTextChanged( const QString& ) { QString pw1 = ui->textBoxUserPassword->text(); QString pw2 = ui->textBoxUserVerifiedPassword->text(); + // TODO: 3.3: remove empty-check and leave it to passwordRequirements if ( pw1.isEmpty() && pw2.isEmpty() ) { ui->labelUserPasswordError->clear(); @@ -379,31 +367,42 @@ UsersPage::onPasswordTextChanged( const QString& ) } else if ( pw1 != pw2 ) { - ui->labelUserPasswordError->setText( tr( "Your passwords do not match!" ) ); - ui->labelUserPassword->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::No, - CalamaresUtils::Original, - ui->labelUserPassword->size() ) ); + labelError( ui->labelUserPassword, ui->labelUserPasswordError, + tr( "Your passwords do not match!" ) ); m_readyPassword = false; } else { - ui->labelUserPasswordError->clear(); - ui->labelUserPassword->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Yes, - CalamaresUtils::Original, - ui->labelUserPassword->size() ) ); - m_readyPassword = true; + bool ok = true; + for ( auto pc : m_passwordChecks ) + { + QString s = pc.filter( pw1 ); + if ( !s.isEmpty() ) + { + labelError( ui->labelUserPassword, ui->labelUserPasswordError, s ); + ok = false; + m_readyPassword = false; + break; + } + } + + if ( ok ) + { + labelOk( ui->labelUserPassword, ui->labelUserPasswordError ); + m_readyPassword = true; + } } emit checkReady( isReady() ); } - void UsersPage::onRootPasswordTextChanged( const QString& ) { QString pw1 = ui->textBoxRootPassword->text(); QString pw2 = ui->textBoxVerifiedRootPassword->text(); + // TODO: 3.3: remove empty-check and leave it to passwordRequirements if ( pw1.isEmpty() && pw2.isEmpty() ) { ui->labelRootPasswordError->clear(); @@ -412,19 +411,30 @@ UsersPage::onRootPasswordTextChanged( const QString& ) } else if ( pw1 != pw2 ) { - ui->labelRootPasswordError->setText( tr( "Your passwords do not match!" ) ); - ui->labelRootPassword->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::No, - CalamaresUtils::Original, - ui->labelRootPassword->size() ) ); + labelError( ui->labelRootPassword, ui->labelRootPasswordError, + tr( "Your passwords do not match!" ) ); m_readyRootPassword = false; } else { - ui->labelRootPasswordError->clear(); - ui->labelRootPassword->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Yes, - CalamaresUtils::Original, - ui->labelRootPassword->size() ) ); - m_readyRootPassword = true; + bool ok = true; + for ( auto pc : m_passwordChecks ) + { + QString s = pc.filter( pw1 ); + if ( !s.isEmpty() ) + { + labelError( ui->labelRootPassword, ui->labelRootPasswordError, s ); + ok = false; + m_readyRootPassword = false; + break; + } + } + + if ( ok ) + { + labelOk( ui->labelRootPassword, ui->labelRootPasswordError ); + m_readyRootPassword = true; + } } emit checkReady( isReady() ); @@ -444,3 +454,69 @@ UsersPage::setReusePasswordDefault( bool checked ) ui->checkBoxReusePassword->setChecked( checked ); emit checkReady( isReady() ); } + +UsersPage::PasswordCheck::PasswordCheck() + : m_message() + , m_accept( []( const QString& s ) +{ + return true; +} ) +{ +} + +UsersPage::PasswordCheck::PasswordCheck( const QString& m, AcceptFunc a ) + : m_message( [m](){ return m; } ) + , m_accept( a ) +{ +} + +UsersPage::PasswordCheck::PasswordCheck( MessageFunc m, AcceptFunc a ) + : m_message( m ) + , m_accept( a ) +{ +} + +void +UsersPage::addPasswordCheck( const QString& key, const QVariant& value ) +{ + if ( key == "minLength" ) + { + int minLength = -1; + if ( value.canConvert( QVariant::Int ) ) + minLength = value.toInt(); + if ( minLength > 0 ) + { + cDebug() << key << " .. set to" << minLength; + m_passwordChecks.push_back( + PasswordCheck( + []() + { + return tr( "Password is too short" ); + }, + [minLength]( const QString& s ) + { + return s.length() >= minLength; + } ) ); + } + } + else if ( key == "maxLength" ) + { + int maxLength = -1; + if ( value.canConvert( QVariant::Int ) ) + maxLength = value.toInt(); + if ( maxLength > 0 ) + { + cDebug() << key << " .. set to" << maxLength; + m_passwordChecks.push_back( + PasswordCheck( []() + { + return tr( "Password is too long" ); + }, [maxLength]( const QString& s ) + { + return s.length() <= maxLength; + } ) ); + } + } + else + cDebug() << "WARNING: Unknown password-check key" << '"' << key << '"'; +} diff --git a/src/modules/users/UsersPage.h b/src/modules/users/UsersPage.h index 632d49471..5a72e11de 100644 --- a/src/modules/users/UsersPage.h +++ b/src/modules/users/UsersPage.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * Copyright 2017, Adriaan de Groot * * Portions from the Manjaro Installation Framework * by Roland Singer @@ -27,7 +28,10 @@ #include -namespace Ui { +#include + +namespace Ui +{ class Page_UserSetup; } @@ -48,6 +52,8 @@ public: void setAutologinDefault( bool checked ); void setReusePasswordDefault( bool checked ); + void addPasswordCheck( const QString& key, const QVariant& value ); + protected slots: void onFullNameTextEdited( const QString& ); void fillSuggestions(); @@ -64,11 +70,47 @@ signals: private: Ui::Page_UserSetup* ui; + /** + * Support for (dynamic) checks on the password's validity. + * This can be used to implement password requirements like + * "at least 6 characters". Function addPasswordCheck() + * instantiates these and adds them to the list of checks. + */ + class PasswordCheck + { + public: + /** Return true if the string is acceptable. */ + using AcceptFunc = std::function; + using MessageFunc = std::function; + + /** Generate a @p message if @p filter returns true */ + PasswordCheck( MessageFunc message, AcceptFunc filter ); + /** Yields @p message if @p filter returns true */ + PasswordCheck( const QString& message, AcceptFunc filter ); + /** Null check, always returns empty */ + PasswordCheck(); + + /** Applies this check to the given password string @p s + * and returns an empty string if the password is ok + * according to this filter. Returns a message describing + * what is wrong if not. + */ + QString filter( const QString& s ) const + { + return m_accept( s ) ? QString() : m_message(); + } + + private: + MessageFunc m_message; + AcceptFunc m_accept; + } ; + QVector m_passwordChecks; + const QRegExp USERNAME_RX = QRegExp( "^[a-z_][a-z0-9_-]*[$]?$" ); const QRegExp HOSTNAME_RX = QRegExp( "^[a-zA-Z0-9][-a-zA-Z0-9_]*$" ); const int USERNAME_MAX_LENGTH = 31; const int HOSTNAME_MIN_LENGTH = 2; - const int HOSTNAME_MAX_LENGTH = 24; + const int HOSTNAME_MAX_LENGTH = 63; bool m_readyFullName; bool m_readyUsername; diff --git a/src/modules/users/UsersViewStep.cpp b/src/modules/users/UsersViewStep.cpp index d601014ae..73dc98ddc 100644 --- a/src/modules/users/UsersViewStep.cpp +++ b/src/modules/users/UsersViewStep.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -20,6 +21,7 @@ #include "UsersPage.h" +#include "utils/Logger.h" #include "JobQueue.h" #include "GlobalStorage.h" @@ -159,11 +161,23 @@ UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { m_widget->setAutologinDefault( configurationMap.value( "doAutologin" ).toBool() ); } - + if ( configurationMap.contains( "doReusePassword" ) && configurationMap.value( "doReusePassword" ).type() == QVariant::Bool ) { m_widget->setReusePasswordDefault( configurationMap.value( "doReusePassword" ).toBool() ); } + + if ( configurationMap.contains( "passwordRequirements" ) && + configurationMap.value( "passwordRequirements" ).type() == QVariant::Map ) + { + auto pr_checks( configurationMap.value( "passwordRequirements" ).toMap() ); + + for (decltype(pr_checks)::const_iterator i = pr_checks.constBegin(); + i != pr_checks.constEnd(); ++i) + { + m_widget->addPasswordCheck( i.key(), i.value() ); + } + } } diff --git a/src/modules/users/UsersViewStep.h b/src/modules/users/UsersViewStep.h index ea5d9101b..a529ad4ea 100644 --- a/src/modules/users/UsersViewStep.h +++ b/src/modules/users/UsersViewStep.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -36,7 +37,7 @@ class PLUGINDLLEXPORT UsersViewStep : public Calamares::ViewStep public: explicit UsersViewStep( QObject* parent = nullptr ); - virtual ~UsersViewStep(); + virtual ~UsersViewStep() override; QString prettyName() const override; 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/page_usersetup.ui b/src/modules/users/page_usersetup.ui index 67c7f618c..083d8f965 100644 --- a/src/modules/users/page_usersetup.ui +++ b/src/modules/users/page_usersetup.ui @@ -194,7 +194,7 @@ - font-weight: normal + font-weight: normal <small>If more than one person will use this computer, you can set up multiple accounts after installation.</small> diff --git a/src/modules/users/users.conf b/src/modules/users/users.conf index 5dfa8e947..d5466c62f 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 @@ -15,3 +27,17 @@ sudoersGroup: wheel setRootPassword: true doReusePassword: true + +# These are optional password-requirements that a distro can enforce +# on the user. The values given in this sample file disable each check, +# as if the check was not listed at all. +# +# Checks may be listed multiple times; each is checked separately, +# and no effort is done to ensure that the checks are consistent +# (e.g. specifying a maximum length less than the minimum length +# will annoy users). +# +# (additional checks may be implemented in UsersPage.cpp) +passwordRequirements: + minLength: -1 # Password at least this many characters + maxLength: -1 # Password at most this many characters 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/WebViewStep.h b/src/modules/webview/WebViewStep.h index 9d8405a97..105eea4b3 100644 --- a/src/modules/webview/WebViewStep.h +++ b/src/modules/webview/WebViewStep.h @@ -2,6 +2,7 @@ * * Copyright 2015, Rohan Garg * Copyright 2016, Teo Mrnjavac + * 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 @@ -43,7 +44,7 @@ class PLUGINDLLEXPORT WebViewStep : public Calamares::ViewStep public: explicit WebViewStep( QObject* parent = nullptr ); - virtual ~WebViewStep(); + virtual ~WebViewStep() override; QString prettyName() const override; 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 552ed39a8..f73d8850d 100644 --- a/src/modules/welcome/CMakeLists.txt +++ b/src/modules/welcome/CMakeLists.txt @@ -1,9 +1,9 @@ include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) -set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules ) + find_package( LIBPARTED REQUIRED ) find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network ) -set_source_files_properties( checker/partman_devices.c PROPERTIES LANGUAGE CXX ) +include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) set( CHECKER_SOURCES checker/CheckItemWidget.cpp diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp index 986e38de5..8b5c604b4 100644 --- a/src/modules/welcome/WelcomePage.cpp +++ b/src/modules/welcome/WelcomePage.cpp @@ -2,6 +2,7 @@ * * Copyright 2014-2015, Teo Mrnjavac * Copyright 2015, Anke Boersma + * 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 @@ -45,17 +46,19 @@ WelcomePage::WelcomePage( RequirementsChecker* requirementsChecker, QWidget* par { ui->setupUi( this ); - ui->verticalLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() * 4 ); + ui->verticalLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() * 2 ); initLanguages(); ui->mainText->setAlignment( Qt::AlignCenter ); ui->mainText->setWordWrap( true ); ui->mainText->setOpenExternalLinks( true ); + cDebug() << "Welcome string" << Calamares::Branding::instance()->welcomeStyleCalamares() + << *Calamares::Branding::VersionedName; + CALAMARES_RETRANSLATE( - ui->mainText->setText( tr( "

Welcome to the %1 installer.

" ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::VersionedName ) ) ); + ui->mainText->setText( (Calamares::Branding::instance()->welcomeStyleCalamares() ? tr( "

Welcome to the Calamares installer for %1.

" ) : tr( "

Welcome to the %1 installer.

" )) + .arg( *Calamares::Branding::VersionedName ) ); ui->retranslateUi( this ); ) @@ -74,6 +77,7 @@ WelcomePage::WelcomePage( RequirementsChecker* requirementsChecker, QWidget* par "%2
" "for %3

" "Copyright 2014-2017 Teo Mrnjavac <teo@kde.org>
" + "Copyright 2017 Adriaan de Groot <groot@kde.org>
" "Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo," " Philip Müller, Pier Luigi Fiorini, Rohan Garg and the Calamares " @@ -85,14 +89,16 @@ WelcomePage::WelcomePage( RequirementsChecker* requirementsChecker, QWidget* par ) .arg( CALAMARES_APPLICATION_NAME ) .arg( CALAMARES_VERSION ) - .arg( Calamares::Branding::instance()->string( - Calamares::Branding::VersionedName ) ), + .arg( *Calamares::Branding::VersionedName ), QMessageBox::Ok, this ); mb.setIconPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Squid, CalamaresUtils::Original, QSize( CalamaresUtils::defaultFontHeight() * 6, CalamaresUtils::defaultFontHeight() * 6 ) ) ); + QGridLayout* layout = reinterpret_cast( mb.layout() ); + if ( layout ) + layout->setColumnMinimumWidth( 2, CalamaresUtils::defaultFontHeight() * 24 ); mb.exec(); } ); @@ -189,12 +195,11 @@ WelcomePage::setUpLinks( bool showSupportUrl, bool showReleaseNotesUrl ) { using namespace Calamares; - Branding* b = Branding::instance(); - if ( showSupportUrl && !b->string( Branding::SupportUrl ).isEmpty() ) + if ( showSupportUrl && !( *Branding::SupportUrl ).isEmpty() ) { CALAMARES_RETRANSLATE( ui->supportButton->setText( tr( "%1 support" ) - .arg( b->string( Branding::ShortProductName ) ) ); + .arg( *Branding::ShortProductName ) ); ) ui->supportButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Help, CalamaresUtils::Original, @@ -202,7 +207,7 @@ WelcomePage::setUpLinks( bool showSupportUrl, CalamaresUtils::defaultFontHeight() ) ) ); connect( ui->supportButton, &QPushButton::clicked, [] { - QDesktopServices::openUrl( Branding::instance()->string( Branding::SupportUrl ) ); + QDesktopServices::openUrl( *Branding::SupportUrl ); } ); } else @@ -210,7 +215,7 @@ WelcomePage::setUpLinks( bool showSupportUrl, ui->supportButton->hide(); } - if ( showKnownIssuesUrl && !b->string( Branding::KnownIssuesUrl ).isEmpty() ) + if ( showKnownIssuesUrl && !( *Branding::KnownIssuesUrl ).isEmpty() ) { ui->knownIssuesButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Bugs, CalamaresUtils::Original, @@ -218,7 +223,7 @@ WelcomePage::setUpLinks( bool showSupportUrl, CalamaresUtils::defaultFontHeight() ) ) ); connect( ui->knownIssuesButton, &QPushButton::clicked, [] { - QDesktopServices::openUrl( Branding::instance()->string( Branding::KnownIssuesUrl ) ); + QDesktopServices::openUrl( *Branding::KnownIssuesUrl ); } ); } else @@ -226,7 +231,7 @@ WelcomePage::setUpLinks( bool showSupportUrl, ui->knownIssuesButton->hide(); } - if ( showReleaseNotesUrl && !b->string( Branding::ReleaseNotesUrl ).isEmpty() ) + if ( showReleaseNotesUrl && !( *Branding::ReleaseNotesUrl ).isEmpty() ) { ui->releaseNotesButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Release, CalamaresUtils::Original, @@ -234,7 +239,7 @@ WelcomePage::setUpLinks( bool showSupportUrl, CalamaresUtils::defaultFontHeight() ) ) ); connect( ui->releaseNotesButton, &QPushButton::clicked, [] { - QDesktopServices::openUrl( Branding::instance()->string( Branding::ReleaseNotesUrl ) ); + QDesktopServices::openUrl( *Branding::ReleaseNotesUrl ); } ); } else diff --git a/src/modules/welcome/WelcomeViewStep.h b/src/modules/welcome/WelcomeViewStep.h index db33a89bd..fbcbd8ded 100644 --- a/src/modules/welcome/WelcomeViewStep.h +++ b/src/modules/welcome/WelcomeViewStep.h @@ -37,7 +37,7 @@ class PLUGINDLLEXPORT WelcomeViewStep : public Calamares::ViewStep public: explicit WelcomeViewStep( QObject* parent = nullptr ); - virtual ~WelcomeViewStep(); + virtual ~WelcomeViewStep() override; QString prettyName() const override; diff --git a/src/modules/welcome/checker/CheckerWidget.cpp b/src/modules/welcome/checker/CheckerWidget.cpp index be341acc0..500ab6f85 100644 --- a/src/modules/welcome/checker/CheckerWidget.cpp +++ b/src/modules/welcome/checker/CheckerWidget.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2015, Teo Mrnjavac + * 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 @@ -96,8 +97,7 @@ CheckerWidget::init( const QList< PrepareEntry >& checkEntries ) "requirements for installing %1.
" "Installation cannot continue. " "Details..." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) ); + .arg( *Calamares::Branding::ShortVersionedName ) ); ) textLabel->setOpenExternalLinks( false ); connect( textLabel, &QLabel::linkActivated, @@ -114,8 +114,7 @@ CheckerWidget::init( const QList< PrepareEntry >& checkEntries ) "recommended requirements for installing %1.
" "Installation can continue, but some features " "might be disabled." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ShortVersionedName ) ) ); + .arg( *Calamares::Branding::ShortVersionedName ) ); ) } } @@ -129,20 +128,29 @@ CheckerWidget::init( const QList< PrepareEntry >& checkEntries ) imagePath( Calamares::Branding::ProductWelcome ) ); if ( !theImage.isNull() ) { - FixedAspectRatioLabel* imageLabel = new FixedAspectRatioLabel; - imageLabel->setContentsMargins( 4, CalamaresUtils::defaultFontHeight()*0.75, 4, 4 ); + QLabel* imageLabel; + if ( Calamares::Branding::instance()->welcomeExpandingLogo() ) + { + FixedAspectRatioLabel *p = new FixedAspectRatioLabel; + p->setPixmap( theImage ); + imageLabel = p; + } + else + { + imageLabel = new QLabel; + imageLabel->setPixmap( theImage ); + } + + imageLabel->setContentsMargins( 4, CalamaresUtils::defaultFontHeight() * 3 / 4, 4, 4 ); m_mainLayout->addWidget( imageLabel ); imageLabel->setAlignment( Qt::AlignCenter ); imageLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); - - imageLabel->setPixmap( theImage ); } } CALAMARES_RETRANSLATE( textLabel->setText( tr( "This program will ask you some questions and " "set up %2 on your computer." ) - .arg( Calamares::Branding::instance()-> - string( Calamares::Branding::ProductName ) ) ); + .arg( *Calamares::Branding::ProductName ) ); textLabel->setAlignment( Qt::AlignCenter ); ) } diff --git a/src/modules/welcome/checker/RequirementsChecker.cpp b/src/modules/welcome/checker/RequirementsChecker.cpp index 80bc92974..3d4e394c4 100644 --- a/src/modules/welcome/checker/RequirementsChecker.cpp +++ b/src/modules/welcome/checker/RequirementsChecker.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014-2017, Teo Mrnjavac + * 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 @@ -26,12 +27,16 @@ #include "utils/Logger.h" #include "utils/Retranslator.h" #include "utils/CalamaresUtilsSystem.h" +#include "utils/Units.h" + #include "JobQueue.h" #include "GlobalStorage.h" +#include #include #include #include +#include #include #include #include @@ -48,9 +53,10 @@ RequirementsChecker::RequirementsChecker( QObject* parent ) : QObject( parent ) , m_widget( new QWidget() ) + , m_requiredStorageGB( -1 ) + , m_requiredRamGB( -1 ) , m_actualWidget( new CheckerWidget() ) , m_verdict( false ) - , m_requiredStorageGB( -1 ) { QBoxLayout* mainLayout = new QHBoxLayout; m_widget->setLayout( mainLayout ); @@ -60,6 +66,8 @@ RequirementsChecker::RequirementsChecker( QObject* parent ) mainLayout->addWidget( waitingWidget ); CALAMARES_RETRANSLATE( waitingWidget->setText( tr( "Gathering system information..." ) ); ) + QSize availableSize = qApp->desktop()->availableGeometry( m_widget ).size(); + QTimer* timer = new QTimer; timer->setSingleShot( true ); connect( timer, &QTimer::timeout, @@ -70,13 +78,14 @@ RequirementsChecker::RequirementsChecker( QObject* parent ) bool hasPower = false; bool hasInternet = false; bool isRoot = false; + bool enoughScreen = (availableSize.width() >= CalamaresUtils::windowPreferredWidth) && (availableSize.height() >= CalamaresUtils::windowPreferredHeight); - qint64 requiredStorageB = m_requiredStorageGB * 1073741824L; /*powers of 2*/ + qint64 requiredStorageB = CalamaresUtils::GiBtoBytes(m_requiredStorageGB); cDebug() << "Need at least storage bytes:" << requiredStorageB; if ( m_entriesToCheck.contains( "storage" ) ) enoughStorage = checkEnoughStorage( requiredStorageB ); - qint64 requiredRamB = m_requiredRamGB * 1073741824L; /*powers of 2*/ + qint64 requiredRamB = CalamaresUtils::GiBtoBytes(m_requiredRamGB); cDebug() << "Need at least ram bytes:" << requiredRamB; if ( m_entriesToCheck.contains( "ram" ) ) enoughRam = checkEnoughRam( requiredRamB ); @@ -140,7 +149,14 @@ RequirementsChecker::RequirementsChecker( QObject* parent ) isRoot, m_entriesToRequire.contains( entry ) } ); - + else if ( entry == "screen" ) + checkEntries.append( { + entry, + [this]{ return QString(); }, // we hide it + [this]{ return tr( "The screen is too small to display the installer." ); }, + enoughScreen, + false + } ); } m_actualWidget->init( checkEntries ); @@ -294,9 +310,9 @@ RequirementsChecker::checkEnoughStorage( qint64 requiredSpace ) bool RequirementsChecker::checkEnoughRam( qint64 requiredRam ) { - qint64 availableRam = CalamaresUtils::System::instance()->getPhysicalMemoryB(); - if ( !availableRam ) - availableRam = CalamaresUtils::System::instance()->getTotalMemoryB(); + // Ignore the guesstimate-factor; we get an under-estimate + // which is probably the usable RAM for programs. + quint64 availableRam = CalamaresUtils::System::instance()->getTotalMemoryB().first; return availableRam >= requiredRam * 0.95; // because MemTotal is variable } @@ -341,7 +357,7 @@ RequirementsChecker::checkHasPower() QDBusInterface upowerIntf( UPOWER_SVC_NAME, UPOWER_PATH, UPOWER_INTF_NAME, - QDBusConnection::systemBus(), 0 ); + QDBusConnection::systemBus() ); bool onBattery = upowerIntf.property( "OnBattery" ).toBool(); diff --git a/src/modules/welcome/checker/partman_devices.c b/src/modules/welcome/checker/partman_devices.c index d417f3c0f..2cc97557a 100644 --- a/src/modules/welcome/checker/partman_devices.c +++ b/src/modules/welcome/checker/partman_devices.c @@ -112,7 +112,7 @@ process_device(PedDevice *dev) int check_big_enough(long long required_space) { - PedDevice *dev; + PedDevice *dev = NULL; ped_exception_fetch_all(); ped_device_probe_all(); @@ -126,7 +126,15 @@ check_big_enough(long long required_space) break; } } - ped_device_free_all(); + + // We would free the devices to release allocated memory, + // but other modules might be using partman use well, + // and they can hold pointers to libparted structures in + // other threads. + // + // So prefer to leak memory, instead. + // + // ped_device_free_all(); return big_enough; } diff --git a/src/modules/welcome/checker/partman_devices.h b/src/modules/welcome/checker/partman_devices.h index 8bc19e58b..8bf620a48 100644 --- a/src/modules/welcome/checker/partman_devices.h +++ b/src/modules/welcome/checker/partman_devices.h @@ -19,6 +19,14 @@ #ifndef PARTMAN_DEVICES_H #define PARTMAN_DEVICES_H +#ifdef __cplusplus +extern "C" { +#endif + int check_big_enough(long long required_space); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // PARTMAN_DEVICES_H 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" diff --git a/src/modules/welcome/welcome.conf b/src/modules/welcome/welcome.conf index f7cd72cec..18e71b1ef 100644 --- a/src/modules/welcome/welcome.conf +++ b/src/modules/welcome/welcome.conf @@ -7,12 +7,23 @@ requirements: requiredStorage: 5.5 requiredRam: 1.0 internetCheckUrl: http://google.com + + # List conditions to check. Each listed condition will be + # probed in some way, and yields true or false according to + # the host system satisfying the condition. + # + # This sample file lists all the conditions that are know. check: - storage - ram - power - internet - root + - screen + # List conditions that must be satisfied (from the list + # of conditions, above) for installation to proceed. + # If any of these conditions are not met, the user cannot + # continue past the welcome page. required: - storage - ram diff --git a/src/qml/calamares/slideshow/Presentation.qml b/src/qml/calamares/slideshow/Presentation.qml index 59878c644..b53b9fc55 100644 --- a/src/qml/calamares/slideshow/Presentation.qml +++ b/src/qml/calamares/slideshow/Presentation.qml @@ -1,29 +1,16 @@ -/* === This file is part of Calamares - === +/* === This file is part of Calamares - === * - * Copyright 2015, Teo Mrnjavac + * Copyright 2017, Adriaan de Groot + * - added looping, keys-instead-of-shortcut * - * Based on the QML Presentation System. - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). - * Header reproduced verbatim below. - * - * Calamares is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Calamares is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calamares. If not, see . + * SPDX-License-Identifier: LGPL-2.1 + * License-Filename: LICENSES/LGPLv2.1-Presentation */ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QML Presentation System. ** @@ -62,18 +49,20 @@ ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.5 import QtQuick.Window 2.0 Item { id: root property variant slides: [] - property int currentSlide; + property int currentSlide: 0 property bool showNotes: false; property bool allowDelay: true; - property bool loop: true; + property alias mouseNavigation: mouseArea.enabled + property bool arrowNavigation: true + property bool keyShortcutsEnabled: true property color titleColor: textColor; property color textColor: "black" @@ -83,6 +72,7 @@ Item { // Private API property bool _faded: false property int _userNum; + property int _lastShownSlide: 0 Component.onCompleted: { var slideCount = 0; @@ -98,10 +88,8 @@ Item { root._userNum = 0; // Make first slide visible... - if (root.slides.length > 0) { - root.currentSlide = 0; + if (root.slides.length > 0) root.slides[root.currentSlide].visible = true; - } } function switchSlides(from, to, forward) { @@ -110,6 +98,13 @@ Item { return true } + onCurrentSlideChanged: { + switchSlides(root.slides[_lastShownSlide], root.slides[currentSlide], currentSlide > _lastShownSlide) + _lastShownSlide = currentSlide + // Always keep focus on the slideshow + root.focus = true + } + function goToNextSlide() { root._userNum = 0 if (_faded) @@ -118,38 +113,18 @@ Item { if (root.slides[currentSlide]._advance()) return; } - if (root.currentSlide + 1 < root.slides.length) { - var from = slides[currentSlide] - var to = slides[currentSlide + 1] - if (switchSlides(from, to, true)) { - currentSlide = currentSlide + 1; - root.focus = true; - } - } - else { - if (root.loop) { - var from = slides[currentSlide] - var to = slides[0] - if (switchSlides(from, to, true)) { - currentSlide = 0; - root.focus = true; - } - } - } + if (currentSlide + 1 < root.slides.length) + ++currentSlide; + else + currentSlide = 0; // Loop at the end } function goToPreviousSlide() { root._userNum = 0 if (root._faded) return - if (root.currentSlide - 1 >= 0) { - var from = slides[currentSlide] - var to = slides[currentSlide - 1] - if (switchSlides(from, to, false)) { - currentSlide = currentSlide - 1; - root.focus = true; - } - } + if (currentSlide - 1 >= 0) + --currentSlide; } function goToUserSlide() { @@ -158,38 +133,45 @@ Item { return if (_userNum < 0) goToNextSlide() - else if (root.currentSlide != _userNum) { - var from = slides[currentSlide] - var to = slides[_userNum] - if (switchSlides(from, to, _userNum > currentSlide)) { - currentSlide = _userNum; - root.focus = true; - } + else { + currentSlide = _userNum; + root.focus = true; } } - focus: true - - Keys.onSpacePressed: goToNextSlide() - Keys.onRightPressed: goToNextSlide() - Keys.onDownPressed: goToNextSlide() - Keys.onLeftPressed: goToPreviousSlide() - Keys.onUpPressed: goToPreviousSlide() - Keys.onEscapePressed: Qt.quit() + // directly type in the slide number: depends on root having focus Keys.onPressed: { if (event.key >= Qt.Key_0 && event.key <= Qt.Key_9) _userNum = 10 * _userNum + (event.key - Qt.Key_0) else { if (event.key == Qt.Key_Return || event.key == Qt.Key_Enter) goToUserSlide(); - else if (event.key == Qt.Key_Backspace) - goToPreviousSlide(); - else if (event.key == Qt.Key_C) - root._faded = !root._faded; _userNum = 0; } } + focus: true // Keep focus + + // Navigation through key events, too + Keys.onSpacePressed: goToNextSlide() + Keys.onRightPressed: goToNextSlide() + Keys.onLeftPressed: goToPreviousSlide() + + // navigate with arrow keys + Shortcut { sequence: StandardKey.MoveToNextLine; enabled: root.arrowNavigation; onActivated: goToNextSlide() } + Shortcut { sequence: StandardKey.MoveToPreviousLine; enabled: root.arrowNavigation; onActivated: goToPreviousSlide() } + Shortcut { sequence: StandardKey.MoveToNextChar; enabled: root.arrowNavigation; onActivated: goToNextSlide() } + Shortcut { sequence: StandardKey.MoveToPreviousChar; enabled: root.arrowNavigation; onActivated: goToPreviousSlide() } + + // presentation-specific single-key shortcuts (which interfere with normal typing) + Shortcut { sequence: " "; enabled: root.keyShortcutsEnabled; onActivated: goToNextSlide() } + Shortcut { sequence: "c"; enabled: root.keyShortcutsEnabled; onActivated: root._faded = !root._faded } + + // standard shortcuts + Shortcut { sequence: StandardKey.MoveToNextPage; onActivated: goToNextSlide() } + Shortcut { sequence: StandardKey.MoveToPreviousPage; onActivated: goToPreviousSlide() } + Shortcut { sequence: StandardKey.Quit; onActivated: Qt.quit() } + Rectangle { z: 1000 color: "black" @@ -219,16 +201,61 @@ Item { title: "QML Presentation: Notes" visible: root.showNotes - Text { + Flickable { anchors.fill: parent - anchors.margins: parent.height * 0.1; + contentWidth: parent.width + contentHeight: textContainer.height - font.pixelSize: 16 - wrapMode: Text.WordWrap + Item { + id: textContainer + width: parent.width + height: notesText.height + 2 * notesText.padding - property string notes: root.slides[root.currentSlide].notes; - text: notes == "" ? "Slide has no notes..." : notes; - font.italic: notes == ""; + Text { + id: notesText + + property real padding: 16; + + x: padding + y: padding + width: parent.width - 2 * padding + + + font.pixelSize: 16 + wrapMode: Text.WordWrap + + property string notes: root.slides[root.currentSlide].notes; + + onNotesChanged: { + var result = ""; + + var lines = notes.split("\n"); + var beginNewLine = false + for (var i=0; i 0) + result += " "; + result += line; + } + } + + if (result.length == 0) { + font.italic = true; + text = "no notes.." + } else { + font.italic = false; + text = result; + } + } + } + } } } } diff --git a/src/qml/calamares/slideshow/Slide.qml b/src/qml/calamares/slideshow/Slide.qml index e46b5687d..e033e3c17 100644 --- a/src/qml/calamares/slideshow/Slide.qml +++ b/src/qml/calamares/slideshow/Slide.qml @@ -1,3 +1,9 @@ +/* === This file is part of Calamares - === + * + * SPDX-License-Identifier: LGPL-2.1 + * License-Filename: LICENSES/LGPLv2.1-Presentation + */ + /**************************************************************************** ** ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). @@ -167,20 +173,19 @@ Item { Rectangle { id: dot - y: baseFontSize * row.indentFactor / 2 - width: baseFontSize / 4 - height: baseFontSize / 4 + anchors.baseline: text.baseline + anchors.baselineOffset: -text.font.pixelSize / 2 + width: text.font.pixelSize / 3 + height: text.font.pixelSize / 3 color: slide.textColor radius: width / 2 - smooth: true opacity: text.text.length == 0 ? 0 : 1 } - Rectangle { + Item { id: space - width: dot.width * 2 + width: dot.width * 1.5 height: 1 - color: "#00ffffff" } Text { diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt deleted file mode 100644 index b3401a977..000000000 --- a/thirdparty/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -if( WITH_CRASHREPORTER ) - macro( qt_wrap_ui ) - qt5_wrap_ui( ${ARGN} ) - endmacro() - add_subdirectory( libcrashreporter-qt ) -endif() diff --git a/thirdparty/libcrashreporter-qt b/thirdparty/libcrashreporter-qt deleted file mode 160000 index 61dc3963c..000000000 --- a/thirdparty/libcrashreporter-qt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 61dc3963c2b59894e7d3f3bd758c43b59665054a